606 Commits
Author SHA1 Message Date
Deepak Dixit 24d9328cdf Fix: Corrected the tika-parsers dependency version, also remove redundant entry for tika-core. This should fix the build failure (OFBIZ-12100) (#248)
Thanks Alexander Tzvetanov for reporting the issue
2020-12-31 15:59:28 +05:30
Jacques Le Roux 2d15771d56 Fixed: partymgr fails to upload image (OFBIZ-12101)
This is a bug due to OFBIZ-12080, fileToCheck is the complete name of the file
with path not the filename

Thanks: Wai for report
2020-12-26 09:08:04 +01:00
Jacques Le Roux d13264b584 Improved: Remove hardcoded product category on CategoryWorker.getCatalogTopCategory (OFBIZ-12078)
When you call the java function
org.apache.ofbiz.product.category.CategoryWorker.getCatalogTopCategory()
the catalog returned if the system failed found it is hardcoded and don't use an
existing property : catalog->top.category.default

Thanks: Nicolas

Conflicts handled by hand:
applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java
2020-12-25 17:04:59 +01:00
Jacques Le Roux aa4791f120 Fixed: Unique form names for promo actions (OFBIZ-12082)
Creating a promo with multiple rules and actions results in an exception.

It's reproducible by creating a promo with 1 rule and more than 1 Action and
specifying different products for each Action. When creating the second Action
and trying to specify another product to included the ajax request LookupProduct
will fail because it included both product ids in its xhr request.

Thanks: Danny Trunk
2020-12-25 16:18:37 +01:00
Jacques Le Roux e87747dcb9 Fixed: Issue in creating promotion action (OFBIZ-11168)
The issue reported there was fixed with OFBIZ-11058.

But there was still an issue in logI reported in a comment.

The problem was that
<#assign productPromoActionCurEnum = productPromoAction.getRelatedOne("ActionEnumeration", true)>
was used in 2 places where it should not have been because it returned a null
value that can't be handled by OFBiz.

Better use
<#assign productPromoActionCustomMethod = productPromoAction.getRelatedOne("CustomMethod", true)>
and
productPromoAction.getRelatedOne("ActionEnumeration", true))??

The repercussion was that the description was not used but the Id and the log
was showing an error.

Conflicts handled by hand:
applications/product/template/promo/EditProductPromoRules.ftl
2020-12-25 16:12:24 +01:00
Jacques Le Roux 3982f8d526 Fixed: Make ruleName field in PriceForms.xml#AddPriceRules safe (OFBIZ-12098)
I noticed an issue due to entity-auto. Unlike with a standard service you can't
protect fields using allow-html="safe" except by overriding fields. So in case
this must be done one by one...

An example is ruleName field in PriceForms.xml#AddPriceRules with
createProductPriceRule and updateProductPriceRule services

This fixes this only case...
Also removes trailing blanks and only that (by IDE setting)

Conflicts handled by hand
applications/product/servicedef/services_pricepromo.xml
2020-12-20 11:07:27 +01:00
Jacques Le Roux 540f5c80cd Fixed: Post-auth XSS vulnerability at catalog/control/EditProductPromo (OFBIZ-12096)
Prevents issues with integration tests

Conflicts handled by hand:
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
2020-12-19 20:45:40 +01:00
Jacques Le Roux 637e02978c Fixed: Post-auth XSS vulnerability at catalog/control/EditProductPromo (OFBIZ-12096)
We missed to unescape EcmaScript encoded strings in
UtilCoded::checkStringForHtmlSafe, ie in all form fields using allow-html="safe"

Thanks: 牛治 <niu.zhi@zte.com.cn> for report

Conflicts handled by hand => no functional changes in code (ude to IDE setting)
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
2020-12-19 18:20:45 +01:00
Jacques Le Roux 363e0be770 Fixed: Secure the uploads (OFBIZ-12080)
According to https://s.apache.org/rpzog, adds few, maybe redundant, Java
API/methods found in webshell, or alike, source code
2020-12-14 19:01:31 +01:00
Jacques Le Roux ba6470b9ea Fixed: Secure the uploads (OFBIZ-12080)
Follows OWASP advice on file names:

All the control characters and Unicode ones should be removed from the filenames
and their extensions without any exception. Also, the special characters such as
“;”, “:”, “>”, “<”, “/” ,”\”, additional “.”, “*”, “%”, “$”, and so on should be
discarded as well.

If it is applicable and there is no need to have Unicode characters, it is
highly recommended to only accept Alpha-Numeric characters and only 1 dot as an
input for the file name and the extension; in which the file name and also the
extension should not be empty at all
(regular expression: [a-zA-Z0-9]{1,200}.[a-zA-Z0-9]{1,10}).

So if someone needs other chars in uploaded filenames a change will be needed
2020-12-14 16:52:00 +01:00
Jacques Le Roux 00d875251c Fixed: Secure the uploads (OFBIZ-12080)
Prevents too long filenames as recommended by OWASP.

Based on https://security.stackexchange.com/questions/46484/denial-of-service-when-uploading-a-file#answer-46495
I decided to not limit sizes of files. Anyway we know it's only post-auth...
2020-12-14 12:48:49 +01:00
Jacques Le Roux 71ff63a043 Improved: Gradle logging hygiene (OFBIZ-12085)
Some times ago, we were forced to stop and quickly restart the demos because of
the Gradle daemons logging taking all the place; though we don't use Gradle
daemons in demos. Weird isn't ?

The reason is that by default org.gradle.logging.level=lifecycle is verbose.
Anyway, all org.gradle.logging.level are verbose. I mean they also duplicate
OFBiz information, have a look into your own Gradle daemon dir!

And that even if you don't use daemons, as we do for demos. Because Gradle
always uses at least 1 daemon to run.

So I was looking for a solution to not uselessly clutter the VM disk demos and
stumbled upon <<Gradle logging hygiene - Issue #2688>> - gradle/gradle (github.com)

This uses Evgeny Naumenko's solution at
https://discuss.gradle.org/t/gradle-daemon-produces-a-lot-of-logs/9905

I backport because it's needed by demos

# Conflicts:
#	build.gradle

# Conflicts:
#	build.gradle
2020-12-11 18:01:29 +01:00
Jacques Le Roux ce2f66b720 Fixed: Hyperlink title under form widget doesn't support character encoding for special characters (OFBIZ-12026)
When we use any title with special characters for hyperlink tag, it shows broken
string on UI, eg:
<hyperlink description="${uiLabelMap.CommonImportExport}"  target="ImportExport">
should render a button with the title "Import/Export. But it shows as
Import&#x2f;Export

jleroux: I have noticed that the same happens with special French characters.
So it's a general issue.
The title (description in code) is HTML encoded and that does not work for
special characters. I simply used a string encoder.

Thanks: Pradeep Choudhary for report, Sourabh Jain for a possible but not
general solution at OFBIZ-12023, ie using target-type="plain"
2020-12-11 13:43:15 +01:00
Jacques Le Roux aaed04d7c8 Fixed: Label issue on List Companies page (OFBIZ-12023)
Navigate to URL: 'accounting/control/ListCompanies'
Under the companies list, the 2nd column has button for account
The System is not showing proper label in French.

This issue is occurring due to the hyperlink title is not supporting character
encoding for special characters. Please track progress under OFBIZ-12026.
2020-12-08 09:39:30 +01:00
Jacques Le Roux 13001ee048 Fixed: Secure the uploads (OFBIZ-12080)
module should be MODULE in SecuredUpload class

Improves: add adio adn video to supported file formats in security.properties

# Conflicts handled by hand
#	framework/security/config/security.properties
2020-12-07 19:46:11 +01:00
Jacques Le Roux e50ad56bb9 Improved: Adds the HTML <input> accept Attribute in form widgets and Freemaker templates (OFBIZ-12049)
As explained at
https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/accept
this is only an help for the users (ie not a security feature), but an
appreciable one easy to implement.

Here we start with website/WebSiteCMSContent.ftl
Also add some missing file extensions
2020-12-07 18:34:45 +01:00
Jacques Le Roux 7ff8fb814e Fixed: Secure the uploads (OFBIZ-12080)
Handles audio and video formats supported by Tika.

Adds few new audio and video formats in seed data.

AFAIK there are no ways to embed a webshell in an audio or video file. So I did
not sophisticate the validation, just rely on Tika.

I have also fixed bugs in SecuredUpload: in isValidSvgFile and
isValidImageIncludingSvgFile
2020-12-07 15:11:21 +01:00
Jacques Le Roux dc57528fd4 Fixed: Secure the uploads (OFBIZ-12080)
Improves the labels names and format comment in LayoutEvents.java

I backport to ease later works...
2020-12-06 11:18:26 +01:00
Jacques Le Roux 57c15f615d Fixed: Secure the uploads (OFBIZ-12080)
Replaces RESOURCE by resource, doh!
2020-12-06 11:11:07 +01:00
Jacques Le Roux 9d3631e278 Fixed: Secure the uploads (OFBIZ-12080)
validateUploadedFile() fixes another case reported in August by Harshit

Conflicts handled by hand
applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
2020-12-06 10:20:21 +01:00
Jacques Le Roux 983f4b95ae Fixed: Secure the uploads (OFBIZ-12080)
org.apache.xmlgraphics:batik:1.13 does not include batik-svg-dom it's in
batik:batik-svg-dom:1.6-1.

It's also in org.eclipse.birt.runtime:viewservlets:4.5.0 that's why it worked
only with plugins
2020-12-02 10:04:05 +01:00
Jacques Le Roux f741bb2277 Fixed: Secure the uploads (OFBIZ-12080)
2020/08/10 the OFBiz security team received a security report by Harshit Shukla
<harshit.shukz@gmail.com>, roughly it was (quoting part of it to simplify):

<<I have identified a Remote Code Execution (RCE) Vulnerability. The reason
behind this RCE is lack of file extension check at
catalog/control/UploadCategoryImage?productCategoryId=CATALOG1_BEST_SELL&pload_file_type=category>>

Using this post-auth RCE in OFBiz demos, Harshit was able to get some AWS
credentials by uploading a webshell (based on [0]).
By security, it was then decided by the Infra and OFBiz security teams to shut
down the demos.

After discussing the elements reported with Mark J Cox (VP of ASF security team)
we in common decided that no CVE was necessary.

# Conflicts handled by hand in R18:
#	applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
#	applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java
#	applications/product/groovyScripts/catalog/category/EditCategory.groovy
#	applications/product/groovyScripts/catalog/config/EditProductConfigItemContent.groovy
#	applications/product/groovyScripts/catalog/imagemanagement/ImageUpload.groovy
#	applications/product/groovyScripts/catalog/imagemanagement/SetDefaultImage.groovy
#	applications/product/groovyScripts/catalog/product/EditProductContent.groovy
#	applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
#	applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java
#	applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java
#	applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
#	build.gradle
#	framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java
#	framework/base/src/main/java/org/apache/ofbiz/base/util/HttpRequestFileUpload.java
#	framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java
#	framework/security/config/security.properties

# Conflicts handled by hand in R17:
#	applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
#	applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java
#	applications/datamodel/data/seed/ContentSeedData.xml
#	build.gradle
#	framework/base/src/main/java/org/apache/ofbiz/base/util/HttpRequestFileUpload.java
2020-12-01 10:14:48 +01:00
Jacques Le Roux f6176dba99 Fixed: Label issue on List Companies page (OFBIZ-12023)
Navigate to URL: 'accounting/control/ListCompanies'
Under the companies list, the last column has button for import export.
The System is not showing proper label.

This issue is occurring due to the hyperlink title is not supporting character
encoding for special characters. Please track progress under OFBIZ-12026.

Thanks: Lalit Dashora for report, sourabh jain for patch, Daniel Watford for test
2020-11-30 12:03:17 +01:00
Girish Vasmatkar 2a30d57118 Fixed: Discouraged use of variable to store command with paramaters because of wordsplitting issue
and instead used complete command for wget .(OFBIZ-12066)
2020-11-30 16:26:41 +05:30
Saurabh Dixit 91de16a55c Fixed: Single product tile is displayed on one row in product search. (OFBIZ-12045) (#245)
Cause: Wrong use of bootstrap grid classes.
Fix: Used row class as a parent to col-* class while rendering the products.
2020-11-30 11:40:43 +01:00
Jacques Le Roux e1cfe58828 Fixed: Edit button(s) are shown for shipments received or shipped (OFBIZ-11788)
When a shipment has been received (purchase) or shipped (sales), the shipment
process should be concluded. And thus the shipment should not be editable anymore.

Thanks: Pierre Smits for report, Ankit Joshi for patch
2020-11-29 20:43:10 +01:00
Girish Vasmatkar cc8ee48154 Fixed: Used correct syntax to conctenate bash variable and string such that wgent command runs properly.(OFBIZ-12066) 2020-11-28 15:05:26 +05:30
Deepak Dixit 1f965ca30d Improved: Update IND Geo data as per 2020-11-24 notification (#243)
- Deletion of Union territory IN-DD, IN-DN;
- Addition of Union territory IN-DH;
- Correction of spelling for IN-AR, IN-BR, IN-CH, IN-CT, IN-DH, IN-GJ, IN-HP, IN-HR, IN-JH, IN-JK, IN-KA, IN-LA, IN-MH, IN-ML, IN-NL, IN-RJ, IN-TG, IN-TN, IN-UT;
2020-11-28 12:43:34 +05:30
Jacques Le Roux 9b45ab7aff Reverted: Replace java.io.File::renameTo by java.nio.file.Files::move (OFBIZ-12063)
This reverts commit 1be480b68c.

Actually the problem was due to another WIP where 2 streams were not closed
2020-11-27 11:53:30 +01:00
Jacques Le Roux 7400899b58 Reverted: Replace java.io.File::renameTo by java.nio.file.Files::move (OFBIZ-12063)
This reverts commit 2c86f9a8c0.

Actually the problem was due to another WIP where 2 streams were not closed
2020-11-27 11:51:25 +01:00
Jacques Le Roux ce0b8903ea Fixed: Replace java.io.File::renameTo by java.nio.file.Files::move (OFBIZ-12063)
On Windows in EditProductContent.groovy neither file.renameTo(), Files.move()
nor FileUtils.moveFile works. Copy and delete works.
2020-11-27 10:23:39 +01:00
Jacques Le Roux f6450a01c5 Fixed: Replace java.io.File::renameTo by java.nio.file.Files::move (OFBIZ-12063)
This is a bug because the behaviour is not assured on Windows for instance. So
it's impossible to correctly develop and test.

As explained at
https://docs.oracle.com/javase/8/docs/api/java/io/File.html#renameTo-java.io.File-

<<Many aspects of the behavior of this method are inherently platform-dependent:
The rename operation might not be able to move a file from one filesystem to
another, it might not be atomic, and it might not succeed if a file with the
destination abstract pathname already exists. The return value should always be
checked to make sure that the rename operation was successful.
Note that the Files class defines the move method to move or rename a file in a
platform independent manner.>>

So the expression
  file.renameTo(file1)
used in 5 Application Product Groovy scripts can be easily replaced by
  Path source = file.toPath()
  Files.move(source, source.resolveSibling(filenameToUse))
that is working on all platforms as explained at
https://docs.oracle.com/javase/8/docs/api/java/nio/file/Files.html#
move-java.nio.file.Path-java.nio.file.Path-java.nio.file.CopyOption...-
2020-11-24 18:40:47 +01:00
Jacques Le Roux 008246bf7b Fixed: .sh missing in <<Unix-like OS: ./gradle/init-gradle-wrapper>>
My bad :/

Thanks: Tuck Seng Phoon
2020-11-20 17:39:13 +01:00
Jacques Le Roux 28a6d4391a Fixed: Prevent arbitary file write using webtools/control/EntitySQLProcessor. (OFBIZ-12057)
Shuibo Ye <shuiboye@gmail.com> reported a possible arbitary file write using
webtools/control/EntitySQLProcessor.

    In the "SQL Command" part, I create a table and insert some strings and
    export the table to a file one sentence at a time.
    PoC: CREATE TABLE "test" (string VARCHAR(80))
    INSERT INTO "test" (string) VALUES ('<%= system.getProperty("user.dir") %>')
    call SYSCS_UTIL.SYSCS_EXPORT_TABLE(null,'test','.\framework\webtools\webapp\webtools\default.jsp',null,'*',null)

    After executing the three sentences,I successfully write the file and its url
    is https://localhost:8443/webtools/default.jsp.

I fixed it preventing execution on SYSCS_UTIL.SYSCS_EXPORT_TABLE and JSP, more
could be added if necessary
2020-11-16 14:09:16 +01:00
Jacques Le Roux 6bf785654a Improved: Prevent possible post-auth RCE from webtools/control/ProgramExport (OFBIZ-12055)
This was reported to the security team by Shuibo Ye <shuiboye@gmail.com>.
We did not create a CVE because it's a post-auth "vulnerability"

Thanks: Shuibo Ye
2020-11-14 11:57:15 +01:00
Jacques Le Roux 4925d81d07 Fixed: Handle special characters like single quote in Freemarker template (prevent encoding) (OFBIZ-12029)
A such case was reported by Amit Gadaley at
https://markmail.org/message/ybyjkngdiwrywut6
The solution is to use StringUtil.wrapString() to prevent encoding.
2020-11-10 11:10:57 +01:00
Jacques Le Roux 6dc266996e Fixed: NotSerializableException using uploadPartyContentFile service (OFBIZ-12050)
This error appears after trying to upload a file to party content:

2020-11-06 07:48:22,488 |jsse-nio-8443-exec-7 |RequestHandler                |I|
Sending redirect to:
[https://localhost:8443/partymgr/control/viewprofile?partyId=admin].
2020-11-06 07:48:29,288 |jsse-nio-8443-exec-7 |UtilObject                    |E|
null
java.io.NotSerializableException: org.apache.commons.fileupload.disk.DiskFileItem

# Conflicts handled by hand
#	framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java
#	framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
2020-11-06 11:23:27 +01:00
Jacques Le Roux 69828b37ad Fixed: Sorting of lists generates undesired results (OFBIZ-8302)
For this issue (OFBIZ-8302) I reverted the point 1 of
http://svn.apache.org/viewvc?view=revision&revision=1759555

As reported by Alvaro Munoz from GH security team it's not sufficient:
<<the second part of the fix was not effective, since the attacker can close the
raw string context with a double quote and write a new attribute or even close
the macro tag and write arbitrary FreeMarker code.>>

So this removes the 2nd part and add better solution to fix the OFBIZ-8302 issue
The solution is to encode only the QueryString and to handle it correctly in
UtilHttp::getParameterMap. I must say it was not a sinecure!

# Conflicts:
#	framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
#	framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
2020-10-31 20:01:35 +01:00
Jacques Le Roux 8640250331 Fixed: variant product selection trashes image (OFBIZ-12019)
The variant products' images are being saved in the variable IMG encoded as urls,
thus selecting the variant triggers an image override with an unsuitable file name.

Thanks: Alex Bodnaru
2020-10-06 15:20:15 +02:00
holivier 726ebe8493 fixed: svg files not removed on clean (OFBIZ-11976)
Backport build.gradle correction from OFBIZ-12035, correction in generateAllPluginsDocumentation to put copy of OFBiz-Logo in doFirst to avoid it's run during gradle Configure project
2020-10-02 19:00:18 +02:00
holivier 85db312077 Improvement: Error messages when generating HTML and PDF file from AsciiDoc files (OFBIZ-11893)
minor correction, title level
2020-10-02 18:05:28 +02:00
holivier 744fa72316 Improvement: Error messages when generating HTML and PDF file from AsciiDoc files (OFBIZ-11893)
remove sy-impersonation.adoc because impersonation is not implemented in 17.12
2020-10-02 18:04:39 +02:00
Suraj Khurana f1e8ea734f Fixed: Incorrect data issue for InvoiceItemTypeMap and ReturnItemTypeMap.
(OFBIZ-11971)
As we have returnItemTypeId as RET_MISC_ADJ, same should be used in ReturnItemTypeMap and corresponding InvoiceItemTypeMap.
Thanks Amit Gadaley for reporting and providing the patch.
2020-09-26 18:26:00 +05:30
Jacques Le Roux faadf5a622 Improved: fixes the executionpolicy for last update of Windows 10
Thanks: Georg Potthast for report on user ML
2020-09-26 09:56:27 +02:00
Jacques Le Roux a353cda8b6 Fixed: Error while decoding url parameters with percent character (OFBIZ-12014)
This has been already fixed (an clearly explained) in OFBIZ-10275 and broken
again in OFBIZ-11822

Thanks: Pradeep Choudhary
2020-09-14 11:19:24 +02:00
Jacques Le Roux 8622a761e0 Fixed: display/selection of unit of measure is broken (OFBIZ-11955)
Improve code for UOM dropdown of products like WG-9943

Thanks: Alex

Conflicts handled by hand in ProductDetail.ftl
2020-09-11 11:04:39 +02:00
Akash Jain 4de58fc206 Fixed: Display/functionality improvement in findParty of OOTB regarding classification group (OFBIZ-10302)
Thanks, Rajesh Kumar Mallah for report.
2020-09-01 15:40:36 +05:30
Jacques Le Roux 26075f06a8 Fixed: display/selection of unit of measure is broken (OFBIZ-11955)
Fixes UOM dropdown for products like WG-9943

Thanks: Alex
2020-08-31 10:45:36 +02:00
Jacques Le Roux f83be8652e Fixed: display/selection of unit of measure is broken
(OFBIZ-11955)

This fixes in in order component

Thanks: Alex

Conflict handled by hand in ProductSummary.ftl
2020-08-30 14:11:41 +02:00
Jacques Le Roux 8390abb855 Documented: warns users about demo credentials in production 2020-08-29 10:09:26 +02:00
Akash Jain fddc3ac8c1 Fixed: Default value flags not working for configurable and variant products at the time of order entry (OFBIZ-10532)
Thanks, Deepak Nigam for report.
2020-08-27 18:20:14 +05:30
Jacques Le Roux dcfa5495ad Improved: removes a nonsense word left during a C/P 2020-08-27 09:31:00 +02:00
Jacques Le Roux 3cfed4c657 Fixed: MessagingException in sendShipmentScheduledNotification service (OFBIZ-11984)
This MessagingException issue is with sendFrom, please refer the the code blocks from minilang and groovy versions below,

<!-- find email address for currently logged in user, set as sendFrom -->
<entity-and entity-name="PartyAndContactMech" list="curUserPartyAndContactMechs">
    <field-map field-name="partyId" from-field="userLogin.partyId"/>
    <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>

<first-from-list list="curUserPartyAndContactMechs" entry="curUserPartyAndContactMech"/>
<string-append field="sendEmailMap.sendFrom" string="${curUserPartyAndContactMech.infoString}" prefix=","/>

There should not be a prefix, there is always only 1 sender
sendOrderDeliveryScheduleNotification was also affected

Thanks: Mridul Pathak for analyse
2020-08-26 19:53:08 +02:00
Jacques Le Roux 977d2afb0f Improved: svg files not removed on clean (OFBIZ-11976)
After removing the temporary diles in generateAllPluginsDocumentation
this removes them also in generatePluginDocumentation.

Despite that they still appear after simply running gradlew ofbiz (without any
change), I mean:
ofbiz-framework\plugins\birt\src\docs\asciidoc\images\OFBiz-Logo.svg
ofbiz-framework\plugins\ebay\src\docs\asciidoc\images\OFBiz-Logo.svg
ofbiz-framework\plugins\ldap\src\docs\asciidoc\images\OFBiz-Logo.svg
ofbiz-framework\plugins\myportal\src\docs\asciidoc\images\OFBiz-Logo.svg
ofbiz-framework\plugins\projectmgr\src\docs\asciidoc\images\OFBiz-Logo.svg
ofbiz-framework\plugins\solr\src\docs\asciidoc\images\OFBiz-Logo.svg

I have no ideas why :/
2020-08-25 15:06:10 +02:00
Jacques Le Roux 31a3a75938 Fixed: svg files not removed on clean (OFBIZ-11976)
Files like birt/src/docs/asciidoc/images/OFBiz-Logo.svg, in many plugins,
don't get removed on clean.

I simply missed to clean them in pluginAsciidoc Gradle task (OFBIZ-10677)

Thanks: Alex Bodnaru for report
2020-08-23 17:42:52 +02:00
Jacques Le Roux 5ebc88d213 Fixed: Bug in order manager main page when using Arab language (OFBIZ-9687)
It seems that we are getting the issue due to the special character "/" which is
present in OrderManager Uilabel.
I just changed the OrderManager Uilabel value from Buy / Sell Order Manager to
Order Manager and removed the special character "/".

Thanks: Mohammed Rehan Khan
2020-08-22 18:13:37 +02:00
Jacques Le Roux b9b22a56c7 Improved: Add a title to Javadoc overview (OFBIZ-11950)
We can add a global version heading using the Gradle title Javadoc option:
https://docs.gradle.org/current/dsl/org.gradle.api.tasks.javadoc.Javadoc.html

Relates to https://markmail.org/message/t3svau3udlwaa7mq
2020-08-12 15:50:57 +02:00
Akash Jain 09a4b32ec2 Fixed: View Image button on order view page fails to render the image (OFBIZ-11734)
Thanks, Arpit Mor for reporting.
2020-08-04 16:05:44 +05:30
Jacques Le Roux 9a0bda00f8 Fixed: Server-Side Template Injection using Static (OFBIZ-11871)
Thanks to Alvaro's explanations, the problem was in MacroFormRenderer where, for
lookups, we retrieve _LAST_VIEW_NAME_ as a parameter without encoding it.

Got hard conflicts, all done by hand.

Thanks: Alvaro for advice
2020-08-03 10:43:56 +02:00
Jacques Le Roux 9058351d1f Improved: changes content of VERSION file added during INFRA-19443 2020-07-29 11:49:15 +02:00
Jacques Le Roux 084eb85c0b Improved: removes VERSION file added during INFRA-19443 2020-07-29 11:35:52 +02:00
Jacques Le Roux 95d3aadcb5 Fixed: Inconsistent String Comparisons (OFBIZ-9254) & Uploading image to data resource (OFBIZ-10834)
Changes made in startsWith and indexOf methods in ContentManagementServices
for OFBIZ-9254  where wrong (reversed). Fortunately only place where this happened.

I added a comment to make clear why we have 2 empty else if

I'll backport later, conflicts to handle by hand...

Thanks: Ankush Upadhyay for spotting the bug

Conflicts handled by hand
2020-07-27 14:47:30 +02:00
Jacques Le Roux 8dc864ff71 Fixed: Unable to create event in SFA component (OFBIZ-9901)
The tests failed because CAL_OWNER instead of CONTACT was necessary

Handled by hand, cherry-pick was impossible
2020-07-25 19:24:50 +02:00
Jacques Le Roux 1662e5b42e Fixed: One page checkout is broken because of ordermgr::getAssociatedStateList (OFBIZ-11838)
On orderview screen at the ordermgr, when a user tries to change the status of
the order, in OrderInfo.ftl, we are calling "changeOrderStatus" request as

<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>

Hence when the request is done, it is rewriting URL to
https://localhost:8443/ordermgr/control/changeOrderStatus/orderview.

When js functions running in the backend like "getAssociatedStateList" are
called, they are getting the wrong URL to send a request to. This was causing
the issue.

For now, there are two different fixes that can handle both problems which are
mentioned in OFBIZ-2562 and OFBIZ-11838.

1.
  To change the request mapping for "changeOrderStatus" and add request-redirect
  to "orderview" screen. Change the actions in the forms in OrderInfo.ftl to
  call "changeOrderStatus" request only and then remove code in
  "getAssociatedStateList" js function to rewrite URL.

2.
  To add .length to the existing URL rewrite code written in
  "getAssociatedStateList" js function as

if (jQuery('#orderViewed').length) {
    requestToSend = "/ordermgr/control/getAssociatedStateList"
}

Thanks: Pritam Kute!

I picked the 2nd solution
2020-07-25 19:21:38 +02:00
Aditya Sharma ca62bd6cef Fixed: Unable to create event in SFA component (OFBIZ-9901)
When creating event for the party other than the loggedin user, the party should be in CAL_OWNER role to be added to event. Added appropriate check in service along with the error message.
Thanks Rubia Elza Joshep for reporting the issue and Aditi Patidar for providing the patch
2020-07-25 19:05:58 +05:30
Jacques Le Roux c0b11bdfad Improved: Adds missing jGrowl map file (OFBIZ-11892)
Picked from
https://cdnjs.cloudflare.com/ajax/libs/jquery-jgrowl/1.4.6/jquery.jgrowl.map

Thanks to Alex Bodnaru

Conflicts: added jquery.jgrowl.map by hand
2020-07-23 09:14:27 +02:00
Aditya Sharma bf0c628dfb Fixed: pre push failures due to absence of checkstyle plugin (OFBIZ-11304)
We have added a Gradle plugin com.github.jakemarsden.git-hooks which install pre push hook on developer machine, but due to limitations of checkstyle plugin with the Gradle version of release 17.12 these changes cannot be backported. Once the hook is installed it is difficult to remove the hook when branch changes. With the absence of checkstyle plugin, the hook fails when pushing code. To avoid such failures added a dummy task with the same name.
2020-07-22 19:02:10 +05:30
Jacques Le Roux b0b4ba4d56 Improved: Reflected XSS in content component (OFBIZ-11840)
Fixes a Reflected XSS vulnerability in content component

Harshit Shukla reported it to the OFBiz security team:
https://demo-stable.ofbiz.apache.org/content/control/stream?contentId="><svg/onload=alert(0)>

It's a post-auth vulnerability so we did not ask for a CVE.

Thanks: Harshit Shukla harshit.shukz@gmail.com
2020-07-18 12:09:46 +02:00
Jacques Le Roux 346ddf229e Improved: Hard coded label in ProductUomDropDownOnly (OFBIZ-11891)
The select label is not receiving translations.

There are more related issues, but this is independent.

Thanks: Alex Bodnaru
2020-07-16 14:36:12 +02:00
Jacques Le Roux 4c8141e07a Fixed: wrong image name in css. missing map file (OFBIZ-11881)
The 'background-image:url("/d.png")' thing has already been fixed with
OFBIZ-10895 but wrongly backported it seems.

Thanks: Alex Bodnaru for report
2020-07-15 21:08:16 +02:00
Jacques Le Roux c248af0c55 Improved: adds links to the HTML and PDF versions on the web site 2020-07-12 11:52:58 +02:00
Jacques Le Roux b7b7cad1a2 Fixed: MODULE is not module :/ (backporting is never easy!) 2020-07-11 11:20:28 +02:00
Jacques Le Roux 76beb10627 Improved: Put the AsciiDoc files in main repo under the web site (OFBIZ-11879)
We have AsciiDoc files in main repo and it would be better to have them also in
HTML format under the web site: https://ci.apache.org/projects/ofbiz/site

For that a new generateReadmeFiles is needed and new "readme" locations under
each of https://ci.apache.org/projects/ofbiz/site "sub-dirs".
We can create those from Buildbot like we did with INFRA-20311
2020-07-11 09:54:32 +02:00
Jacques Le Roux 0e3b1c7a49 Improved: better message for host-headers-allowed
Adds an explanation about what to do when using own domain.

Some users don't look into the log so it's better to set also the exception
message in order for them to have it right at 1st glance.
2020-07-11 09:54:18 +02:00
Jacques Le Roux ba15f2ec77 Improved: Adds information to install without the demo data 2020-07-08 10:34:28 +02:00
Jacques Le Roux 6622277585 Fixed: DatabaseUtil::getColumnInfo does not retrieve PK due to connection-locks (OFBIZ-11312)
I wrongly removed a line when backporting by hand
2020-07-04 11:52:19 +02:00
Jacques Le Roux 791be06575 Improved: Removes a deprecated comment (work is done) 2020-07-04 11:15:14 +02:00
Jacques Le Roux 4b8ee87aef Improved: Cannot find the declaration of element 'web-app' in version 3.0 files. (OFBIZ-6993)
I missed to backport changes web.xml (was OK in plugins)
2020-07-04 10:30:49 +02:00
Michael Brohl accca2d388 Fixed: Added missing AJP connector property introduced for Tomcat 9.0.31
(OFBIZ-11848)
2020-07-03 17:35:06 +02:00
Suraj Khurana cb228cd11f Fixed: Console warnings related to OrderHeader caching.
(OFBIZ-11858)
Thanks Praveen Sharma for the patch and Jacques for review.
2020-07-02 11:10:44 +05:30
Michael Brohl 0eeaee6a25 Fixed: Upgrades Tomcat to 9.0.36 due to CVE-2020-11996 (OFBIZ-11848) 2020-06-28 12:46:47 +02:00
Pawan Verma f6353957e2 Fixed: EntityQuery queryCount is throwing error with distinct method (OFBIZ-11294)
Added missing support for selectFields in queryCount and all the subsequent methods.

Thanks: Deepak Dixit for the review.
2020-06-28 01:43:44 +05:30
Jacques Le Roux 4a71a959a6 Fixed: With Rainbow theme, a scrollbar appears at bottom where it's not needed
(OFBIZ-10174)

With Rainbow theme, even in large screens, a scrollbar appears at bottom where
it's useless.

The CSS which is adding a border-right on the application bar is adding extra
1px width causing this issue. Attached the patch to remove extra width for the
same.

Changes made by hand
2020-06-27 16:19:41 +02:00
Jacques Le Roux b09fa66ed3 Fixed: IDOR vulnerability in the order processing feature in ecommerce component (OFBIZ-11836)
Fixes a bug when there are no problem viewing the order, my bad
2020-06-27 10:47:06 +02:00
Jacques Le Roux 8120f75b21 Fixed: IDOR vulnerability in the order processing feature in ecommerce component (OFBIZ-11836)
https://demo-stable.ofbiz.apache.org/ecommerce/control/order.pdf?orderId=WSCO10000

In the above URL, the parameter 'orderId' has the value 'WSCO10000' and after
incrementing the value to 'WSCO10001' or 'WSCO10002' will download the receipt
of other orders which have been placed by other users.

All the available order receipts can be downloaded by running an automated tool
(Burp Intruder) on the parameter 'orderId=WSCOXXXXX'

I have successfully tested this by using 2 different accounts: DemoCustomer and
DemoCustomer2

An attacker can download order receipts of other users and this could lead to
information disclosure.

The only real solution to this issue is to implement access control. The user
needs to be authorized for the requested information before the server provides
it.

Thanks: Harshit Shukla [mailto:harshit.shukz@gmail.com]reported this IDOR
vulnerability to the OFBiz security team, and we thank him for that.
2020-06-26 09:29:57 +02:00
Jacques Le Roux 4079b54ece Fixed: getEntityRefData service has a weird issue (OFBIZ-11401)
It's reproductible on trunk demo though only visible in log, UI shows no issue

R17 and R18 are also affected, R16 is OK.

Ankush: This stacktrace should be coming for all entities where
default-resource-name is defined on entity definition but no property exist in
defined resource for key EntityDescription.entityname and FieldDescription.field.

As we want to have these entity labels as much as possible, we can simply print
warning about the missing entity descriptions and field descriptions for
readability purpose instead of printing huge exceptions stacktrace.

Thanks: Ankush Upadhyay and Pierre Smits for the help

Handled by hand (swallowing exceptions is lazy and bad :p)
2020-06-18 17:51:36 +02:00
Jacques Le Roux a603349b55 Fixed: Double encoded urls are not being decoded (OFBIZ-11822)
This was broken by OFBIZ-10275

Thanks: Alex Bodnaru
2020-06-15 13:31:42 +02:00
Aditya Sharma 685b7c3d82 Fixed: Check embedded Javascript libs vulnerabilities using retire.js
(OFBIZ-11752)

Upgraded jQuery to 3.5.2 and jQuery migrate to 3.3.0 to vulnerabilities of medium severity
Regex in its jQuery.htmlPrefilter sometimes may introduce XSS; https://blog.jquery.com/2020/04/10/jquery-3-5-0-released/
2020-06-15 13:21:43 +05:30
Jacques Le Roux e47e0142a0 Improved: no functional change
Adds missing ASL2 licenses

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1860259 13f79535-47bb-0310-9956-ffa450edef68
2020-06-09 17:47:49 +02:00
Jacques Le Roux 7a46ad7a4c Improved: Removes plugins as a submodule (OFBIZ-8459)
This was wrongly put in with several commits done for OFBIZ-8459 where plugins
https://gitbox.apache.org/repos/asf?p=ofbiz-framework.git;h=b39c179
https://gitbox.apache.org/repos/asf?p=ofbiz-framework.git;h=3a4d22
https://gitbox.apache.org/repos/asf?p=ofbiz-framework.git;h=bda6192
2020-06-09 16:12:08 +02:00
Jacques Le Roux abad801b0c Fixed: plugins in common-theme/webapp/common/js is not monitored by git (OFBIZ-11745)
In .gitignore in root ofbiz directory there is plugins/

so all directory plugins are ignored

if the line is replace by /plugins/ only root directory plugins is ignored

Thanks: Olivier

Conflict handled by hand
2020-06-09 14:55:01 +02:00
Suraj Khurana f914203956 Fixed: Unnecessary iterations and setting inventory for all productFacilities in setLastInventoryCount.
(OFBIZ-11796)

Instead of updating all product facilities records on one inventory item change, we should be changing only specific product facility record for that the inventory item belongs to. Thanks Jacques, Pierre, Pawan and Arun for the review.
2020-06-08 18:02:33 +05:30
Pawan Verma 079e909f21 Fixed: startup-service does not work without runtime-data-id(OFBIZ-11668) 2020-06-02 17:26:14 +05:30
Pawan Verma 260c0bb36b Fixed: Overview of shipments shows links to edit shipment it should point to viewshipment(OFBIZ-11787)
Thanks: Pierre for your contribution.
2020-06-02 17:16:22 +05:30
Pawan Verma 5414813438 Fixed: UI issue in payment lookup(OFBIZ-9476)
Thanks: Pallavi for report and patch and pierre from the review.
2020-06-02 16:38:18 +05:30
Pawan Verma f45c3ce988 Fixed: ViewShipment in facility does not show phone details(OFBIZ-11785)
Thanks, Pierre for the report.
2020-06-02 15:35:34 +05:30
Jacques Le Roux 7252dbf4e3 Improved: adds pull_request_template.md (OFBIZ-11722)
Forgot to commit the replacement
2020-05-31 08:51:26 +02:00
Aditya Sharma aec541efe1 Fixed: RequestHandlerException due missing controller entries
(OFBIZ-9478)
Fixed missing Lookup controller entries for the following pages:
1. LookupBudget for Employment Applications page of party
2. LookupDataResource for Content page of facility
3. LookupFixedAsset for Inventory Items Details page of facility

Thank you Pallavi Goyal for reporting the issue and Humera Khan for providing the patch
2020-05-31 09:57:07 +05:30
Pawan Verma 38a4202d91 Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408) 2020-05-30 23:09:18 +05:30
Pawan Verma 482df0ba5e Fixed: Adding a group order generates an error(OFBIZ-6408)
The error is caused by an invalid expression, the two boolean evaluations should reside in the same groovy scriptlet.

Thanks, Pierre for report, Scott for the solution and Adrian, Jacques, Rahul for the review.
2020-05-30 15:38:12 +05:30
Pawan Verma 673fddf72b Fixed: productServiceOrder-test issue, it has been introduced after we fixed InventoryItemStatus is not updated to INV_PROMISED status(OFBIZ-8459)
Thanks, Jacques for the report.
2020-05-28 20:00:22 +05:30
Pawan Verma 16b8a789af Revert "Fixed: productServiceOrder-test issue, it has been introduced after we fixed InventoryItemStatus is not updated to INV_PROMISED status(OFBIZ-8459)"
This reverts commit 78e1ee1795.
2020-05-28 19:54:32 +05:30
Pawan Verma 78e1ee1795 Fixed: productServiceOrder-test issue, it has been introduced after we fixed InventoryItemStatus is not updated to INV_PROMISED status(OFBIZ-8459)
Thanks, Jacques for the report.
2020-05-28 19:46:51 +05:30
Pawan Verma e375286c74 Fixed: InventoryItemStatus is not updated to INV_PROMISED status while creating sales order for serialized product(OFBIZ-8459)
Thanks, Vaibhav for the report and patch and Pranay for the review.
2020-05-28 17:34:23 +05:30
Jacques Le Roux 17f4d36ec1 Documented: Create a simple INSTALL file with minimum installation information and redirection to more documentation
(OFBIZ-11691)

Following https://markmail.org/message/xi2bcvnmpdfvfgk2 discussion on dev ML
here is the file I suggest. If we are OK we can backport it to the supported
release branches. Of course I'm open to modifications...

Thanks for their answers: Deepak Nigam, Michael Brohl, Pierre Smits and
Taher Alkhateeb
2020-05-25 18:20:53 +02:00
Aditya Sharma cbeffa91f0 Fixed: paginateOrderList does not find orders on next page specific to FindOrders.ftl
(OFBIZ-11356)
Adding the missing showAll flag in the paginateOrder form because of which the orders were not shown while submitting the next button.
Thanks Michael Brohl for reporting the issue and Ankit Joshi for providing the patch
2020-05-23 16:23:40 +05:30
Jacques Le Roux d708d9afcb Fixed: Apache OFBiz unsafe deserialization of XMLRPC arguments (CVE-2020-9496)
(OFBIZ-11716)

Because the 2 xmlrpc related requets in webtools (xmlrpc and ping) are not using
authentication they are vulnerable to unsafe deserialization.

thanks: Alvaro Munoz <pwntester@github.com> from the GitHub Security Lab team
2020-05-19 15:59:39 +02:00
Pawan Verma d913366851 Fixed: Issue with redirect queryParameters when the user is logged out
(OFBIZ-11714)

In OFBIZ-10539, We missed removing the line which was adding parameters into the map as Ritesh suggested a good way to handle parameters. I've removed that redundant line of code and attaching a patch for the same.
2020-05-19 17:24:23 +05:30
Jacques Le Roux c7a5b22e0e Improved: Prevent FreeMarker Template Injection (SSTI)
(OFBIZ-11709)

This commit does 2 things:

Send a correct commit comment (kind of amendment, w/o push force)
Previous code compiled but SAFER_RESOLVER is not a class but a field, better KISS

Real change:
Better style with line not too long:
2020-05-18 22:50:28 +02:00
Jacques Le Roux 78cb314066 Improved:
Implemented:
Documented:
Completed:
Reverted:
Fixed:

(OFBIZ-)
Explanation
Thanks:
2020-05-18 15:26:15 +02:00
Jacques Le Roux c502a978a0 Improved: Prevent FreeMarker Template Injection (SSTI)
(OFBIZ-11709)

Fixes all the conflicts previously handled by hand (no merge was possible)
2020-05-18 13:48:31 +02:00
Jacques Le Roux babd23282e Improved: Prevent FreeMarker Template Injection (SSTI)
(OFBIZ-11709)

Some people may want to use another TemplateClassResolver than SAFER_RESOLVER
This creates a new templateClassResolver security property and uses it in
FreeMarkerWorker::makeConfiguration by default

Conflicts all handled by hand (no merge possible)
2020-05-18 13:35:02 +02:00
Jacques Le Roux dc60f6fdb3 Fixed: Prevent FreeMarker Template Injection (SSTI)
(OFBIZ-11709)

Since Freemarker 2.3.17 a known solution to these issues is to register a
TemplateClassResolver in Freemarker configuration in order to limit which
TemplateModels can be instantiated in the templates. The predefined resolver
SAFER_RESOLVER doesn't allow to instantiate the Execute class[4].

So the solution is to add the line
    newConfig.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER);
in FreeMarkerWorker.java
2020-05-16 20:56:54 +02:00
Pawan Verma 6b04468f45 Fixed: Theme files loading taking longer time
(OFBIZ-11665)

Thanks: Pierre and Jacques for the review.
2020-05-10 14:19:03 +05:30
Pierre Smits 039d51062c Fixed: ListParty doesn't show middleName
(OFBIZ-11681)

Fixes a logic error
2020-05-09 16:10:00 +02:00
Pawan Verma 454230e613 Fixed: Promised Datetime & Current Promised Date values not getting updated in OISGIR Entity
(OFBIZ-10538)

Thanks: Deepak, Taher, Ravi, Amit, Suraj for the contribution.
2020-05-06 11:53:40 +05:30
Pawan Verma 4cd701023c Fixed: Issue with opening a page via bookmark when the user is logged out
(OFBIZ-10539)

Thanks: Ritesh Kumar for report and the patch and Girish for the review.
2020-05-05 14:58:58 +05:30
Pawan Verma 95a65c3dd2 Fixed: Creating custom Time Period does not show in party time period
(OFBIZ-10904)

Thanks, Pierre and Jacques for your contribution.
2020-05-04 15:21:47 +05:30
Jacques Le Roux 41737adca3 Improved: enough of stash issues, adds upload to runtime/.gitignore 2020-05-02 12:49:49 +02:00
Jacques Le Roux 27c91802fc Improved: Improve ObjectInputStream class
(OFBIZ-10837)

While working on OFBIZ-11633 I crossed an issue in R18 (not in trunk) where
objects from org.apache.commons.fileupload (namely DiskFileItem and
FileItemHeadersImpl) are not serializable.

While at it I decided to handle at the SafeObjectInputStream level
the "fileItems" case I already crossed with, OFBIZ-11534, in RequestHandler

It has an inconvenient in R18 (not in trunk) where ObjectInputStream can't
handle a null class (of course) and so return a benign exception in log (only).

I believe it's better to handle these specific cases at the lower possible
level in all supported branches.
2020-05-02 12:42:45 +02:00
Jacques Le Roux 45535e34cb Fixed: PartyProfileContent.js does not work
(OFBIZ-11633)
When you upload a content from the party profile page you don't see a progress
bar. The PartyProfileContent.js is loaded but for some reason is unused or wrong

Mohammad Kathawala mentionned that it was removed with OFBIZ-9299
It was also broken with OFBIZ-11402

Thanks: Mohammad for the track

Conflicts handled by hand
 applications/party/template/party/profileblocks/Content.ftl
 framework/common/groovyScripts/CommonServices.groovy
2020-05-02 12:42:12 +02:00
Suraj Khurana 972401bb9d Fixed: Incorrect value in entity-auto invoke for removeProductFeatureDataResource.
(OFBIZ-11614)

It was may be a typo introduced in rev 1728261, fifty months ago.
2020-04-30 17:04:33 +05:30
Pawan Verma 5eadb77a88 Incorrect column alias in EntitySQLProcessor for sql query working with mysql
(OFBIZ-11573)

More details: Method getColumnLabel returns the designated column's suggested title for use in printouts and displays. Method getColumnName returns the designated column's name.

Thanks: Suraj and Jacques for the review.
2020-04-28 10:57:56 +05:30
Pawan Verma 520cc35935 Fixed: Create Exchange Order button on Return screen is distorted
(OFBIZ-11144)

Thanks: Devanshu for the report, Suraj and Jacques for the review.
2020-04-28 10:14:27 +05:30
Jacques Le Roux 0e20d16cfd Fixed: Compound-widget not works with condition
(OFBIZ-11606)

Fixes "<**:condition" not well managed and generating an error

Changes all the getNodeName() by getLocalName() in the ModelX****Condition.java

Thanks: Olivier
2020-04-27 17:45:28 +02:00
Jacques Le Roux 6189bd8ddd Fixed: Compound-widget not works with condition
(OFBIZ-11606)

rootElement is not correct for a compound file, it's necessary to do a
UtilXml.firstChildElement(rootElement, "forms"); to be correct.
It's done for screen, form but not for grid !

So correction is now added the correct read of rootElement.

jleroux: completely backported by hand

Thanks: Olivier
2020-04-27 15:08:40 +02:00
Deepak Dixit 8a4a68e9f9 Fixed: Used the jdk 8 compatible version for gradle-svntools-plugin
(OFBIZ-11601)
build.grale using latest.release of gradle-svntools-plugin, and gradle-svntools-plugin release its latest release on 19th with jdk11 compatible. So this is causing build failure
2020-04-20 11:37:27 +05:30
Jacques Le Roux 4b43b0c639 Fixed: Error removing an uploaded party content
(OFBIZ-11597)

When you try to remove an uploaded party content you get this error:

ControlServlet                |E| Error in request handler:
org.apache.ofbiz.webapp.control.RequestHandlerException:
Unknown request [removePartyContent/viewprofile];
this request does not exist or cannot be called directly.

While at it I also fixed the similar case for payment methods
2020-04-17 17:33:24 +02:00
Jacques Le Roux 9f5ebc48fd Fixed: Error in uploading very large files, ie >2MB
(OFBIZ-11534)

This was not supposed to be committed, actually (wrong) part of OFBIZ-11597

Fixed: Error in uploading very large files, ie >2MB

(OFBIZ-11534)

There is an issue in uploading large files, I am able to upload files up to 2 GB
successfully but getting an error when trying to upload a file larger than 2GB.

Example -
1. Go to party profile -
https://demo-trunk.ofbiz.apache.org/partymgr/control/viewprofile?partyId=admin
2. Try to create a party content with a file larger than 2 GB
3. Error on console

jleroux:
For a 2GB+ file you need to set Xmx to more than the double of the file size,
eg: gradlew ofbiz -PjvmArgs="-Xms1024M -Xmx5048M"

You then get another small issue (only in log) when redirecting to send the
partyId parameter.

This is because, DiskFileItem is a temporary Object with a null value contained
in "fileItems" attribute. It can't be detected by UtilMisc::makeMapSerializable
and that makes "fileItems" not serializable. So it must be removed from
reqAttrMap.

Thanks: Chandan Khandelwal for report, Michael for suggesting a very large file
to upload
2020-04-16 16:16:14 +02:00
Jacques Le Roux 9530d4b441 Documented: Adds the CSRF defense documentation (missed the add last time) 2020-04-15 19:44:03 +02:00
Jacques Le Roux 242e62d6f3 Documented: Adds the CSRF defense documentation 2020-04-15 19:44:01 +02:00
Jacques Le Roux 1e8ffb4906 Improved: Adds the download-the-gradle-wrapper section 2020-04-07 15:29:55 +02:00
Jacques Le Roux b14516202d Improved: Removes deprecated README.md file 2020-04-07 12:24:40 +02:00
Ulrich Heidfeld 5b5029312a Improved: Decodes AjaxAutocompleteOptions return value
(OFBIZ-11475)
2020-04-05 14:01:16 +02:00
Jacques Le Roux 42ad34f0b6 Fixed: removes a wrong import due to CSRF token backport trying 2020-04-05 12:02:06 +02:00
Jacques Le Roux 793628bb15 Fixed: Prevent Host Header Injection (CVE-2019-12425)
(OFBIZ-11583)

Conflicts handled by hand
  framework/security/config/security.properties
  framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
2020-04-05 11:40:48 +02:00
Jacques Le Roux 84e102a6a1 Revert "Merge branch 'JacquesLeRoux-POC-for-CSRF-Token-OFBIZ-11306' into trunk"
This reverts commit 27e57522b1.
2020-04-05 10:05:16 +02:00
Jacques Le Roux 27e57522b1 Merge branch 'JacquesLeRoux-POC-for-CSRF-Token-OFBIZ-11306' into trunk
Because of GitHub message on PR56:
This branch cannot be rebased due to conflicts

Much Conflicts, but that should be OK
2020-04-04 18:41:14 +02:00
Jacques Le Roux cf936d6c5e Fixed: The createTaskContent request does not work
(OFBIZ-11246)

It seems that same request can not be parsed multiple times if it has multi part
object in it as the parse method remove it after that.

Found one stackoverflow link around the same:

https://stackoverflow.com/questions/13881272/
servletfileuploadparserequestrequest-returns-an-empty-list

I believe that all places/uploads using this workflow should resulting the same
issue.

One possible solution I could think of without going with new approach is to set
list of file Items into the request attribute and use it if parse method remove
it and unable to retrieve on 2nd call.

Thanks: Ankush Upadhyay for the analysis and initial patch. I only slightly
modified it.
2020-03-27 11:09:36 +01:00
Jacques Le Roux 7e03082d92 Improved: Improve Web Content Caching
(OFBIZ-11477)

According to OWASP OFBiz Web Content Caching is weak:

Independently of the cache policy defined by the web application, if caching web
application contents is allowed, the session IDs must never be cached, so it is
highly recommended to use the Cache-Control: no-cache="Set-Cookie, Set-Cookie2"
directive, to allow web clients to cache everything except the session ID

I though noticed that Set-Cookie2 is deprecated for a long time now. And we new
browsers policies it to often updated. So no need to use Set-Cookie2.
2020-03-27 10:11:53 +01:00
Jacques Le Roux 1617226897 Fixed: Ensure that the SameSite attribute is set to 'strict' for all cookies.
(OFBIZ-11470)

It's better to allow users to change from strict to lax, at least for all
cookies. Some could want to change it by cookie type. I let the exercise for
them :)
See:https://blog.mozilla.org/security/2018/04/24/same-site-cookies-in-firefox-60

Conflicts handled by hand
	framework/security/config/security.properties
2020-03-21 11:59:46 +01:00
Jacques Le Roux bb26cc1c62 Improved: no functional change
Adds "Content-Security-Policy" frame-ancestors="self" in ErrorPage.ftl
Because this page is used as a HTTP 500 error it's more susceptible to
clickjacking

Quoting OWASP ZAP:
This problem still applies to error-type pages (401, 403, 500, etc.), as these
pages are still often affected by injection problems, in which case it is still
possible that browsers may interpret pages differently from their actual content
type.

I tried to work on other file types that were also reported but it's complicated
adn I believe it's not worth it
2020-03-20 20:21:27 +01:00
Jacques Le Roux 09270a1c34 Fixed: Ensure that the SameSite attribute is set to 'strict' for all cookies.
(OFBIZ-11470)

Forgot to add UtilHttp::SameSiteFilter
2020-03-20 18:05:39 +01:00
Jacques Le Roux 82ef7a5871 Fixed: Ensure that the SameSite attribute is set to 'strict' for all cookies.
(OFBIZ-11470)

As reported by OWASP ZAP:
A cookie has been set without the SameSite attribute, which means that the
cookie can be sent as a result of a 'cross-site' request. The SameSite attribute
is an effective counter measure to cross-site request forgery, cross-site script
inclusion, and timing attacks.

The solution was not obvious in OFBiz for 2 reasons:

1. There is no HttpServletResponse::setHeader. So we need to use a filter
  (SameSiteFilter) and even that is not enough because of 2:
2. To prevent session fixation we force Tomcat to generates a new jsessionId,
ultimately put in cookie, in LoginWorker::login. So we need to add a call to
SameSiteFilter::addSameSiteCookieAttribute in
UtilHttp::setResponseBrowserDefaultSecurityHeaders.
2020-03-20 17:52:21 +01:00
Jacques Le Roux a16271e5c3 Improved: no functional change
Follows the "How to apply the Apache License to your work" section at
https://www.apache.org/licenses/LICENSE-2.0

Removes the references to products only used in plugins
2020-03-14 12:36:49 +01:00
Dennis Balkir 0c7be39acb Fixed: Potential Nullpointer in ErrorPage.ftl
(OFBIZ-11448)

Inserted nullcheck for request-attribute
2020-03-10 16:04:52 +01:00
Daniel Watford 0355006c62 Improved: Add 2020 version of Incoterms
(OFBIZ-11437)

Alter the parent type and descriptions of existing Incoterm TermTypes to
indicate the version of Incoterms they relate to.

Added new Incoterm TermTypes and descriptions correspoding to the
Incoterms 2020 set.

Conflicts handled by hand:
	applications/datamodel/data/seed/PartySeedData.xml
	applications/party/config/PartyEntityLabels.xml
2020-03-06 08:48:13 +01:00
Jacques Le Roux b571234062 Fixed: createMissingCategoryAndProductAltUrls service misses a transaction
(OFBIZ-11441)

Not sure why it had use-transaction="false", makes no sens to me, too old to
check, not a big deal I guess
2020-03-05 10:17:10 +01:00
Jacques Le Roux 3d9b551d65 Merge pull request #42 from danwatford/ofbiz-11437-2020-incoterms-improvement
OFBIZ-11437: Improved: Added 2020 version of Incoterms
(cherry picked from commit 7a34e9cda8)
2020-03-04 15:10:23 +01:00
Jacques Le Roux 8ff603476a Improved: Put the TOCs on left in generated AsciiDoc documentation
(OFBIZ-11423)
Following discussions

* AsciiDoc generated online documentation and releases
* New Online Help, need some ideas
threads on dev ML

I propose as suggested Oliver to put TOCs at the left. If I refer to
https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/119
toc: 'left@'
should be put in the main build.gradle

Thanks: Olivier Heintz for the suggestion
2020-02-27 08:42:49 +01:00
Suraj Khurana 545be00576 Fixed: Picklist is in Input status even after order is completed.
(OFBIZ-10883)

Thanks Rashi Dhagat for reporting, Shikha Jaiswal for the patch and Pawan Verma for review.
2020-02-26 19:26:43 +05:30
Jacques Le Roux 87c0907f88 Fixed: DatabaseUtil.getColumnInfo(...) does not retrieve primary keys due to
connection-locks
(OFBIZ-11312)

The method DatabaseUtil.getColumnInfo(...) uses an elaborate algorithm using a
List<Future<AbstractCountingCallable>> object. This does not work properly as it
runs into connection-locks. When debugging the error does not occur. I assume
that the slower pace of debugging prevents the error.

jleroux: backport conflict handled by hand

Thanks: Benjamin Jugl
2020-02-26 08:50:56 +01:00
Michael Brohl 651231d041 Fixed: Fluent API Bug in getFieldList().
(OFBIZ-10298)

Thanks Benjamin Jugl for reporting and providing the patch.
2020-02-25 21:15:44 +01:00
Michael Brohl aeff5b75ec Documented: Upgrades the documentation references in
catalina/ofbiz-component.xml to the 9.0 documentation.
2020-02-25 15:50:49 +01:00
Michael Brohl 0ea9173e8d Upgrade Tomcat from 9.0.29 to 9.0.31
(OFBIZ-11407)

Overriding the new default property secretRequired to be not required
and added the default property "secret" in the commented out section.
2020-02-25 15:50:47 +01:00
Jacques Le Roux fee85b4a42 Improved:
Implemented:
Documented:
Completed:
Reverted:
Fixed:
Improved: no functional change
(OFBIZ-)
Explanation
Thanks:
2020-02-25 15:50:19 +01:00
Pawan Verma 6b5d4fb565 Fixed: Issue in which Agreement Item can't be removed from Agreement
(OFBIZ-11410)

Reason for the issue was incorrect use of service IN parameters for entity-auto delete invoke.

Thanks, Pierre Smits for the report.
2020-02-24 19:06:34 +05:30
Jacques Le Roux 356be25ad2 Fixed: Improve ObjectInputStream class (CVE-2019-0189)
Improved: no functional change
(OFBIZ-10837) (OFBIZ-11398)

I missed to update the refactored UtilObject class
2020-02-24 12:55:28 +01:00
Jacques Le Roux d31e137293 Fixed: Improve ObjectInputStream class (CVE-2019-0189)
Improved: no functional change
(OFBIZ-10837) (OFBIZ-11398)

Steps to generate:
1. Navigate to - catalog/control/EditProdCatalog?prodCatalogId=TestCatalog
2. Click on - CREATE SEO CATEGORY/PRODUCTS
3. The broken page will be displayed

The issue is due to the use of a GString in
createMissingCategoryAndProductAltUrls().

This:
    result.successMessageList = [
        "Categories updated: ${categoriesUpdated}",
        "Products updated: ${productsUpdated}"

As it's common to use such expressions I have added the necessary
org.codehaus.groovy.runtime.GStringImpl groovy.lang.GString
to the white list of classes in listOfSafeObjectsForInputStream in
SafeObjectInputStream.properties

I finally have also decided to use this property as default and commented for
committers to be aware that it should be also put in DEFAULT_WHITELIST_PATTERN
in SafeObjectInputStream class. Because if, for a reason,
listOfSafeObjectsForInputStream is empty OFBiz will still be protected

Note: cherry picking did not work at all. The change was completely handled by
hand. Fortunately, it was just about copyin 2 files from trunk

Thanks: Dikpal Kanungo for reporting
2020-02-24 11:55:52 +01:00
Deepak Dixit 1a8903e1d5 Fix build failure for release17.12 2020-02-23 16:56:57 +05:30
Deepak Dixit f5c92c053c Added missing ErrorPage.ftl file
(OFBIZ-10753)
2020-02-23 16:10:22 +05:30
Michael Brohl 0dd0264d7d Provide a FileItem entry in UtilHttp.getMultiPartParameterMap.
(OFBIZ-11346)
2020-02-22 12:01:04 +01:00
Suraj Khurana b694b38960 Fixed: Product Price set based on 'Purchase Price Agreement' isn't honoured while same is used during ordering.
(OFBIZ-7610)

Thanks Ankush Upadhyay for the patch and Swapnil Shah for reporting the ticket.
2020-02-22 14:41:18 +05:30
Jacques Le Roux 250991a517 Fixed: replaceFirst sensible to variable pattern
(OFBIZ-11396)

When using variable pattern with replaceFirst you may cross issues if the
pattern contains specific tokens. For instance on Windows with the path
"C:\projectsASF\Git\ofbiz-framework/" you have inside the token "\p" which has
a special meaning.
2020-02-22 09:43:44 +01:00
akash e0ec691cbf Fixed: Issue while redirecting to Request Detail Screen from View Communication Event
(OFBIZ-9658)

Thanks, Ankit Joshi for your contribution.
2020-02-22 13:33:48 +05:30
Deepak Dixit 5776818efb Added missing GeoAssoc data for Ladakh geo
(OFBIZ-11399)
2020-02-22 13:03:41 +05:30
Deepak Dixit c315244900 Update India Geo information according to ISO notifications 2019-11-22
(OFBIZ-11399)

Change of subdivision category from state to Union territory for IN-JK; Addition of Union territory IN-LA;
2020-02-22 12:56:11 +05:30
Suraj Khurana c175337b84 Fixed: UserLoginPasswordHistory is not maintaining password as present in UserLogin.
(OFBIZ-10802)
Thanks Rohit Koushal for the patch. Thanks Jacques Le Roux and Gil Portenseigne for the review.
2020-02-22 12:53:28 +05:30
Jacques Le Roux afae70b71a Fixed: replaceFirst sensible to variable pattern
(OFBIZ-11396)

When using variable pattern with replaceFirst you may cross issues if the
pattern contains specific tokens. For instance on Windows with the path
"C:\projectsASF\Git\ofbiz-framework/" you have inside the token "\p" which has
a special meaning.
2020-02-22 07:30:46 +01:00
Jacques Le Roux 872c329618 Fixed: The "stream" request-map in ecommerce and commonext controllers
requires authentication
(OFBIZ-11349)

Thanks: Michael for reporting a possible issue when only commenting the "stream"
request-map in commonext controller. And Jacopo to suggest to require
authentication (after suggesting to comment out)

It should be also noted that when the CSRF defense implementation will be in
place, all XSS vulnerabilities w/o authentication will not longer be possible.
Because then all requests shall contains a CSRF token.
2020-02-19 13:50:05 +01:00
Jacques Le Roux 3d85b1ca1e Fixed: Temporarily comment out the "stream" request-map in commonext controller
for security reason
(OFBIZ-11353)

A vulnerability has been reported to the OFBiz security team. To be able to
release the 17.12.01 version with this vulnerability fixed we need to require
(maybe only temporarily) the "stream" request-map in commonext controller
to need authentication.

We will later check that this has no impact and if necessary remove the
mandatory authentication, see OFBIZ-11349
2020-02-19 09:43:35 +01:00
Michael Brohl b318f00d05 Fixed: CMS add content not working.
(OFBIZ-10833)

This fixes the mission content association and wrong update of the
parent content reported by Ingo Wolfmayr. Thanks Sebastian Berg for
providing the patch.
2020-02-18 21:29:26 +01:00
Michael Brohl 32ce2ad006 Fixed: Alternate KeyWord Thesaurus functionality does not work properly.
(OFBIZ-11291)

Thanks Pawan Verma for reporting and Wiebke Pätzold for providing the
patch.
2020-02-18 10:10:24 +01:00
Jacques Le Roux 5684b49453 Fixed: Temporarily comment out the "stream" request-map in ecommerce controller
for security reason
(OFBIZ-11353)

A vulnerability has been reported to the OFBiz security team. To be able to
release the 17.12.01 version with this vulnerability fixed we need to
temporarily comment out the "stream" request-map in commonext controller.
We will later fix the specific issue to put back the functionalities allowed by
the "stream" request-map in this controller, see OFBIZ-11349
2020-02-14 10:20:15 +01:00
Gil Portenseigne cf1612644e Revert "Fixed: Error in user impersonation with sub permission (OFBIZ-11342)"
This reverts commit 73b7abbd
2020-02-12 12:22:59 +01:00
Gil Portenseigne 73b7abbdd0 Fixed: Error in user impersonation with sub permission
(OFBIZ-11342)

Add unit tests for permission control feature.
Add new method to manage multilevel permission control.
This allowing an user with PARTYMGR_ADMIN permission to impersonate
another user with PARTYMGR_PCM_CREATE permission.
2020-02-12 09:55:00 +01:00
Michael Brohl ec3dd184d9 Revert "Multi Part Input Parameters not Available in Groovy Event (OFBIZ-5048)"
This reverts commit 832217135a.
2020-02-11 21:50:21 +01:00
Michael Brohl df460fc680 Revert "Improved: Remove unused services from party/services_view.xml and PartyServices.java/.xml. (OFBIZ-9988)"
This reverts commit 00a5d3413a.
2020-02-09 15:47:59 +01:00
Michael Brohl 732172787e Fixed: Form widget field with input-method="time-dropdown" unable to
understand the default time.
(OFBIZ-11150)

Thanks Wiebke Pätzold for reporting and providing the patch.
2020-02-07 16:45:57 +01:00
Jacques Le Roux 2f479d56ce Fixed: Unable to continue to Step 3 in One Page Checkout
(OFBIZ-11318)

The following error is returned when trying to continue to Step3 when checking
out using One Page Checkout.

Could not create new purpose, a purpose with that type already exists.:
[GenericEntity:PartyContactWithPurpose][contactFromDate,2020-01-05 19:48:18.29
(java.sql.Timestamp)][contactMechId,10020(java.lang.String)]
[contactMechPurposeTypeId,SHIPPING_LOCATION(java.lang.String)]
[partyId,admin(java.lang.String)][purposeFromDate,2020-01-05 19:48:18.332
(java.sql.Timestamp)

It does not happen with DemoCustomer but at least with admin user

It was caused by OFBIZ-10588. I checked for similar issues and found that, in
unlike in createUpdateBillingAddress, in createUpdateShippingAddress and
createUpdateCreditCard partyId was used without a prior setting from
parameters.partyId

Thanks: James Young for proposing a solution. I rather fixed otherwise this and
another similar case in createUpdateCreditCard
2020-02-07 14:44:27 +01:00
akash 8de770f701 Fixed: Unnecessary ship groups in orders.
(OFBIZ-10489)

Thanks, Oleg Andreyev and Mohammad Kathawala for your contribution.
2020-02-07 18:49:54 +05:30
Nicolas Malin 7c8fc080f3 Fixed: Crashed Scheduled jobs are not getting rescheduled with temporal expression
(OFBIZ-11340)

When a OFBiz server are stopped or crashed with job on queued state,
at the start, they are restarted but without information on tempExprId and recurrenceInfoId

This causes a break for recurrence jobs to their planning

Thanks to Mohammed Rehan Khan for this issue and Scott Gray for the review.
2020-02-06 17:14:53 +01:00
Michael Brohl 69bdef1058 Fixed: Prevent possible NullPointerException in FinAccountServices.
(OFBIZ-11341)
2020-02-06 09:01:03 +01:00
Jacques Le Roux 6ce10278a3 Fixed: setUserTimeZone should ran only once based on error
(OFBIZ-11329)

This will be notably useful when committing CSRF solution as explained in
OFBIZ-11306:

SetTimeZoneFromBrowser when starting gives a  RequestHandlerException:
Invalid or missing CSRF token for AJAX call to path '/SetTimeZoneFromBrowser'.
Also not only when starting.

Thanks: James Yong for review
(cherry picked from commit 350c71f4df)

# Conflicts:
#	framework/common/groovyScripts/SetLocaleFromBrowser.groovy
#	themes/common-theme/webapp/common/js/util/setUserTimeZone.js replaced
by setUserLocale.js modified by hand

I can compile locally but I can see a reason why and certainly not related to
these changes
2020-02-05 11:28:45 +01:00
Jacques Le Roux b2e3cc717d Fixed: impersonateLogin
(OFBIZ-5409)

I reopended this old issue because, while working on  OFBIZ-11329, I found that
userLogin and impersonateLogin should be removed from
jsonResponseFromRequestAttributes

Thanks: James Yong for pointing that out

# Conflicts:
#	framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
2020-02-04 15:48:46 +01:00
Michael Brohl 77f7acebe8 Improvement: German translation improvements in HumanResUiLabels
(OFBIZ-11134)

Thanks Ulrich Heidfeld for reporting and providing the patch.
2020-02-03 08:53:04 +01:00
Nicolas Malin 9b9db9e511 Improved: Improve error message page to support Theming
(OFBIZ-10753)

When OFBiz raise an error, the framework use a jsp page to display it.
I improved the error page generation to support also ftl template rendering and by this way extend the theme engine to support to overide it

On controler.xml we can now use :
    <errorpage>/error/error.jsp</errorpage>
or
    <errorpage>component://common/webcommon/error/Error.ftl</errorpage> (default configuration)

On your theme you can add your own error page :
    <template>
      ...
      <template-file widget=menu location=component://common-theme/template/macro/HtmlMenuMacroLibrary.ftl/>
    + <template-file widget=error location=component://common-theme/template/ErrorPage.ftl/>
    </template>

The component://common/webcommon/error/Error.ftl contains the logic theming connection and to simplify source code, all framework old error page (error.jsp) have been removed to centralize all on this new page.

Thanks to Marine Desmarchelier for the error page design

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1856175 13f79535-47bb-0310-9956-ffa450edef68

# Conflicts:
#	framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java
#	themes/common/template/ErrorPage.ftl
2020-02-01 11:08:21 +01:00
Michael Brohl 832217135a Multi Part Input Parameters not Available in Groovy Event
(OFBIZ-5048)

This change provides easier access to the FileItem by not wrapping it
into a buffer.
2020-01-31 15:51:51 +01:00
Michael Brohl b0aff701d0 Improved: ‘EntityOperator#getId()’ is not used in the framework
(OFBIZ-10607)

Thanks Mathieu Lirzin for reporting and providing the patch.
2020-01-30 20:57:16 +01:00
Michael Brohl 1fd85aa4f9 Fixed: German translation typo in PartyUiLabels
(OFBIZ-11308)

Thanks: Ingo Könemann for reporting and providing the patch.
2020-01-30 18:38:34 +01:00
Pawan Verma a273531823 Revert "Fixed: Potensial bug under CommunicationEventServices#updateCommEventAfterEmail for CommunicationEvent.subject field"
(OFBIZ-10879)

This reverts commit 9706acf064.
2020-01-29 12:59:59 +05:30
Jacques Le Roux 092988eb05 Fixed: Fixed the issue on party page that will upload the data each time after
refreshing the page.
(OFBIZ-11325)

Earlier 'view' response type is used on the request that cause the issue.
We need to use request-redirect response type along with the required
redirect-parameter instead of view response type, i.e. We need to
request-redirect on viewProfile along with partyId as redirect-parameter.

Thanks: Humera Khan
2020-01-26 06:20:30 +01:00
Pawan Verma 9706acf064 Fixed: Potensial bug under CommunicationEventServices#updateCommEventAfterEmail for CommunicationEvent.subject field
(OFBIZ-10879)

CommunicationEventServices#updateCommEventAfterEmail could generate wrong result. If general.properties value 'mail.notifications.redirectTo' is used, it is possible that the subject string has more than 255 character.

Thanks, Ulrich Heidfeld for your contribution.
2020-01-25 15:56:04 +05:30
Pawan Verma a06bf80855 Fixed: Same content uploaded twice, if refresh the page after uploading the content
(OFBIZ-11171)

Thanks, Humera Khan and Shubham Goswami for your contribution.
2020-01-25 13:10:45 +05:30
Pawan Verma 6c75966c90 Fixed: Order Status History section broken for anonymous order
(OFBIZ-11231)

Reason for the issue: Anonymous orders doen't have associated User login record, so shown statusUserLogin in that case.
2020-01-25 12:04:05 +05:30
Pawan Verma e52860356f Fixed: updatePassword does not save optional parameter requirePasswordChange
(OFBIZ-11320)

When changing the password of a User Login through the Party Manager the Require Password Change dropdown menu selection does not save the selected value. The corresponding process is missing from the LoginMapProcs.xml.

Thanks: Ingo Könemann for your contribution.
2020-01-16 12:43:05 +05:30
Jacques Le Roux 2c727bed21 Fixed: Bug when order contains adjustments with NULL amount
(OFBIZ-11316)

The issue was introduced by OFBIZ-7012 where adding isTaxIncludedInPrice was
missing at line 565. Because the compared amount in this line (in the adjustment)
is different from 0 and equals to amountAlreadyIncluded only if
the tax is included in price

Thanks: Amine Azzi
2020-01-11 11:26:50 +01:00
Deepak Dixit d26e2568d4 Fixed: Fix typo 2020-01-06 00:54:41 +05:30
Jacopo Cappellato 1dd8d5e757 Fixed: Update budget demo data to reflect recent changes to the demo
finacial period data.
2020-01-03 17:32:18 +01:00
Jacopo Cappellato 1e73375bbb Fixed: Extend the thru date of the demo financial period (and simplify
some related demo data for easier future maintenance) in order to fix
some tests that are failing in the new year.
2020-01-03 17:17:18 +01:00
Jacques Le Roux e707e94839 Improved: Equivalent of svn:auto-props properties on the server
(OFBIZ-OFBIZ-11279)

We should have an equivalent of svn:auto-props properties on the server:
https://help.github.com/articles/dealing-with-line-endings/#per-repository-settings
2019-12-19 13:38:22 +01:00
Samuel Trégouët 6facc0e73d Fixed: Use ‘WebAppUtil#parseWebXmlFile’ when handling “web.xml” files
(OFBIZ-6993)

# Conflict handled by hand in:
#	framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
2019-12-19 08:47:13 +01:00
Mathieu Lirzin 3cd7a3e9e9 Fixed: Display file name in XML parsing errors
(OFBIZ-6993)
2019-12-19 06:52:55 +01:00
Jacques Le Roux adceb71a39 Normalize all the line endings 2019-12-19 06:46:36 +01:00
Jacques Le Roux c071fb0ee9 Saving files before refreshing line endings 2019-12-19 06:45:58 +01:00
Pawan Verma 2e87ed1065 Fixed: Add button for 'Gift Message is shown on completed order
(OFBIZ-11160)

Thanks: Pierre Smits for report and Shivanand Chhatre for the fix.
2019-12-12 16:09:31 +05:30
Jacques Le Roux 055d1251b8 Fixed: https://github.com/apache/ofbiz-framework/pull/3
Just fixes a typo I guess people from Indonesia and Yogyakarta did not see
it yet, so I did not create a Jira
2019-12-01 12:36:47 +01:00
Mathieu Lirzin 2ba7a849dd Reverted: "Fixed: add XML declaration in “web.xml” files (OFBIZ-6993)"
This reverts commit d1c037dca1.
2019-11-27 21:31:06 +01:00
Samuel Trégouët d1c037dca1 Fixed: add XML declaration in “web.xml” files (OFBIZ-6993)
these declarations avoid SAXParseException traceback when parsing web.xml
the first time in WebappUtil.parseWebXmlFile
2019-11-27 17:47:42 +01:00
Jacques Le Roux 9e8db09466 Fixed: Number problem cancelling order item
(OFBIZ-11283)

If an order item has a quantity greater then 1000, cancelling the order item via
the order form in backend does not work.

In the Demo (trunk) environment: the quantity of 1200 to cancel is displayed as
"1,200" in the quantity input field.
--> an error is displayed

On my local installation I use a different locale and it is displayed as "1.200".
--> interprets the dot as a comma and the quantity of 1,2 is cancelled

Create Order: Order Mgt --> Order Entry --> Sales Order (Customer: DemoCustomer)
--> ProductId: GZ-2644, Quantity 1200 --> Finalize order
On order: Edit Items --> click checkbox next to quantity -->cancel selected items

jleroux: I have applied the same in ReceiveInventory.ftl

Thanks: Ingo Wolfmayr for report and test. Ankush Upadhyay for the fix
2019-11-25 10:34:35 +01:00
Pawan Verma 3d05f5ae28 Fixed: liniting issues introduced by commit d00208c
(OFBIZ-10585)

Thanks: Mathieu Lirzin for report
2019-11-25 12:57:34 +05:30
Pawan Verma f249f27382 Fixed: Corrected variable name. Nothing functional.
(OFBIZ-10585)
2019-11-23 12:37:45 +05:30
Pawan Verma 59079010a1 Fixed: Production run not created for marketing package auto type product if component inventory is not available
(OFBIZ-10585)

When we create an order for marketing package auto, the system checks the component inventory and if found then it creates the production run job and produce marketing package inventory, but if component quantity not available then it does not create the job. So if we don't have an inventory item of component then production run should be created with created status.

Thanks: Yashwant Dhakad for report and Ankush Upadhyay for the patch.
2019-11-23 12:18:10 +05:30
Pawan Verma 32dcdd744c Fixed: Error while CSR creates a return
(OFBIZ-11068)

Added check to validate Payment Method passed from UI while creating return. If not available in system, throw an error.

Thanks: Dikpal Kanungo for report and Rohit Hukkeri for the patch.
2019-11-23 11:13:19 +05:30
Nicolas Malin 3a5175ff45 Fixed: Usage of 'include-form' instead of 'include-grid' in PartyScreens.xml for grid elements
(OFBIZ-11286)

In PartyScreens.xml there were 'ListInvoicesApplPayments', 'ListUnAppliedInvoices' and 'ListUnAppliedPayments' include as form instead of grid but in PartyForms.xml they are defined as grids.

Thanks to Ulrich Heidfeld to raise and solve this issue
2019-11-22 15:32:40 +01:00
Jacques Le Roux 773722e30e No functional change
Removes new line added to test Buildbot config after INFRA-19443
2019-11-21 08:32:29 +01:00
Jacques Le Roux 97744a4cc7 No functional change
Just a new line added to test Buildbot config after INFRA-19443
2019-11-21 08:31:37 +01:00
Jacopo Cappellato f90829fb8b Fixed: Add missing view permissions checks to various screens. 2019-11-16 08:25:33 +01:00
Jacques Le Roux 8ea3cd2385 Fixed: We have build problems in branches with plugins
(OFBIZ-11284)

Replaces trunk link by branch link
2019-11-15 17:38:04 +01:00
Nicolas Malin 372e68a5e4 Fixed: Possible NPE in StringUtil#strToMap
(OFBIZ-11281)

StringUtil#strToMap(String, String, boolean, String) throws Nullpointer for StringUtil.strToMap("", false).

Thanks to Ulrich Heidfeld for this fix
2019-11-14 09:16:47 +01:00
Jacques Le Roux 53faf82d46 Improved: SeoContextFilter.java is not able to handle query strings
(OFBIZ-11278)

Removes a trailing blank and uses empty to check request::getParameterMap result

Thanks: Mathieu to spot "empty to check request::getParameterMap result"
2019-11-10 10:49:05 +01:00
Jacques Le Roux 0d6bfb2ca8 Fixed: SeoContextFilter.java is not able to handle query strings
(OFBIZ-11278)

While working on OFBIZ-9804 (verification email for Newsletter) I was confronted
with misc. issues. One of them was that SeoContextFilter.java was not handling
query strings.

This fixes it
2019-11-09 22:08:45 +01:00
Jacques Le Roux 38fd13edbe Fixed: baseEcommerceSecureUrl does not work in ecomseo.
(OFBIZ-11267)

This fixes it by introducing a new pattern in SeoConfig.xml

(cherry picked from commit 8f4cfeb951)
2019-11-07 17:52:19 +01:00
Jacques Le Roux 6c3f5ad3f5 Fixed: Getting policy error while editing html text data using cms
(OFBIZ-11265)

Service parameter with allow-html="safe" does not check the OWASP sanitizer flag
ie. enabled or not and perform sanitization which causing policy error while
editing text data

getting following exception error:
"In field [textData] by our input policy, your input has not been accepted for
security reason. Please check and modify accordingly, thanks."

Thanks: Pradeep Choudhary for report and suggestion
(cherry picked from commit 8aea160e04)
2019-11-07 17:39:08 +01:00
Jacques Le Roux edcbc204a7 Fixed: Update the SvnCheckout Gradle task to used Github svn repo
(OFBIZ-11276)

Relies on a Github specific feature which allows to use and automated
mirrored svn repo.
2019-11-06 19:09:24 +01:00
Jacques Le Roux dbccb05c16 "Applied fix from trunk for revision: 1869001"
------------------------------------------------------------------------
r1869001 | mthl | 2019-10-26 16:42:02 +0200 (sam. 26 oct. 2019) | 9 lignes

Fixed: Handle whitelist of serializable classes from properties
(OFBIZ-11261)

There was a bug regarding the way the ‘ListOfSafeObjectsForInputStream’ value
defined in the “SafeObjectInputStream.properties” file was handled.  Mistakenly
only one class identifier was allowed.

Some unit tests have been added to check that the identified bug is fixed.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1869032 13f79535-47bb-0310-9956-ffa450edef68
2019-10-27 09:35:29 +00:00
Jacques Le Roux bf2644babd "Applied fix from trunk for revision: 1868611"
------------------------------------------------------------------------
r1868611 | jleroux | 2019-10-19 08:42:07 +0200 (sam. 19 oct. 2019) | 11 lignes

Improved: Handling tenant in XmlRpcEventHandler
(OFBIZ-10284)

The XMLRPC service does not support tenants. Even if the tenant domain is 
included in the HTTP request the call does not affect the correct tenant. 
The issue and fix has been discussed in  in the thread
https://markmail.org/message/bz4dofrxqp6i7ove

jleroux: I was able to port the R16 patch provided by Rajesh to the trunk. 

Thanks: Rajesh Kumar Mallah
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1868613 13f79535-47bb-0310-9956-ffa450edef68
2019-10-19 06:58:10 +00:00
Jacques Le Roux c67a31aec7 "Applied fix from trunk for revision: 1868553"
------------------------------------------------------------------------
r1868553 | jleroux | 2019-10-17 16:26:42 +0200 (jeu. 17 oct. 2019) | 14 lignes

Fixed: FTL error for purchase order with Bulk Item Type
(OFBIZ-11252)

Steps to regenerate:
1. Login into the ordermgr application and click on Order Entry tab
2. Create PO with any supplier
3. Fill details and click on Continue
4. Now select Product Category with Item type Bulk and add the description and 
   Click on add to order
5.  Finalize order with Finalize Order button
6. Add Term type, ship group option, etc details and create Order.
7. Scroll down to Order Items section and See the FTL error on the screen.

Thanks: Devanshu Vyas
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1868555 13f79535-47bb-0310-9956-ffa450edef68
2019-10-17 14:27:42 +00:00
Jacques Le Roux 9ea1bf3b79 "Applied fix from trunk for revision: 1868545"
------------------------------------------------------------------------
r1868545 | jleroux | 2019-10-17 14:19:33 +0200 (jeu. 17 oct. 2019) | 16 lignes

Fixed: EditExample always update status, because current Status not shown
(OFBIZ-11230)

In the EditExample Form, the drop-down is populates with the Valid change status 
only. So current status is not in the list and the status print in the drop-down 
is the next authorized. I want to modify exampleName or exampleType, I go to 
editExample and change what I want and validate. The problem is status is also 
changed!

There are 12 other same or similar cases. For the first of them (in FinAccount) 
there is the same bug: when I change FinAccount Name, status change too. If I 
add current="first-in-list" in the tag drop-down it works 

jleroux: Quote is a peculiar case due to OFBIZ-7337 which was a wrong fix
 
Thanks: Oliver for the analysis and the fix 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1868548 13f79535-47bb-0310-9956-ffa450edef68
2019-10-17 12:20:28 +00:00
Jacques Le Roux 2c5452b2f9 Improved: no functional change
Just better English in message

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1868424 13f79535-47bb-0310-9956-ffa450edef68
2019-10-14 07:20:56 +00:00
Jacques Le Roux 52f5360b51 "Applied fix from trunk for revision: 1868395"
------------------------------------------------------------------------
r1868395 | jleroux | 2019-10-13 12:37:08 +0200 (dim. 13 oct. 2019) | 8 lignes

Fixed: Merge UrlRegexpTransform and OfbizUrlTransform classes
(OFBIZ-11229)

OFBIZ-4361 depends on this issue. Here is a first version, the main identified 
point was when the request isn't present (email send, service call) the website 
isn't pull from context. This solves this aspect

Thanks: Nicolas for the patch
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1868397 13f79535-47bb-0310-9956-ffa450edef68
2019-10-13 10:40:16 +00:00
Jacques Le Roux 12d96cebe9 "Applied fix from trunk for revision: 1868298"
------------------------------------------------------------------------
r1868298 | jleroux | 2019-10-11 18:45:16 +0200 (ven. 11 oct. 2019) | 20 lignes

Fixed: NotSerializableException after uploading images to an order
(OFBIZ-11123)

I found that using in r1866259 the same fix than Si Chen used in OFBIZ-750 was 
wrong. The code just above this fix is

{code:java}
if (obj instanceof Serializable) {
    reqAttrMap.put(name, obj);
}
{code}

The problem with this code is that if does not handle inner Maps which may 
contain a non Serializable Object. So the solution is rather to get one level
deeper and apply the same. We can then remove the harcoded lines with 
"uploadedFile" and "_REQUEST_HANDLER_" below. Then all possible cases are handled
as long as we have not inner-inner-Maps



------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1868300 13f79535-47bb-0310-9956-ffa450edef68
2019-10-11 16:45:58 +00:00
Jacques Le Roux 8f6dde8d45 Improved: no functional change
As reported by Ethan Vos on user ML, sometimes the alias between wget and 
Invoke-WebRequest is not present on Windows 7, better keep it simple!

Also removes the comment:
  Anyway I believe this should be only used in dev environment
which is no longer true

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1868000 13f79535-47bb-0310-9956-ffa450edef68
2019-10-05 08:10:03 +00:00
Pawan Verma 30bc63b676 Applied fix from trunk for revision: 1867972
===

Reverted: User is unable to update the review of product
(OFBIZ-10799)

Reverted rev 1867904

Thanks: Deepak Dixit for reporting the issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867974 13f79535-47bb-0310-9956-ffa450edef68
2019-10-04 10:16:40 +00:00
Pawan Verma 9a3054c842 Applied fix from trunk for revision: 1867937
===

'At least one phone number is required below' message should be uneditable while creating new customer using partymgr
(OFBIZ-11113)

Thanks: Arpit Mor for report and Saurabh Dixit for the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867940 13f79535-47bb-0310-9956-ffa450edef68
2019-10-03 12:37:57 +00:00
Pawan Verma 6cf23e4c4c Applied fix from trunk for revision: 1867930
===

Fixed: Check run payment(A/P) transactions not getting available for reconciliation
(OFBIZ-10796)

Check run payment group transactions don't get available for Financial Account reconciliation. Though the financial account balance gets updated during the A/P check run process, the system must allow the user with an additional step of reconciling the transactions.

The cause of this is that the financial account transaction doesn't get created in the 'Created' status and has an 'Approved' status. An approved status financial transaction directly updates the financial account balance and thus don't appear in the list of the transactions to be reconciled.

Thanks: Chinmay Patidar for your contribution and Pierre Smits for the review.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867932 13f79535-47bb-0310-9956-ffa450edef68
2019-10-03 12:06:41 +00:00
Pawan Verma 6ace63f0d6 Applied fix from trunk for revision: 1867910
===

Fixed: Sales By Store Report not working
(OFBIZ-11119)

Added Null check to avoid Exception.

Thanks: Chandan Khandelwal for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867912 13f79535-47bb-0310-9956-ffa450edef68
2019-10-03 07:35:14 +00:00
Pawan Verma 69482b7acc Applied fix from trunk for revision: 1867904
===

Fixed: User is unable to update the review of product
(OFBIZ-10799)

Redirected request with eligible parameters so that If the user had a search using any parameter result should persist after the update.

Thanks: Ashish Sharma for report and Pierre Smits and Jacques Le Roux for the review.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867906 13f79535-47bb-0310-9956-ffa450edef68
2019-10-03 07:23:03 +00:00
Aditya Sharma f6db33b35b Applied fix from trunk for revision: 1867745
===

Fixed: redundant license text


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867747 13f79535-47bb-0310-9956-ffa450edef68
2019-09-30 06:51:12 +00:00
Jacques Le Roux da148eb593 "Applied fix from trunk for revision: 1867585"
------------------------------------------------------------------------
r1867585 | jleroux | 2019-09-26 17:38:52 +0200 (jeu. 26 sept. 2019) | 9 lignes

Fixed: Error in log when looking for parties at partymgr/control/main
(OFBIZ-11201)

These are similar issues in Minilang than the one fixed initially for
<set field="userLoginSize" value="${util:size(logins)}" type="Integer"/>
Fixed by replacing by 
<set field="userLoginSize" value="${groovy:logins.size()}"/>


------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867587 13f79535-47bb-0310-9956-ffa450edef68
2019-09-26 15:39:55 +00:00
Nicolas Malin 571666c737 Fixed: Default option for ModelFormField.DateFindField doesn't work
(OFBIZ-11212)
When you use a date-find element on form, the defaut option are in code like to greater_than and less _than

        public DateFindField(int fieldSource, String type) {
            super(fieldSource, type);
            this.defaultOptionFrom = greaterThanEqualTo;
            this.defaultOptionThru = lessThanEqualTo;
        }

but on macro

<#macro renderDateFindField ...
      <option value=greaterThan<#if defaultOptionFrom==greaterThan> selected=selected</#if>></option><#rt/>
      ...
      <option value=opLessThan<#if defaultOptionThru==opLessThan> selected=selected</#if>></option><#rt/>
      ...
</#macro>

So the value java isn't correct with ftl values and default value never used.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867584 13f79535-47bb-0310-9956-ffa450edef68
2019-09-26 15:36:18 +00:00
Jacques Le Roux b50412efe4 "Applied fix from trunk for revision: 1867577" (by hand)
------------------------------------------------------------------------
r1867577 | jleroux | 2019-09-26 16:41:50 +0200 (jeu. 26 sept. 2019) | 8 lignes

Fixed: Fix multi modal opening
(OFBIZ-11211)

The issue is that when closing the modal the div inside html dom is not removed. 
Then opening a second time create another identical div. Since a lookup is based 
on an unique id, this id is no more unique...

Thanks: Carl Demus
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867579 13f79535-47bb-0310-9956-ffa450edef68
2019-09-26 14:47:47 +00:00
Nicolas Malin 4cb79d704c Fixed: Send upload form with even-update-area doesn't work (Backport from trunk)
(OFBIZ-11207)
When you create a xml form with upload as type, you can't use on-event-update-area element to submit it by ajax.
Otherwise, OFBiz return an error message on 'uploadFile is empty.
To solve it, we analyze the enctype's form before submit it to move on FormData instead a direct serialize [1]

example form where the problem has been present
****
    <form name='AddNicelyFile' type='upload' target='CreateNicelyFile'>
        <field name='uploadedFile' title='File'><file/></field>
        <field name='addButton'><submit/></field>
        <on-event-update-area event-type='submit' area-id='window' area-target='FileDisplaying'/>
    </form>
****

Thanks to Samuel Tregouet for this fix

[1] https://developer.mozilla.org/en-US/docs/Web/API/FormData/Using_FormData_Objects

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867438 13f79535-47bb-0310-9956-ffa450edef68
2019-09-24 09:00:35 +00:00
Jacques Le Roux e85f3ded7f "Applied fix from trunk for revision: 1867099"
------------------------------------------------------------------------
r1867099 | jleroux | 2019-09-18 09:29:18 +0200 (mer. 18 sept. 2019) | 17 lignes

Fixed: Error in log when looking for parties at partymgr/control/main
(OFBIZ-11201)

There is this a (long stack trace) error in log (only), mostly

java.lang.ClassCastException: java.util.ArrayList cannot be cast to java.util.Map
at org.apache.ofbiz.base.util.string.UelFunctions.getSize(UelFunctions.java:318)

I did not notice any other effect, so the fix only cleans the log.

It's actually an issue in ListParty grid with this line:
<set field="userLoginSize" value="${util:size(logins)}" type="Integer"/>

This fixes it by replacing by 
<set field="userLoginSize" value="${groovy:logins.size()}"/>


------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867101 13f79535-47bb-0310-9956-ffa450edef68
2019-09-18 07:30:04 +00:00
Jacques Le Roux 091d21517f "Applied fix from trunk for revision: 1867038"
------------------------------------------------------------------------
r1867038 | jleroux | 2019-09-17 08:32:20 +0200 (mar. 17 sept. 2019) | 11 lignes

Documented: 
Got this error with Eclipse Asciidoctor editor plugin

>> rendering:-273312131_hidden-editorfile_developer-manual.adoc
asciidoctor: WARNING: C:/projectsASF/ofbiz/framework/minilang/docs/asciidoc/minilang-to-groovy-manual.adoc: line 473: unterminated listing block
asciidoctor: WARNING: C:/projectsASF/ofbiz/framework/minilang/docs/asciidoc/minilang-to-groovy-manual.adoc: line 511: unterminated listing block

This fixes it



------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867040 13f79535-47bb-0310-9956-ffa450edef68
2019-09-17 06:34:26 +00:00
Jacques Le Roux 2b921e958a "Applied fix from trunk for revision: 1866986"
------------------------------------------------------------------------
r1866986 | jleroux | 2019-09-16 10:20:46 +0200 (lun. 16 sept. 2019) | 4 lignes

Fixed: Path Traversal in webtools/control/FetchLogs and ViewFile
(OFBIZ-11196)

Fixes a typo which was crashing webtools/control/LogView
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1866988 13f79535-47bb-0310-9956-ffa450edef68
2019-09-16 08:21:35 +00:00
Jacques Le Roux 9c0ccd7afa Improved: Document how to store the JWT secret key
(OFBIZ-10751)

Copy manually all files from trunk because of weird conflicts

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1866939 13f79535-47bb-0310-9956-ffa450edef68
2019-09-14 11:37:39 +00:00
Jacques Le Roux bb2f56a0d0 "Applied fix from trunk for revision: 1866920"
------------------------------------------------------------------------
r1866920 | jleroux | 2019-09-14 10:19:18 +0200 (sam. 14 sept. 2019) | 18 lignes

Fixed: Path Traversal in webtools/control/FetchLogs and ViewFile
(OFBIZ-11196)

These are not really path traversal issues. 

We can't solve them using the traditional way to fix path traversal issues 
(ie normalising path). Because Fetchlogs and ViewFile are actually reading 
files and if you have the right to read these files then nothing will prevent 
you to read them. 

The problem is more what those requests are supposed to do. 
Fetchlogs is supposed to read a log in the log dir 
and ViewFile is supposed to read a file containing labels 
(ie either an XML or Properties file).

So the solution is to allow these requests to only do what they are supposed to 
do. This is what is done in ViewFile and FetLogs Groovy files.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1866922 13f79535-47bb-0310-9956-ffa450edef68
2019-09-14 08:21:23 +00:00
Jacques Le Roux 358378f74f "Applied fix from trunk for revision: 1866890"
------------------------------------------------------------------------
r1866890 | jleroux | 2019-09-13 12:15:03 +0200 (ven. 13 sept. 2019) | 8 lignes

Improved: FindArInvoices request needs performance improvement regarding use of 
EntityListIterator::hasNext method
(OFBIZ-11198)

FindAPInvoices request  does not suffer from this issue nor findInvoice request.

This was due to <screen name="FindArInvoices"> definition
Using something similar than <screen name="FindApInvoices"> fixes the issue
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1866892 13f79535-47bb-0310-9956-ffa450edef68
2019-09-13 10:16:17 +00:00
Jacques Le Roux 85d87fbe4a "Applied fix from trunk for revision: 1866834"
------------------------------------------------------------------------
r1866834 | jleroux | 2019-09-12 09:49:41 +0200 (jeu. 12 sept. 2019) | 8 lignes

Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

Allows users to easily override the list of accepted objects by using the
listOfSafeObjectsForInputStream property

CVE-2019-0189

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1866836 13f79535-47bb-0310-9956-ffa450edef68
2019-09-12 07:50:56 +00:00
Jacques Le Roux 52e7476022 "Applied fix from trunk for revision: 1865852"
------------------------------------------------------------------------
r1865852 | pawan | 2019-08-24 16:28:57 +0200 (sam. 24 août 2019) | 8 lignes

Fixed: Issue of unable to view a PartyContent on view profile page of a party
(OFBIZ-11038)

When click on view button img request will be hit along with contentName and imgId as a parameter. This request invokes serveImage event(DataEvents.java) which is deprecated now.
Instead of img request we can call stream request with contentId as a parameter that invokes serveObjectData event.
This will work as per the value of content-disposition-type (requestHandler.properties) i.e. attachement or inline

Thanks: Devanshu Vyas for reporting the issue and Humera Khan for the patch and Prachi Shastri for testing of the bug.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1866591 13f79535-47bb-0310-9956-ffa450edef68
2019-09-08 07:55:15 +00:00
Gil Portenseigne 7966128772 Fix parenthesis syntax error in groovy
(OFBIZ-11186)

Thanks Samuel Trégouët for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1866516 13f79535-47bb-0310-9956-ffa450edef68
2019-09-06 15:04:04 +00:00
Jacques Le Roux f421e7ced4 "Applied fix from trunk for revision: 1866259"
------------------------------------------------------------------------
r1866259 | jleroux | 2019-09-02 09:32:48 +0200 (lun. 02 sept. 2019) | 10 lignes

Fixed: NotSerializableException after uploading images to an order
(OFBIZ-11123)

In a lot of services we use the ByteBuffer object to upload files. 
When a such service is used with the redirect-parameter in a controller the 
ByteBuffer needs to be serialized. Unfortunately ByteBuffer (in our case its
subclass HeapByteBuffer) is not serializable. So that can't work.

Fortunately no redirect-parameter concerns uploadedFile so we can safely remove
it from reqAttrMap in RequestHandler
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1866261 13f79535-47bb-0310-9956-ffa450edef68
2019-09-02 07:34:03 +00:00
Nicolas Malin 6af9a7719a Improved: update init-gradle-wrapper.sh to load gradlew script
(OFBIZ-10145)
When you run 'sh gradle/init-gradle-wrapper.sh', if the script gradlew at the OFBiz root isn't present we download it from bintray.
Improvements to comments and messages in the init-gradle-wrapper.sh script do on r1865605 by Jacopo

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1866122 13f79535-47bb-0310-9956-ffa450edef68
2019-08-30 07:15:09 +00:00
Jacques Le Roux 1e80b7503f "Applied fix from trunk for revision: 1865924 "
------------------------------------------------------------------------
r1865924 | nmalin | 2019-08-26 11:54:55 +0200 (lun. 26 août 2019) | 6 lignes

Fixed: CategoryServices returns null when opening Product main page
(OFBIZ-11175)
Increase parsing control to don't realize it on null value for viewSizeString
when call service getProductCategoryAndLimitedMembers.

Thanks Jacques Leroux for raise this issue
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1865928 13f79535-47bb-0310-9956-ffa450edef68
2019-08-26 11:27:12 +00:00
Jacques Le Roux 0bfb6cdb0a "Applied fix from trunk for revision: 1865891"
------------------------------------------------------------------------
r1865891 | jleroux | 2019-08-25 15:24:10 +0200 (dim. 25 août 2019) | 5 lignes

Improved: Use Labels in themes names
(OFBIZ-9863)

Remove duplicated block that I forgot to remove
This had no effects but I found an XML error in log
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1865893 13f79535-47bb-0310-9956-ffa450edef68
2019-08-25 13:27:34 +00:00
Jacques Le Roux f0e2c56aee "Applied fix from trunk for revision: 1865883"
------------------------------------------------------------------------
r1865883 | jleroux | 2019-08-25 11:48:31 +0200 (dim. 25 août 2019) | 8 lignes

Fixed: UiLabel is missing for Web Analytics Type on content  component
(OFBIZ-11170)

Steps to reproduce
content/control/EditWebAnalyticsConfig?webSiteId=WebStoreClone
On that Web Analytics Type UiLabel is missing.

Thanks: Rahul Marjiwe
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1865885 13f79535-47bb-0310-9956-ffa450edef68
2019-08-25 09:49:21 +00:00
Pawan Verma cd39cf1d06 Applied fix from trunk for revision: 1865811
===

Fixed: Order status history should show party id instead of user login id
(OFBIZ-11121)
Thanks: Ashish Kumar Pandey for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1865814 13f79535-47bb-0310-9956-ffa450edef68
2019-08-24 05:17:16 +00:00
Jacques Le Roux 56729c4b30 Implemented: Remove the Gradle wrapper from our release packages and add a step
to our build notes
(OFBIZ-10145)

Removes weird characters

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1865397 13f79535-47bb-0310-9956-ffa450edef68
2019-08-18 15:12:00 +00:00
Jacques Le Roux f179238e97 "Applied fix from trunk for revision: 1865370" (labels fixed by hand)
------------------------------------------------------------------------
r1865370 | jleroux | 2019-08-17 20:26:42 +0200 (sam. 17 août 2019) | 7 lignes

Improved: Use Labels in themes names
(OFBIZ-9863)

Adds labels and necessary calls in Theme.xml

While at it, improves other backend themes labels by removing redundancy, at
least in French and English.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1865372 13f79535-47bb-0310-9956-ffa450edef68
2019-08-17 18:29:09 +00:00
Jacques Le Roux e153a1625b "Applied fix from trunk for revision: 1865367"
------------------------------------------------------------------------
r1865367 | jleroux | 2019-08-17 20:08:14 +0200 (sam. 17 août 2019) | 4 lignes

Fixed: <description> of <visual-theme> in Theme.xml does not work
(OFBIZ-9867)

There is no str:label in UelFunctions class but util:label
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1865369 13f79535-47bb-0310-9956-ffa450edef68
2019-08-17 18:08:56 +00:00
Jacques Le Roux 964a439b91 "Applied fix from trunk for revision: 1865347"
------------------------------------------------------------------------
r1865347 | jleroux | 2019-08-17 13:34:01 +0200 (sam. 17 août 2019) | 9 lignes

Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment property for Solr to load faster

Fixes previous commit where I hastily harcoded in jndi.properties file

Used a system property which can be used to define a JNDI environment 
property
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1865349 13f79535-47bb-0310-9956-ffa450edef68
2019-08-17 11:35:01 +00:00
Jacques Le Roux 06a8a9ec22 "Applied fix from trunk for revision: 1865344"
------------------------------------------------------------------------
r1865344 | jleroux | 2019-08-17 13:07:01 +0200 (sam. 17 août 2019) | 4 lignes

Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment Property for Solr to load faster
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1865346 13f79535-47bb-0310-9956-ffa450edef68
2019-08-17 11:07:40 +00:00
Aditya Sharma 32b54769ed Applied fix from trunk for revision: 1838074
===
Improved: Change the uggly favicon with the new one ! | Using new OFBiz logo
(OFBIZ-10522)

The unreleased branch 17.12 uses new logo, but old favicon icon. Backported the changes from trunk.

Additional change: 
1. Fixed broken logo image URL for flatgrey theme along with some custom css to fix its height and width
2. Replaced new logo with old in tomahawk theme along with some custom css to fix its height and width

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1865034 13f79535-47bb-0310-9956-ffa450edef68
2019-08-13 12:26:54 +00:00
Jacques Le Roux 305a04f627 "Applied fix from trunk for revision: 1864930"
------------------------------------------------------------------------
r1864930 | jleroux | 2019-08-11 15:23:19 +0200 (dim. 11 août 2019) | 4 lignes

Fixed: [FB] Find Security Bugs
(OFBIZ-9973)

As suggested by Mathieu on dev ML factorises the use of Path::normalize
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1864932 13f79535-47bb-0310-9956-ffa450edef68
2019-08-11 13:28:21 +00:00
Jacques Le Roux 345e16e343 Implemented: Remove the Gradle wrapper from our release packages and add a step
to our build notes
(OFBIZ-10145)

Adds the Windows init-gradle-wrapper scripts (both .bat et .ps1) in all 
concerned branch (trunk, R18, R17)

These are very simple because I believe (almost?) nobody is using a Windows 
server to deploy OFBiz in production. So they will be only used in development 
environment. In case deployment in production is needed they supply a base to 
work on...

The init-gradle-wrapper.ps1 scripts use only HTTP and not HTTPS because it's 
very difficult to handle all the issues related with different versions of 
Powershell and .net in different versions of Windows. Better to let that to
deployment in case it's really needed...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1864927 13f79535-47bb-0310-9956-ffa450edef68
2019-08-11 12:56:38 +00:00
Jacques Le Roux b870222561 "Applied fix from trunk for revision: 1864891"
------------------------------------------------------------------------
r1864891 | jleroux | 2019-08-10 19:02:12 +0200 (sam. 10 août 2019) | 6 lignes

Fixed: In Product Image Management Uploading file fails due to missing 
StatusValidChange
(OFBIZ-11148)

With last commit I introduced a dependency from ProductSeedData to 
ContentSeedData. The loadAll tasks failed because of that, this fixes it.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1864893 13f79535-47bb-0310-9956-ffa450edef68
2019-08-10 17:22:54 +00:00
Jacques Le Roux e913ce054d "Applied fix from trunk for revision: 1864881"
------------------------------------------------------------------------
r1864881 | jleroux | 2019-08-10 17:51:19 +0200 (sam. 10 août 2019) | 7 lignes

Fixed: [FB] Find Security Bugs
(OFBIZ-9973)

This fixes an issue in FrameImage::uploadFrame which was reported by Man Yue Mo
as described in OFBIZ-9973

I finally decided to follow OWASP advice about using normalize()
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1864883 13f79535-47bb-0310-9956-ffa450edef68
2019-08-10 15:52:15 +00:00
Nicolas Malin 15c95144c2 Implemented: Helper script to download the gradle wrapper
(OFBIZ-10145)
Add a helper script to download gradle-wrapper.jar and gradle-wrapper.properties 
at version 3.2.1 from bintray [1] when gradle/wrapper/gradle-wrapper.jar isn't present.

To use it just run at the OFBiz root :
    $ sh gradle/init-gradle-wrapper.sh

Tagged gradle version from the gradle community [2] contains an error on the gradle-wrapper.properties
(distribution url -> https://services.gradle.org/distributions-snapshots/gradle-3.2.1-20161121174103+0000-bin.zip seems to not exist)
that break the wrapper init. So use own version to correct this.

[1] https://dl.bintray.com/apacheofbiz/GradleWrapper/
[2] https://github.com/gradle/gradle/blob/v3.2.1/gradle/wrapper/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1864812 13f79535-47bb-0310-9956-ffa450edef68
2019-08-09 15:05:33 +00:00
Jacques Le Roux 9cda9fd038 "Applied fix from trunk for revision: 1864721"
------------------------------------------------------------------------
r1864721 | jleroux | 2019-08-08 17:52:04 +0200 (jeu. 08 août 2019) | 9 lignes

Fixed: In Product Image Management Uploading file fails due to missing 
StatusValidChange
(OFBIZ-11148)
The error is
java.lang.Exception: Error in Service [updateContent]: Error: 
status change from [CTNT_IN_PROGRESS] to [IM_PENDING] is not allowed.

The issue does not exist in R16. So I guess it's because of OFBIZ-9907.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1864723 13f79535-47bb-0310-9956-ffa450edef68
2019-08-08 15:52:44 +00:00
Jacques Le Roux 70ad90cafa "Applied fix from trunk for revision: 1864716"
------------------------------------------------------------------------
r1864716 | jleroux | 2019-08-08 17:28:45 +0200 (jeu. 08 août 2019) | 15 lignes

Fixed: [FB] Find Security Bugs
(OFBIZ-9973)

FindBugs is now deprecated and replaced by Spotbugs

Last time I forgot to encode productId as reported by Man Yue Mo from Semmle

This eventually fixes the "Relative path traversal" issue reported by Spotbugs
by encoding the whole file name.

Nevertheless Spotbugs continues to report the same issue in trunk but not in R16
I have not ideas why and I see no other possible issue. 

I will backport and check again.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1864718 13f79535-47bb-0310-9956-ffa450edef68
2019-08-08 15:29:34 +00:00
Aditya Sharma 398084c7fe Fixed: favicon.ico missing for LookupDecorator
(OFBIZ-11146)
The ListVisualTheme page uses LookupDecorator and in the absence of any shortcut icon the browser hits favicon.ico file by default. 
Additional change: Fixed path for title.gif specific to Flatgrey theme

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1864221 13f79535-47bb-0310-9956-ffa450edef68
2019-08-02 12:51:48 +00:00
Aditya Sharma 86e44f2ad5 Applied fix from trunk for revision: 1863838
===

Fixed: Check embedded Javascript libs vulnerabilities using retire.js
(OFBIZ-10678)
1. For solving CVE-2019-11358, upgraded jQuery to 3.4.1
2. Replaced library Fancybox with Featherlight. Added custom css so that cursor for links becomes pointer
Thanks Jacques Le Roux for the reviews

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1863853 13f79535-47bb-0310-9956-ffa450edef68
2019-07-27 12:30:49 +00:00
Jacques Le Roux 6c72cfd534 "Applied fix from trunk for revision: 1863560 BY HAND"
------------------------------------------------------------------------
r1863560 | jleroux | 2019-07-22 17:21:14 +0200 (lun. 22 juil. 2019) | 37 lignes

Fixed: Unknown request [images]; this request does not exist or cannot be 
called directly.
(OFBIZ-10895)

Today Olivier reported directly to me that there was an issue in HR:
<<If you go to humanres, at the level of the tree that appears the icons to expand 
the tree no longer appear (but you can click...)
This is due to the path of the d.png image which is wrong in the css file 
(there is too much image in the path)>>

I should have seen it because the d.png file is, with other related image files,
in the same directory than style.css. And there was an inconsistency in the
style.css files regarding the d.png file path.

We should note that we have still this error in log:
2019-07-22 16:25:26,275 |jsse-nio-8443-exec-7 |ControlServlet                
|E| Error in request handler:
org.apache.ofbiz.webapp.control.RequestHandlerException: Unknown request [d.png]; 
this request does not exist or cannot be called directly.
at org.apache.ofbiz.webapp.control.RequestHandler.doRequest
(RequestHandler.java:277) ~[ofbiz.jar:?]

As I wrote in my last commit for OFBIZ-10895:
The only safe way to go is to not only check the error log for 
"Unknown request [...."
but also to look for 404 in access log, not all request show erroneously in
error log.

Some error appears before the user is logged in, as I wrote in the Jira:
<<I noticed that this error message often appears before login. A 404 can be 
seen in the access log and then once logged the issue no longer exists 
(ie we get a 200). I have no yet investigated why...>>

Nevertheless, I want to remove this misleading error message. I hope I'll do 
that before forgetting.

Thanks: Olivier Heintz 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1863563 13f79535-47bb-0310-9956-ffa450edef68
2019-07-22 15:26:22 +00:00
Jacques Le Roux a5581641fb "Applied fix from trunk for revision: 1835871"
------------------------------------------------------------------------
r1835871 | surajk | 2018-07-14 07:35:44 +0200 (sam. 14 juil. 2018) | 10 lignes

Improved: All existing party contact mechs should be deleted before creating new one.
(OFBIZ-10396)

Currently, everywhere in code base, before creating new party contact mech record, we use 

deletePartyContactMechPurposeIfExists service to delete old records. But, problem is 

<first-from-list is used everywhere which only deletes first fetched record.

All previous records should also gets deleted before creating new party contact mech purpose for a specific purpose type.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1863473 13f79535-47bb-0310-9956-ffa450edef68
2019-07-20 11:12:09 +00:00
Jacques Le Roux 8a68ff0027 "Applied fix from trunk for revision: 1862648"
------------------------------------------------------------------------
r1862648 | jleroux | 2019-07-06 11:42:46 +0200 (sam. 06 juil. 2019) | 14 lignes

Fixed: Error message is displayed when user having space in username logs 
in at ecommerce
(OFBIZ-10671)

Pierre pointed out that the NotValidUserName label NL translation was wrong and 
proposed a right one.

Looking at it closer EN and FR were not totally right either. I have fixed them.
Before committing, I wondered if we should remove all other languages, then 
English would be used. Or if we let it as is for users of these languages to 
propose a fix, as Pierre did. I'm more for the later, then end users who don't 
speak English would at least have something they can read and possibly amend.

Thanks: Pierre Smits
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1862650 13f79535-47bb-0310-9956-ffa450edef68
2019-07-06 09:44:17 +00:00
Jacques Le Roux fe932a5531 "Applied fix from trunk for revision: 1862466 "
------------------------------------------------------------------------
r1862466 | jleroux | 2019-07-03 15:30:28 +0200 (mer. 03 juil. 2019) | 20 lignes

Fixed: Error message is displayed when user having space in username logs 
in at ecommerce
(OFBIZ-10671)

Steps to regenerate:
 # Open URL: [https://demo-trunk.ofbiz.apache.org/ecommerce/control/main]
 # Click on register in header section
 # Provide all the mandatory information but provide a user name such that is 
    contains a space (like: Walter White or Jesse Pinkman)
 # Click on save button

Actual: When user clicks on save button then he is redirected to main page of 
ecommerce and an error message is displayed. 
Similarly when user with space in username tries to login, error message is 
displayed. 

Praven: Added standard regex for username allowed alphabets, numbers, and _-
jleroux: actually "-" was  missing in the regepx definition.

Thanks: Arpit Mor for report and Praveen Sharma for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1862472 13f79535-47bb-0310-9956-ffa450edef68
2019-07-03 13:33:17 +00:00
Jacques Le Roux 69f4dcbbb3 "Applied fix from trunk for revision: 1862278"
------------------------------------------------------------------------
r1862278 | jleroux | 2019-06-28 13:53:55 +0200 (ven. 28 juin 2019) | 17 lignes

Fixed: User should be notified with success message on MRP run in manufacturing component
(OFBIZ-9533)

Steps to regenerate:
1. Go to Manufacturing component (manufacturing/control/main)
2. Click on Mrp sub menu (manufacturing/control/FindInventoryEventPlan)
3. Click on Run Mrp button.(manufacturing/control/RunMrp)
4. Select Facility/Facility Group and Click Submit button.
On success, the user should be notified with success message like 
"Mrp run is scheduled".

jleroux: despite being a sub-task of an improvement I decided to backport. 
It works well and nothing could go wrong, only UI changes.

Thanks: Aditya Sharma for report, Humera Khan for the fix, Prachi Shastri for
testing and Pierre Smits for noticing this could be backported (despite being
a sub-task of an improvement)
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1862280 13f79535-47bb-0310-9956-ffa450edef68
2019-06-28 11:55:11 +00:00
Jacques Le Roux 43ee4ab771 "Applied fix from trunk for revision: 1862271"
------------------------------------------------------------------------
r1862271 | jleroux | 2019-06-28 11:39:44 +0200 (ven. 28 juin 2019) | 11 lignes

fixed: supplierProductId Should Have Consistent Types Across Entities.
(OFBIZ-10150)

During some data migration I hit an issue where my data for supplierProductId 
was too long. So I looked up the fields and noticed that the order item entity 
had a different type for the field than the supplier product entity.

jleroux: we should do it for all cases
 

Thanks: jesse thomas for report and Rohit Hukkeri for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1862273 13f79535-47bb-0310-9956-ffa450edef68
2019-06-28 09:40:29 +00:00
Jacques Le Roux e3b8ec5e84 "Applied fix from trunk for revision: 1862207"
------------------------------------------------------------------------
r1862207 | jleroux | 2019-06-27 14:03:21 +0200 (jeu. 27 juin 2019) | 8 lignes

Fixed: Export XML data, ,o proper error message displayed if user misses to 
select entities 
(OFBIZ-11125)

No Proper error message is displayed if user misses to select entities from the 
list, and throw error message

Thanks: Jayansh Shinde
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1862209 13f79535-47bb-0310-9956-ffa450edef68
2019-06-27 12:03:55 +00:00
Jacques Le Roux 319d7f7626 "Applied fix from trunk for revision: 1862046"
------------------------------------------------------------------------
r1862046 | jleroux | 2019-06-25 11:44:54 +0200 (mar. 25 juin 2019) | 1 ligne

Reverted: it was not supposed to be committed, "wrong button" while backporting
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1862048 13f79535-47bb-0310-9956-ffa450edef68
2019-06-25 09:48:29 +00:00
Jacques Le Roux 7c256a12be "Applied fix from trunk for revision: 1861869"
------------------------------------------------------------------------
r1861869 | jleroux | 2019-06-22 16:19:09 +0200 (sam. 22 juin 2019) | 15 lignes

Fixed: Logo image not showing on party profile 
(OFBIZ-9299)

Logo image not displayed until we press in content component

Logo image was not showing on party profile page because we were using Ajax 
request to add party content on the party profile screen. 
So due to ajax request screen was not getting refreshed. 

To display logo image we did the following changes:
1) Removed ajax request and rendered profile view screen after submit
2) Used ofbizUrl macro to show an image instead of /content/control/stream URL


Thanks: Moatasim Al Masri for reporting, Mohammed Rehan Khan for fixing
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1861871 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 14:25:40 +00:00
Pawan Verma c2a3e58ca5 Applied fix from trunk for revision: 1861859
===

Fixed: Issue in which Ecommerce anonymous contactus was having wrong fromAddress.
(OFBIZ-10844)
As per my understanding, sendFrom email cannot be the customer's email address.

Email settings for this email are maintained at ProductStoreEmailSetting with CONT_NOTI_EMAIL as emailType and like other notifications, we should use ProductStoreEmailSetting.fromAddress to send this email which is configurable.
Thanks: Schumann Ye for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1861861 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 12:18:40 +00:00
Pawan Verma aa340cbd48 Applied fix from trunk for revision: 1861849
===

Fixed: Issue of agreement overview does not show names of parties.
(OFBIZ-10900)
Thanks Pierre Smits for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1861851 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 11:53:06 +00:00
Mridul Pathak f9cff7745d Applied fix from trunk r1861838.
Fixed: Getting an error while creating event from SFA without providing event name.
(OFBIZ-11109)
				
Thanks Harman Kaur Matharu for reporting and Aditi Patidar for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1861843 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 10:46:35 +00:00
Suraj Khurana 54add658c7 Applied fix from trunk for revision: 1861837
===

Fixed: Issue with Status of invoice.
(OFBIZ-10310)
Cause: Missing statusId in parameters.
Thanks Aayush Jain for reporting and Devanshu Vyas for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1861840 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 10:36:55 +00:00
Aditya Sharma a8b00ee90a Applied fix from trunk for revision: 1861615
===

Fixed: typo in the NOTICE file content


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1861617 13f79535-47bb-0310-9956-ffa450edef68
2019-06-19 11:38:05 +00:00
Suraj Khurana af72fb8d2e Applied fix from trunk for revision: 1860797
===

Fixed: Profile of contact person not shown on quick add of contact in SFA.
(OFBIZ-7816)
Issue occurred due to missing redirect parameter.
Thanks Rohit Hukkeri for providing the updated patch and everyone else for their contribution in this ticket.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1860799 13f79535-47bb-0310-9956-ffa450edef68
2019-06-08 05:24:10 +00:00
Jacopo Cappellato 758d9a2169 Applied fix from trunk for revision: 1860613
===

Fixed: fine tuned the sanitization of user input by allowing "safe" content; 
thanks to Jacques for the suggestion.

Fixes CVE-2019-10073

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1860615 13f79535-47bb-0310-9956-ffa450edef68
2019-06-04 13:23:16 +00:00
Deepak Dixit a64869dddb Applied fix from trunk for revision: 1860597
===

Fixed: Html escaping missing for renderLink parameters
(OFBIZ-11090)
Parameters vlaue should be escaped to avoid any kind of corss site scripting issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1860599 13f79535-47bb-0310-9956-ffa450edef68
2019-06-04 10:54:31 +00:00
Jacopo Cappellato 4e0f5edc1e Applied fix from trunk for revision: 1860592
===

Fixed: removed override directives to let the system perform proper validation 
of user input.

Fixes CVE-2019-10073

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1860594 13f79535-47bb-0310-9956-ffa450edef68
2019-06-04 09:17:25 +00:00
Jacques Le Roux 0c5b2805e7 "Applied fix from trunk for revision: 1860526 "
------------------------------------------------------------------------
r1860526 | jleroux | 2019-06-02 15:10:36 +0200 (dim. 02 juin 2019) | 11 lignes

Fixed: Unknown request [images]; this request does not exist or cannot be 
called directly.
(OFBIZ-10895)

I was wrong doing massive changes w/o close control. 
I decided to revert the r1859576 and r1859807 commits and to backport the revert

The only safe way to go is to not only check the error log for 
"Unknown request [...."
but also to look for 404 in access log, not all request show erroneously in
error log/
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1860528 13f79535-47bb-0310-9956-ffa450edef68
2019-06-02 13:13:32 +00:00
Nicolas Malin f855ca77bf Fixed: Backport: Decrypt a field on embedded entity-view failed
(OFBIZ-11078)

When you tried to decrypt a field present on embedded entity-view, key use is the view name and not the final entity who contains this field.

You currently have the problem on PartyContactMechDetail where if you want to displaying the ftpPassword for a FtpAddress, the view failed and tried to use ContactMechDetail to decrypt instead of FtpAddress

To solve it, we iterate on the entity contains the field in the view while is an entity-view :

    PartyContactMechDetail.ftpPassword
         -> ContactMechDetail.ftpPassword
              -> FtpAddress.ftpPassword
                   -> key found FtpAddress

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1860367 13f79535-47bb-0310-9956-ffa450edef68
2019-05-29 18:59:39 +00:00
Jacques Le Roux 05067278bf "Applied fix from trunk for revision: 1860357"
------------------------------------------------------------------------
r1860357 | jleroux | 2019-05-29 18:29:31 +0200 (mer. 29 mai 2019) | 14 lignes

Fixed: Gradle eclipse task - classpath modification (Add exclusion for 
<OFBiz>/framework/base/config and <OFBiz>/framework/base/dtd)
(OFBIZ-11071)

Eclipse task removes all classpath entries that affects following entries also -
 * <OFBiz>/framework/base/config
 * <OFBiz>/framework/base/dtd

These two entries are essential to start OFBiz successfully. 
Developer has to manually add these entries back to start OFBiz from IDE.

Following this discussion: https://s.apache.org/baoT

Thanks: Girish Vasmatkar
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1860359 13f79535-47bb-0310-9956-ffa450edef68
2019-05-29 16:30:41 +00:00
Swapnil Mane bc7fe0f53f Applied fix from trunk for revision: 1860274
===

Fixed: Corrected the navigation of 'To Facility ID' on the inventory transfer screen
(OFBIZ-10992)

Steps to regenerate:

1.) Go to Facilities.
2.) Select Inventory Xfers option.
3.) Create Transfer Inventory Item from any Warehouse.
4.) Navigate to Transfer Inventory overview screen
https://localhost:8443/facility/control/TransferInventoryItem?inventoryTransferId=10001
5.) 'Facility Id To' link is not redirecting to correct facility

Thanks:  Pawan Verma and Aishwary Shrivastava for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1860276 13f79535-47bb-0310-9956-ffa450edef68
2019-05-28 14:06:36 +00:00
Jacques Le Roux 276976d6ed "Applied fix from trunk for revision: 1860141"
------------------------------------------------------------------------
r1860141 | jleroux | 2019-05-27 18:28:32 +0200 (lun. 27 mai 2019) | 13 lignes

Fixed: Edit WebSite Path Alias is not working
(OFBIZ-11022)

Steps to regenerate:
    Login into content
    Select any website(Preferably CmsSite as it has pathAlias)
    Click on pathAlias tab
    Select any pathAlias to edit

See edit option is not available on screen, Create option is available which 
is creating new pathAlias instead of edit.

Thanks: Pawan Verma
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1860143 13f79535-47bb-0310-9956-ffa450edef68
2019-05-27 16:29:26 +00:00
Suraj Khurana 5fc71a4430 Applied fix from trunk for revision: 1860082
===

Fixed: CSS Styling for Party Content progress bar is wrong in multiple theme.
(OFBIZ-10797)
Thanks Ayushi Rathod for reporting the issue and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1860084 13f79535-47bb-0310-9956-ffa450edef68
2019-05-26 16:12:44 +00:00
Jacques Le Roux d0b58cdc54 "Applied fix from trunk for revision: 1859981"
------------------------------------------------------------------------
r1859981 | jleroux | 2019-05-25 16:24:30 +0200 (sam. 25 mai 2019) | 14 lignes

Fixed: Runtime error exceptions at Leads page
(OFBIZ-11059)

Step to recreate issue -

    Login to https://demo-trunk.ofbiz.apache.org/ordermgr/control/main
    Application > SFA
    SFA > Lead Manager 
    Leads > Click on All Leads button

Application throw Runtime error exception in My Leads section.

Thanks: Sanjay Yadav for report, Kumar Rahul for the fix and Pierre Smits
for help on Jira issue
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859986 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 14:32:24 +00:00
Jacques Le Roux 01125fef2b "Applied fix from trunk for revision: 1859972"
------------------------------------------------------------------------
r1859972 | jleroux | 2019-05-25 16:08:48 +0200 (sam. 25 mai 2019) | 12 lignes

Fixed: Duplicate entries in paramWithSuffix
(OFBIZ-11056)

when using string-list-suffix attribute for service definition, invoke method 
(from associated event handler) will try to parse parameters from both request 
variable and rawParameterMap which was also built from request. 
So we end up with duplicates in resulting list.

This behaviour seems to be introduced with OFBIZ-5048.


Thanks: Samuel Trégouët for report and fix 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859974 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 14:10:49 +00:00
Jacques Le Roux 0fe7b2eefc "Applied fix from trunk for revision: 1859968"
------------------------------------------------------------------------
r1859968 | jleroux | 2019-05-25 15:25:34 +0200 (sam. 25 mai 2019) | 16 lignes

Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe"
(OFBIZ-5254)

The testCreateNewRequest was failing due to escaped single quotes in related
data in OrderTypeData.xml:
subject="OFBiz - Your Request is received: '${custRequestName}' #CR${custRequestId}"

This was a peculiar case that could be generalised to all escapable characters.
The general solution is to compare the original value with the filtered value 
unescaped in UtilCodec::checkStringForHtmlSafe.
BTW, weirdly enough StringEscapeUtils::escapeHtml4 does not escape single quote.

Another weirdness is the test was passing with plugins data loaded. This is due
to duplicated demo data in scrumTypeData.xml (which is actually not only type
data, as ever the scrum component is a mess, that's not new and always wonder
if we should not get rid of it!)
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859970 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 13:34:47 +00:00
Swapnil Mane ece26726e4 Applied fix from trunk for revision: 1859931
===

Fixed: Error on deleting the survey associated with the task
(OFBIZ-7594)

The following error is generated on deleting the survey associated with the task.

Error calling event: org.apache.ofbiz.webapp.event.EventHandlerException: Problems getting the service model (Cannot locate service by name (deleteWorkEffortSurveyAppl))

On exploration I found, In the refactoring work done under OFBIZ-8408, the deleteWorkEffortSurveyAppl service was removed.

Added the deleteWorkEffortSurveyAppl service, previously it was in written in the simple engine, converted it to entity-auto.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859935 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 09:31:15 +00:00
Suraj Khurana 8ae9012031 Applied fix from trunk for revision: 1859915
===

Fixed: Enable entity timestamp fields.
(OFBIZ-10959)
While working on a Production environment, it is found that for some reason entity timestamp fields are disabled at Search Results screen in Trunk and the previous release branch.

Thanks Pawan Verma for reporting the issue and providing the patch, Jacques, Gil, Mathieu for reviewing it.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859917 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 08:28:36 +00:00
Nicolas Malin 25e36243d4 Reverted: uneeded bad formatting push
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859890 13f79535-47bb-0310-9956-ffa450edef68
2019-05-24 15:16:39 +00:00
Nicolas Malin eb737fb5d4 Fixed: Backport: Manage EECAs on delegator.removeBy
(OFBIZ-11040)
When you delete some entities through removeByAnd or removeByCondition, eeca aren't enable and the remove is quite as regard implemented rules.
With
        <eca entity=GoodIndentification operation=create-store-remove event=return>
             <action service=indexProductKeywords mode=sync/>
        </eca>
And
        delegator.removeByAnd('GoodIdentification', [productId: 'WG-1111'])

The service indexProductKeywords wasn't call for the productId WG-1111

To solve this situation, the idea would be delegator.removeValue for each element to delete when an eeca is present otherwise call the standard helper.removeByCondition.

Thanks to Leila Mekika for raise and fix this issue, Jacques Leroux and Mathieu Lirzin for the review

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859889 13f79535-47bb-0310-9956-ffa450edef68
2019-05-24 15:12:45 +00:00
Jacques Le Roux bdb25b67ff "Applied fix from trunk for revision: 1859882"
------------------------------------------------------------------------
r1859882 | jleroux | 2019-05-24 16:16:39 +0200 (ven. 24 mai 2019) | 5 lignes

Improved: no functional change

Javadoc was unhappy: 
CustomPermissivePolicy.java:13: error: element not closed: blockquote

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859884 13f79535-47bb-0310-9956-ffa450edef68
2019-05-24 14:17:07 +00:00
Jacques Le Roux bd600b6f14 "Applied fix from trunk for revision: 1859877"
------------------------------------------------------------------------
r1859877 | jleroux | 2019-05-24 15:47:08 +0200 (ven. 24 mai 2019) | 10 lignes

Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe"
(OFBIZ-5254)

This was reopened after discussion at 
https://markmail.org/message/jnaitmwahjcjmdn5

This is a new solution which follows the work done with OFBIZ-6669 and OFBIZ-10187
Roughly said, it uses org.owasp.html.PolicyFactory and org.owasp.html.Sanitizers

Thanks: Christoph Neuroth for report
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859879 13f79535-47bb-0310-9956-ffa450edef68
2019-05-24 13:52:11 +00:00
Jacques Le Roux a5b8f71147 Fixed: no functional changes
Revert changes from r1859873 which inadvertently slipped in


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859875 13f79535-47bb-0310-9956-ffa450edef68
2019-05-24 13:40:19 +00:00
Jacques Le Roux add8fd7eaf "Applied fix from trunk for revision: 1859871"
------------------------------------------------------------------------
r1859871 | jleroux | 2019-05-24 15:24:31 +0200 (ven. 24 mai 2019) | 14 lignes

Fixed: OWASP sanitizer breaks proper rendering of HTML code
(OFBIZ-10187)

After a discussion with Dennis, I checked and the pattern ONSITE_URL would be 
useless without 

.allowAttributes("background").matching(ONSITE_URL)
.onElements("table")
.allowAttributes("background").matching(ONSITE_URL)
.onElements("td", "th", "tr")

So here they are

Thanks: Dennis Balkir for discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859873 13f79535-47bb-0310-9956-ffa450edef68
2019-05-24 13:27:38 +00:00
Jacques Le Roux 1a9943bc4c "Applied fix from trunk for revision: 1859807"
Some handled by hand
------------------------------------------------------------------------
r1859807 | jleroux | 2019-05-23 18:41:59 +0200 (jeu. 23 mai 2019) | 5 lignes

Fixed: Unknown request [images]; this request does not exist or cannot be called 
directly.
(OFBIZ-10895)

This should be the last commit, but I can't be sure. So I'll continue to 
monitor the demos logs...
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859810 13f79535-47bb-0310-9956-ffa450edef68
2019-05-23 16:59:31 +00:00
Jacques Le Roux 6750a3de4a "Applied fix from trunk for revision: 1859800"
------------------------------------------------------------------------
r1859800 | jleroux | 2019-05-23 18:36:37 +0200 (jeu. 23 mai 2019) | 8 lignes

Fixed: Replace request-redirect w/ no redirect-param attribute by 
request-redirect-noparam
(OFBIZ-9997)

Reverts all the rest from r1816180, and, after reading carefully the code used 
for "request-redirect" in RequestHandler (and downward), fixes the documentation 
in site-conf.xsd

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859802 13f79535-47bb-0310-9956-ffa450edef68
2019-05-23 16:37:38 +00:00
Jacques Le Roux 4b95de99b5 "Applied fix from trunk for revision: 1859796"
------------------------------------------------------------------------
r1859796 | jleroux | 2019-05-23 18:33:26 +0200 (jeu. 23 mai 2019) | 5 lignes

Fixed: Mass actions in FindOrders.ftl don't keep parameters
(OFBIZ-11052)

This adds a missing ampersand  after requestParameters.hideFields?default("N") 
when needed 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859798 13f79535-47bb-0310-9956-ffa450edef68
2019-05-23 16:34:32 +00:00
Jacques Le Roux 110fa15cdb "Applied fix from trunk for revision: 1859735 "
------------------------------------------------------------------------
r1859735 | jleroux | 2019-05-22 18:41:04 +0200 (mer. 22 mai 2019) | 12 lignes

Fixed: massPrintOrders service does not work
(OFBIZ-11049)

This problem was similar to what was resolved by r1806237 for OFBIZ-9138.

This fixes it by using the same solution than in r1806237. If the visual theme 
is unknown in the the service  context  get the default theme from 
general.properties using ThemeFactory::resolveTheme.

sendPrintFromScreen, createFileFromScreen, sendBirtMail, getXslFo and 
printReportPdf (in example) were concerned

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859738 13f79535-47bb-0310-9956-ffa450edef68
2019-05-22 16:42:37 +00:00
Jacques Le Roux f8fc5272fc "Applied fix from trunk for revision: 1859708"
------------------------------------------------------------------------
r1859708 | jleroux | 2019-05-22 11:33:46 +0200 (mer. 22 mai 2019) | 8 lignes

Fixed: Replace request-redirect w/ no redirect-param attribute by 
request-redirect-noparam
(OFBIZ-9997)

Getting to navigateContent in content component is better when using view.
You then get into the node you were working on (adding, updating or deleting)

Still WIP for the rest...
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859710 13f79535-47bb-0310-9956-ffa450edef68
2019-05-22 09:34:35 +00:00
Jacques Le Roux 8476e68504 "Applied fix from trunk for revision: 1859704"
------------------------------------------------------------------------
r1859704 | jleroux | 2019-05-22 10:59:45 +0200 (mer. 22 mai 2019) | 8 lignes

Fixed: When you select a ProductManufacturingRule if several exist only the one 
selected will show multiple times in the list
(OFBIZ-11048)

When you select a ProductManufacturingRule if several exist only the one 
selected will show multiple times in the list

This was due to a wrong usage of auto-fields-service, from pre Apache era
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859706 13f79535-47bb-0310-9956-ffa450edef68
2019-05-22 09:00:22 +00:00
Jacques Le Roux 7aef75589f "Applied fix from trunk for revision: 1859698"
------------------------------------------------------------------------
r1859698 | jleroux | 2019-05-22 10:12:51 +0200 (mer. 22 mai 2019) | 10 lignes

Fixed: Replace request-redirect w/ no redirect-param attribute by 
request-redirect-noparam
(OFBIZ-9997)

Reverts r1859694 request-redirect-noparam is required else the deleted 
ProductManufacturingRule is shown in the edit/update screen with the deleted
ruleId.

I was misleaded because this screen is not standard at all. I guess it's not
much used since it's like that for ages
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859700 13f79535-47bb-0310-9956-ffa450edef68
2019-05-22 08:13:39 +00:00
Jacques Le Roux bb548e73a9 "Applied fix from trunk for revision: 1859694"
------------------------------------------------------------------------
r1859694 | jleroux | 2019-05-22 09:44:55 +0200 (mer. 22 mai 2019) | 5 lignes

Fixed: Replace request-redirect w/ no redirect-param attribute by 
request-redirect-noparam
(OFBIZ-9997)

No problems using view here, KISS!
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859697 13f79535-47bb-0310-9956-ffa450edef68
2019-05-22 07:48:24 +00:00
Jacques Le Roux 4c16c754ee "Applied fix from trunk for revision: 1859691"
------------------------------------------------------------------------
r1859691 | jleroux | 2019-05-22 09:39:08 +0200 (mer. 22 mai 2019) | 15 lignes

Fixed: It's impossible to create more than 1 ProductManufacturingRule
(OFBIZ-11047)

In a previous commit for OFBIZ-9997 I wrote:
>DeleteProductManufacturingRule seems weird to me because I don't understand how
>to create several Manufacturing Rules. I'll check Sharan's book :)

I checked Sharan's book and there is nothing about it

It also shows ManufacturingMachineGroupIdAlreadyExist ("Fixed Asset Group ID 
doesn't exist") when you try to create one using manually the 
AddProductManufacturingRule service which makes no sense.

This fixes it by adding the necessary in BomForms.xml and fixing 
addProductManufacturingRule which was wrong from start (pre Apache era)
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859693 13f79535-47bb-0310-9956-ffa450edef68
2019-05-22 07:39:54 +00:00
Jacques Le Roux 1afd4538d4 "Applied fix from trunk for revision: 1859576"
------------------------------------------------------------------------
r1859576 | jleroux | 2019-05-20 20:02:09 +0200 (lun. 20 mai 2019) | 15 lignes

Fixed: Unknown request [images]; this request does not exist or cannot be 
called directly.
(OFBIZ-10895)

This error happens in many occasions.
It shows only in log and have no effect on UI.
It happens in all supported releases. 
So it's not very bad since it's has no side effects.

As said Deepak Dixit:
I think we need to fix the image url in css file, it should start with /images, 
else browser append this in request info. There is nothing related to java or 
tomcat code. 

I finally decided to do a whole change, here it is
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859578 13f79535-47bb-0310-9956-ffa450edef68
2019-05-20 18:03:05 +00:00
Jacques Le Roux c293746af5 "Applied fix from trunk for revision: 1859571"
------------------------------------------------------------------------
r1859571 | jleroux | 2019-05-20 19:14:43 +0200 (lun. 20 mai 2019) | 22 lignes

Fixed: field emplFromDate is forgot in PayHistory entity
(OFBIZ-11028)

Arpit Mor: steps to regenerate:
    Login to the URL: https://demo-trunk.ofbiz.apache.org/humanres/control/main
    Click on Employments
    Click on New Employments
    Click on Create
Actual: Error message is displayed.

Olivier Heintz: employment is associated with PayHistory, and there is a problem 
in PayHistory entity definition in OFBiz,
In PayHistory, the field fromDate from Employment is confused with fromDate 
about the current record.
A Employment can have multiple PayHistories and should have multiple
because PayHistory should show history of Pay  for a employment  !
It's necessary to have a field emplFromDate (to have the complete employment 
primaryKey).
When modifying a PayRecord the current should be expire and a new one should 
be created.

Thanks: Arpit Mor for report at OFBIZ-10969 and Olivier Heintz for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859573 13f79535-47bb-0310-9956-ffa450edef68
2019-05-20 17:16:27 +00:00
Jacques Le Roux 89c5e33fbc "Applied fix from trunk for revision: 1859543"
------------------------------------------------------------------------
r1859543 | jleroux | 2019-05-20 12:10:34 +0200 (lun. 20 mai 2019) | 24 lignes

Fixed: Redirection of pathAlias to aliasTo does not work properly
(OFBIZ-11018)

Link of discussion: https://markmail.org/message/s37whdteejqdzkha

In CMS, we can redirect the user to different path alias using 'aliasTo' field 
of WebSitePathAlias entity.

As per my observation, the content for  "newDemoHome" is rendered properly 
(as expected) but the URL of the page (in browser) doesn't change.
We should also update the URL also, i.e. change browser URL from

Example - 
<WebSitePathAlias aliasTo="demoPage2" fromDate="2016-06-09 13:37:30.43" 
pathAlias="demoHome2" webSiteId="CmsSite"/>
<WebSitePathAlias contentId="CMSS_DEMO_PAGE1" fromDate="2016-06-09 13:37:30.43" 
pathAlias="demoPage2" webSiteId="CmsSite"/>

Based on the above data, if the user hit the 
URL https://localhost:8443/cmssite/cms/demoHome2 
the CMS should internally render the content for 'DemoHome2' at
https://localhost:8443/cmssite/cms/demoPage2

Thanks: Pawan Verma
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859545 13f79535-47bb-0310-9956-ffa450edef68
2019-05-20 10:12:43 +00:00
Nicolas Malin 7a2a61f7e8 Fixed: Backport: Incorrect findByCount on DynamicView with groupBy and selected fields
(OFBIZ-11041)

When you create a DynamicView with 'group by' agreggate function and you perform a delegator.findCountByCondition() with selected fields, the result is different from the count of each element returned by delegator.findList().

The problem come from when the 'group by' closure is populated with all grouped by fields from on the DV and not only those from selected fields.

Thanks to Leila Mekika to raise and solve this issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859440 13f79535-47bb-0310-9956-ffa450edef68
2019-05-17 15:50:12 +00:00
Aditya Sharma f4d08a04b5 Applied fix from trunk for revision: 1859255
===

Fixed: Issue in function getVariantSelectionFeatures of ProductWorker.java
(OFBIZ-11029)
Check should be isVirtual instead of productId. Also handled a NullPointerException for variantProduct.
Thanks Denglong Zhou for reporting the issue, Pawan Verma for the patch and Suraj Khurana & Jacques Le Roux for the review


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859257 13f79535-47bb-0310-9956-ffa450edef68
2019-05-15 05:12:52 +00:00
Mathieu Lirzin d837b65d69 Fixed: Fix javadoc build for OpenJDK 11
(OFBIZ-10757)

This removes HTML5 deprecated stuff such as ‘<tt>’ elements, and
‘cellpadding’ table attributes which were breaking the ‘:javadoc’
Gradle task when using OpenJDK 11.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859125 13f79535-47bb-0310-9956-ffa450edef68
2019-05-11 20:44:17 +00:00
Jacques Le Roux 7c132521a0 "Applied fix from trunk for revision: 1859087"
------------------------------------------------------------------------
r1859087 | jleroux | 2019-05-10 19:01:12 +0200 (ven. 10 mai 2019) | 16 lignes

Fixed: Replace request-redirect w/ no redirect-param attribute by 
request-redirect-noparam
(OFBIZ-9997)

At least importContactListParties in marketing component needs 
request-redirect instead of request-redirect-noparam
This reverts it. 

Others still needs to be checked. 
It seems getting to navigateContent in content component is OK, but not totally
sure yet

DeleteProductManufacturingRule seems weird to me because I don't understand how
to create several Manufacturing Rules. I'll check Sharan's book :)

WIP...
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859089 13f79535-47bb-0310-9956-ffa450edef68
2019-05-10 17:02:12 +00:00
Jacques Le Roux 7bdde700d0 "Applied fix from trunk for revision: 1859055 "
------------------------------------------------------------------------
r1859055 | jleroux | 2019-05-10 07:15:28 +0200 (ven. 10 mai 2019) | 4 lignes

Fixed: no functional changes

Fixes typos

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859057 13f79535-47bb-0310-9956-ffa450edef68
2019-05-10 05:15:58 +00:00
Jacques Le Roux c8cd459002 "Applied fix from trunk for revision: 1859033"
------------------------------------------------------------------------
r1859033 | jleroux | 2019-05-09 21:46:07 +0200 (jeu. 09 mai 2019) | 21 lignes

Fixed: Update invoice item looses invoice context
(OFBIZ-11009)

When clicking  the "update" button on an invoice item the context to the 
invoice (invoiceId) is lost. The result is an empty form to add a new invoice 
item without invoice context.

Go to /accounting/control/listInvoiceItems?invoiceId=demo10001
Click on "update" below the existing items. 
You will then be redirect to /accounting/control/listInvoiceItems 
(without invoiceId). You will not see the invoice items as the context to the 
invoice is gone.

jleroux: the same existed for budget items. As Ingo mentioned:
<<It was broken by OFBIZ-9997:
Replace request-redirect w/ no redirect-param attribute 
by request-redirect-noparam>>

Now we need to check all changes done for OFBIZ-9997

Thanks: Ingo Wolfmayr for report and fix proposition
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859035 13f79535-47bb-0310-9956-ffa450edef68
2019-05-09 19:47:02 +00:00
Jacques Le Roux d97e01d80d "Applied fix from trunk for revision: 1858980 "
------------------------------------------------------------------------
r1858980 | jleroux | 2019-05-09 11:17:08 +0200 (jeu. 09 mai 2019) | 4 lignes

Fixed: OWASP sanitizer breaks proper rendering of HTML code
(OFBIZ-10187)

By default we now use a permissive sanitizer policy
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858982 13f79535-47bb-0310-9956-ffa450edef68
2019-05-09 09:21:23 +00:00
Jacques Le Roux caef7b7627 "Applied fix from trunk for revision: 1858965"
------------------------------------------------------------------------
r1858965 | jleroux | 2019-05-09 08:05:05 +0200 (jeu. 09 mai 2019) | 18 lignes

Fixed: Product content management screen doesn't validate trusted users' input
(OFBIZ-10054)

Steps to recreate:
1) go to (authenticate with admin/ofbiz):
https://localhost:8443/catalog/control/EditProductContent?productId=WG-1111

2) set the content of the field labeled "Large Image" to:
non_existent.foo" onerror="alert('Hi!');

3) visit the url:
https://localhost:8443/ecommerce/control/product?product_id=WG-1111

A popup message will appear with the "Hi!".

jleroux: This is fixed by preventing any js event to be passed 

Thanks: Loris Nardo for report, Jacopo and Gregory for discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858967 13f79535-47bb-0310-9956-ffa450edef68
2019-05-09 06:05:58 +00:00
Mathieu Lirzin 6a3ad303ef Improved: Rewrite ‘CustomPermissivePolicy#matchesEither’ static method
(OFBIZ-10187)

It now uses a lambda expression instead of an anonymous class.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858935 13f79535-47bb-0310-9956-ffa450edef68
2019-05-08 17:12:40 +00:00
Mathieu Lirzin d8ad8e559d Improved: Add missing ‘synchronized’ modifier
(OFBIZ-11004)

Overriding a synchronized method with a non-synchronized one can
introduce potential runtime concurrency bugs. Since
‘ExtendedProperties#loadFromXML’ is overridding
‘Properties#loadFromXML’ which is synchronized, it is safer to mark it
as synchonized.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858929 13f79535-47bb-0310-9956-ffa450edef68
2019-05-08 15:20:24 +00:00
Jacques Le Roux 8d79e5cf72 "Applied fix from trunk for revision: 1857088"
------------------------------------------------------------------------
r1857088 | mthl | 2019-04-08 00:11:53 +0200 (lun. 08 avr. 2019) | 6 lignes

Fixed: Remove redundant interface declaration (OFBIZ-10910)

‘java.io.ObjectInputStream’ already implements the ‘AutoCloseable’
interface, so there is no need to declare it in
‘SafeObjectInputStream’ which extends this class.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858867 13f79535-47bb-0310-9956-ffa450edef68
2019-05-07 15:00:38 +00:00
Jacopo Cappellato f4cd236867 Applied fix from trunk for revision: 1858539
===

Improved: Replaced permission-service with required-permissions in order to 
perform permission checks in a way that is more consistent with the screen 
permissions set in the ecommerce blog/forum screens.

Fixes CVE-2019-10073

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858541 13f79535-47bb-0310-9956-ffa450edef68
2019-05-02 13:43:02 +00:00
Jacques Le Roux 77ad05c627 "Applied fix from trunk for revision: 1858523"
------------------------------------------------------------------------
r1858523 | lektran | 2019-05-02 10:59:11 +0200 (jeu. 02 mai 2019) | 1 ligne

Fixed: Ensure the story field in ordermgr's EditCustRequest form is html encoded (OFBIZ-11006)

Fixes CVE-2019-10074
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858532 13f79535-47bb-0310-9956-ffa450edef68
2019-05-02 11:53:14 +00:00
Jacques Le Roux 63846f3b78 "Applied fix from trunk for revision: 1858444 "
------------------------------------------------------------------------
r1858444 | jleroux | 2019-04-30 18:23:56 +0200 (mar. 30 avr. 2019) | 34 lignes

Fixed: Unknown request [images]; this request does not exist or cannot be 
called directly.
(OFBIZ-10895)

This error happens in many occasions:
Inside another request (eg LookupProduct)
Of after a request (eg login)

It shows only in log and have no effect on UI. Notably the new feature normally 
showing an error message in trunk (OFBIZ-10753) does not shows

It happens in all supported releases. IIRW it always happened, only URLs like 
https://demo-trunk.ofbiz.apache.org/images/defaultImage.jpg work. 
But here it's different because we don't need to call 
https://demo-trunk.ofbiz.apache.org/images by hand to get the issue in log.

So it's not very bad since it's has no side effects, just weird and annoying. 
Because it might hide something undetected yet...

This issue does not appear in R15, a good place to test is for instance 
ordermgr/control/request. 
There cal.gif is called by /images/cal.gif and it works (the images appears) 
but in more recent versions the call is also done to 
/ordermgr/control/images/cal.gif where it fails. 
This 1st appears in ControlFilter in the stack trace.

As said Deepak Dixit:
I think we need to fix the image url in css file, it should start with /images, 
else browser append this in request info. There is nothing related to java or 
tomcat code. 

This is a 1st commit for the errors I already reported and I'm sure about
Common-theme does not exist here so some have been handled by hand

Thanks: Deepak 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858447 13f79535-47bb-0310-9956-ffa450edef68
2019-04-30 16:30:44 +00:00
Jacopo Cappellato 2ddc95ea52 Applied fix from trunk for revision: 1858432
===

[Fixed]: Added permission checks to three blog/forum services; improved the 
configuration for the "add article forum" form (the source tab is not needed in 
the ecommerce application).

Fixes CVE-2019-10073

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858437 13f79535-47bb-0310-9956-ffa450edef68
2019-04-30 14:48:59 +00:00
Michael Brohl 0ee8973ea4 Fixed: OWASP sanitizer breaks proper rendering of HTML code
(OFBIZ-10187)

This makes the sanitizing enabled/disabled by configuration and enhances
the functionality to support custom sanitizer policies. A reasonable 
example policy class is also included.

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858354 13f79535-47bb-0310-9956-ffa450edef68
2019-04-29 09:42:55 +00:00
Michael Brohl 67620983e5 Fixed: Failed registration for virtual hosts with similar mount points
(OFBIZ-10765)

The default host is now retrieved using the API instead of simply
retrieving the 1st host through Tomcat.getHost().

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858349 13f79535-47bb-0310-9956-ffa450edef68
2019-04-29 09:01:52 +00:00
Swapnil Mane 900afc674d Applied fix from trunk for revision: 1858319
===

Fixed: createProductFeature service ignoring passed productFeatureId parameter
(OFBIZ-10958)

In the change, used override tag instead of attribute.
And set the optional true in INOUT mode for productFeatureId.
But since we are using entity-auto productFeatureId will be always available (either user provide it and if not passed by the user,  system will autogenerate it), thus it will be always OUT.

Additional Notes:

Here we can't make a changes mentioned below, because, for *optional* field's value, invokeCreate method (internally calling isIn and IsOut methods of ModelParam) of EntityAutoEngine.java consider the attribute (override) defined at last for parameters with the same name.

i.e. for below example,  optional value for productFeatureId for mode IN  will be false (but it is defined true)

{code}
<override name=productFeatureId type=String mode=IN optional=true/>
<override name=productFeatureId type=String mode=OUT optional=false/>
{code}

Due to this, isSinglePkIn (in invokeCreate method) field got false value, and the system will auto-generate the productFeatureId and ignore the user's input.

Similarly, we can't write in this way
{code}
<override name=productFeatureId type=String mode=OUT optional=false/>
<override name=productFeatureId type=String mode=IN optional=true/>
{code}

Because in this case, isSinglePkOut (in invokeCreate method) field got false value, and again the system will auto-generate the productFeatureId and ignore the user's input. 

Thanks:  Ulrich Heidfeld for reporting the issue and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858321 13f79535-47bb-0310-9956-ffa450edef68
2019-04-28 11:58:14 +00:00
Jacques Le Roux b3d408555b "Applied fix from trunk for revision: 1858275 "
------------------------------------------------------------------------
r1858275 | jleroux | 2019-04-27 15:33:44 +0200 (sam. 27 avr. 2019) | 18 lignes

Fixed: Display of entities in text input field for Product Name
(OFBIZ-10356)

In the url:  catalog/control/EditProductContent?productId=GZ-1006-1
the "Product Name" under "Override Simple Fields" is unnecessarily
expressed in entity format . The string displayed in product name
field is:

"Open Gizmo &#x28;LGPL&#x29;" 

it could have been a
simple "Open Gizmo (LGPL)"

jleroux: this was due to OFBIZ-248 when StringUtil.wrapString() was not yet 
available (IIRW)

Thanks: Rajesh Kumar Mallah for report, Swapnil M Mane for discussion, and
Ankit Joshi for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858277 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 13:34:34 +00:00
Suraj Khurana 098375e2d6 Applied fix from trunk for revision: 1858256
===

Fixed: Unable to add survey product to cart in order entry form.
(OFBIZ-10735)
It was due to incorrect usage of param map, used UtilHttp.getCombinedMap instead with some code improvements.
Thanks Amit Gadaley for reporting the issue and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858257 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 09:00:03 +00:00
Suraj Khurana 38af5a476c Applied fix from trunk for revision: 1858250
===

Fixed: Customer Party getting set as 'organizationPartyId' in one the Account transaction for Customer return invoice.
(OFBIZ-10856)
Thanks Chinmay Patidar for reporting and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858252 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 07:18:38 +00:00
Swapnil Mane 12943e0abb Applied fix from trunk for revision: 1858035
===

Fixed: Parameters are not available to the next response type when form of enctype=multipart/form-data type is submitted
(OFBIZ-10833)

Reason: The UtilHttp.getMultiPartParameterMap method is used to get the parameters in case of multipart/form-data type.
The getMultiPartParameterMap parse the request to get the parameters.

{code}
uploadedItems = UtilGenerics.<FileItem>checkList(upload.parseRequest(request));
{code}

As per the Apache commons-fileupload guideline, a request can only be parsed once [1]. So, for the next response, again the same getMultiPartParameterMap method is executed (with the same request object), and no parameters are found, since, the request is already parsed.

Also, have a look at the StackOverflow question [2], it also contains related information.

Fix for the issue:
Set the consumed parameters (except uploaded file(s)) in the request attribute so that it will be available to the next response.
The uploaded file(s) are not set in request attribute again to avoid unnecessary memory consumption, also it makes no sense to traverse the uploaded file in the request.

[1] http://commons.apache.org/proper/commons-fileupload/faq.html#empty-parse

[2] https://stackoverflow.com/questions/13881272/servletfileuploadparserequestrequest-returns-an-empty-list

Thanks: Ingo Wolfmayr for reporting issue and Jacques Le Roux for review.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1858037 13f79535-47bb-0310-9956-ffa450edef68
2019-04-24 10:06:21 +00:00
Swapnil Mane 8d9a8eb021 Applied fix from trunk for revision: 1857813
===

Fixed: If the picklist cancelation process failed, the picklist item shouldn't be marked as cancel
(OFBIZ-4690)

When a transaction is running in which Picklist entity is updated (i.e. canceled), now if the transaction is rollback the picklist status will not be changed but as per previous code, the picklist item's status will get updated i.e. marked as cancel because we called the cancelPicklistAndItems service in async mode

So the situation here was the Picklist is not canceled, but the Picklist items were marked as cancel.

Thus to fix it, call the cancelPicklistAndItems service in sync mode.

Thanks:  Jacques Le Roux for your thoughts.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857815 13f79535-47bb-0310-9956-ffa450edef68
2019-04-19 14:09:02 +00:00
Paul Foxworthy 9b9b12266f Fixed: Updating an OrderItem loses supplierProductId
(OFBIZ-10932)

When you edit on order item, the details are reloaded into a shopping cart
and after editing the order is updated from the cart. The supplierProductId
for the order item is now read into the cart so won't be lost.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857783 13f79535-47bb-0310-9956-ffa450edef68
2019-04-19 05:49:46 +00:00
Jacques Le Roux 84c968b578 "Applied fix from trunk for revision: 1857692"
------------------------------------------------------------------------
r1857692 | jleroux | 2019-04-17 18:19:00 +0200 (mer. 17 avr. 2019) | 5 lignes

Fixed: Stores can't be modified at ofbizsetup/control/updateProductStore
(OFBIZ-10930)

Same than parent issue (OFBIZ-10567) but in ofbizsetup component (which should 
have been names setup BTW, I created a setup component for that in Jira)
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857694 13f79535-47bb-0310-9956-ffa450edef68
2019-04-17 16:19:29 +00:00
Nicolas Malin 2e70b652bb Fixed: Backport, Duplicate a ShoppingCartItem didn't propage OrderItemAttributes
(OFBIZ-10929)

When you clone a ShoppingCartItem by constructor :
    ShoppingCartItem sci = new ShoppingCartItem(ShoppingCartItem item)

The ShoppingCartItem.orderItemAttributes wasn't propage from origin.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857659 13f79535-47bb-0310-9956-ffa450edef68
2019-04-16 19:30:43 +00:00
Deepak Dixit 353afa22d8 Applied fix from trunk for revision: 1857617
===

Fixed: Wrong permission check in ProductScreens#FindProduct
(OFBIZ-10925)
Thanks Dennis Balkir for your contribution

The permission service acctgAgreementPermissionCheck is used in the screen FindProduct in ProductScreens.xml. 
This doesn't really make sense, since there is no connection to the accounting application here.
There was the service productGenericPermission which could have been used instead, 
but this one calls the simple-method checkProductRelatedPermission, 
which then check for the CATALOG permission. Since this is already done in the CommonProductDecorator before, it would not make any sense to do this a second time.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857620 13f79535-47bb-0310-9956-ffa450edef68
2019-04-16 06:04:19 +00:00
Nicolas Malin 0fd5c7e92b Fixed: Backport Update an order linked to an other order lost relation applications/order/
(OFBIZ-10926)
When you edit an order linked to an other order like drop shipment process, shopping cart lost the connexion.
The problem came from ShoppingCart.makeAllOrderItemAssociations() function that prepared all generic value OrderItemAssoc without toOrderId.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857607 13f79535-47bb-0310-9956-ffa450edef68
2019-04-15 22:14:57 +00:00
Jacques Le Roux 0e224ed88f Fixed: Update Tomcat to 9.0.18 due to CVE-2019-0232
(OFBIZ-10920)

CVE-2019-0232 Apache Tomcat Remote Code Execution on Windows

Severity: Important

Vendor: The Apache Software Foundation

Versions Affected:
Apache Tomcat 9.0.0.M1 to 9.0.17
Apache Tomcat 8.5.0 to 8.5.39
Apache Tomcat 7.0.0 to 7.0.93

Description:
When running on Windows with enableCmdLineArguments enabled, the CGI
Servlet is vulnerable to Remote Code Execution due to a bug in the way
the JRE passes command line arguments to Windows. The CGI Servlet is
disabled by default. The CGI option enableCmdLineArguments is disabled
by default in Tomcat 9.0.x (and will be disabled by default in all
versions in response to this vulnerability). For a detailed explanation
of the JRE behaviour, see Markus Wulftange's blog [1] and this archived
MSDN blog [2].

Mitigation:
Users of affected versions should apply one of the following mitigations:
- Ensure the CGI Servlet initialisation parameter enableCmdLineArguments
    is set to false
- Upgrade to Apache Tomcat 9.0.18 or later when released
- Upgrade to Apache Tomcat 8.5.40 or later when released
- Upgrade to Apache Tomcat 7.0.93 or later when released
This announcement is being made before the releases are available as the
change to fix this issue is obviously security related.

Credit:
This issue was identified by an external security researcher and
reported to the Apache Tomcat security team via the bug bounty program
sponsored by the EU FOSSA-2 project.


jleroux: actually Tomcat 9.0.19 was released, here it is

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857588 13f79535-47bb-0310-9956-ffa450edef68
2019-04-15 14:42:44 +00:00
Jacques Le Roux 69a46f08f4 "Applied fix from trunk for revision: 1857099"
------------------------------------------------------------------------
r1857099 | jleroux | 2019-04-08 11:17:55 +0200 (lun. 08 avr. 2019) | 12 lignes

Improved: Using try-with-resources with File IO Objects.
(OFBIZ-9855)

Uses try with resources for File IO objects like ObjectInputStream and other 
objects. File classes have the AutoCloseable interface.

jleroux: this is only a part of the 2nd patch. The 1st patch will be committed
soon too...

All tests pass

Thanks: Pradhan Yash Sharma
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857487 13f79535-47bb-0310-9956-ffa450edef68
2019-04-13 17:50:42 +00:00
Jacques Le Roux bf73437f27 "Applied fix from trunk for revision: 1849165"
------------------------------------------------------------------------
r1849165 | jleroux | 2018-12-18 12:20:28 +0100 (mar. 18 déc. 2018) | 16 lignes

Fixed: Date-find error when used in two forms of a same screen
(OFBIZ-10722)

When we have more than one form, in a screen, that use a date-find field, 
the second date-find picker is not working.

To reproduce, you can add a new form with a date-find and call it below 
FindInvoices in FindInvoices screen

Then load page [https://localhost:8443/accounting/control/findInvoices] . 
You should see  that there is no picker on the second date-find

The patch adds an id that allow renderDateFindField macro script to work for 
both fields

Thanks: Leila Mekika
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857484 13f79535-47bb-0310-9956-ffa450edef68
2019-04-13 17:35:05 +00:00
Rishi Solanki c8d51cf2d6 [Fixed] Incorrect decorator being used over view all promotions and view promotion details screen causing back navigation. Change the decorator name on the showAllPromotions and showPromotionDetails screens. Now user can go back after navigating to both screens.
Merge from trunk revision 1856627.
(OFBIZ-10859)
Thanks to Ratnesh Upadhyay for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857479 13f79535-47bb-0310-9956-ffa450edef68
2019-04-13 13:22:58 +00:00
Nicolas Malin fa353ccded Fixed: Backport, Escape potential NPE when call DataEvents.serverImage by mocked request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857458 13f79535-47bb-0310-9956-ffa450edef68
2019-04-13 09:29:43 +00:00
Jacques Le Roux 134d7b31cf Fixed: ‘./gradlew generateOfbizDocumentation’ fails with Gradle 5.0
(OFBIZ-10693)

Reverts 1857431, better stay as is. It works in trunk but not here.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857432 13f79535-47bb-0310-9956-ffa450edef68
2019-04-12 20:42:38 +00:00
Jacques Le Roux 035103c3a2 Fixed: ‘./gradlew generateOfbizDocumentation’ fails with Gradle 5.0
(OFBIZ-10693)

We were still waiting for a definitive solution and fortunately it works with 
version 2.0.0 of asciidoctor-gradle-plugin

Thanks: Mathieu for discussion and Jinghai for the fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857431 13f79535-47bb-0310-9956-ffa450edef68
2019-04-12 20:16:46 +00:00
Jacques Le Roux a3b983e54c "Applied fix from trunk for revision: 1857392 "
------------------------------------------------------------------------
r1857392 | jleroux | 2019-04-12 11:29:03 +0200 (ven. 12 avr. 2019) | 14 lignes

Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

Cleans and simplifies things in UtilObject.java and also handles patterns. 
That's what we missed most when needing to update.

Fixes typos in SafeObjectInputStream class and add a commented line for a WIP in
resolveProxyClass method

Also includes work done in UtilObject.java for OFBIZ-9855 
"Using try-with-resources with File IO Objects."



------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857394 13f79535-47bb-0310-9956-ffa450edef68
2019-04-12 09:29:49 +00:00
Jacques Le Roux 96c5aef9f3 Documented:
(OFBIZ-10757)

As discussed on dev ML (https://markmail.org/message/wgy6cjzhv5auy52q) 
we need to inform users about the consequences of keeping on using Oracle Java.
We also suggest to use adoptopenjdk instead of Oracle JDK

Thanks to all who discussed on dev ML 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857381 13f79535-47bb-0310-9956-ffa450edef68
2019-04-12 08:43:01 +00:00
Jacques Le Roux a920e54f7e "Applied fix from trunk for revision: 1857213"
------------------------------------------------------------------------
r1857213 | jleroux | 2019-04-09 17:31:50 +0200 (mar. 09 avr. 2019) | 4 lignes

Fixed: Quick Add button for shopping list on Orderentry screen is not working
(OFBIZ-9908)

Fixes typos introduced with previous commit
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857215 13f79535-47bb-0310-9956-ffa450edef68
2019-04-09 15:33:07 +00:00
Jacques Le Roux 3a74ffe9f1 "Applied fix from trunk for revision: 1857180"
------------------------------------------------------------------------
r1857180 | jleroux | 2019-04-09 13:58:22 +0200 (mar. 09 avr. 2019) | 19 lignes

Fixed: Quick Add button for shopping list on Orderentry screen is not working
(OFBIZ-9908)

Steps to generate
1. Navigate to https://demo-trunk.ofbiz.apache.org/ordermgr/control/orderentry
2. Press continue on sales order screen.
3. Add any finished good product to the sales order
4. In 'Add Order Items to Shopping List' section, select 'new shopping list' 
   from the drop down and click on 'Add to shopping list' button
5. you navigate to 'addBulkToShoppingList' screen, click on 'Quick Add' button.
Issue: The quick add button is not working.

jleroux: as suggested by Ankush: "One of possible workaround is calling 
createShoppingList with new transaction to resolve this deadlock issue."

This just does that for every calls.

Thanks: Garima jain for report, Rohit Hukkeri for discussion and Ankush Upadhyay 
for fix suggestion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857182 13f79535-47bb-0310-9956-ffa450edef68
2019-04-09 12:00:01 +00:00
Jacques Le Roux 3d88ba78c5 "Applied fix from trunk for revision: 1857173 "
------------------------------------------------------------------------
r1857173 | jleroux | 2019-04-09 13:49:10 +0200 (mar. 09 avr. 2019) | 8 lignes

Fixed: Error message is displayed while click on create new quotes.
(OFBIZ-10882)

This feature has been removed with OFBIZ-10882, 

This removes the "Create New Quote" link, the redundant "Save" link (there is a 
Save button) and the OrderCreateQuoteFromShoppingList label which was only used 
there
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857176 13f79535-47bb-0310-9956-ffa450edef68
2019-04-09 11:51:39 +00:00
Jacques Le Roux c339325d30 "Applied fix from trunk for revision: 1856667 "
------------------------------------------------------------------------
r1856667 | jleroux | 2019-03-31 11:14:16 +0200 (dim. 31 mars 2019) | 10 lignes

Fixed: EmailServices.sendMail causes a NPE, when sendFrom is missing
(OFBIZ-10706)

I tried to find the history for why the service does not take the 
defaultFromEmailAddress property from general.properties and I found that It was 
last modified in revision r418498 on 02/07/2006, I think it was always broken.

This uses defaultFromEmailAddress property in sendMail if sendFrom is missing

Thanks: Benjanmin Jugl reported, Pawan Verma fixed and others for discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1856669 13f79535-47bb-0310-9956-ffa450edef68
2019-03-31 09:17:06 +00:00
Suraj Khurana beabbbd75d Applied fix from trunk for revision: 1856617
===

Fixed: Error message is populating while clicking on product barcode.
(OFBIZ-10743)
Used code128 to generate product barcode.
Thanks Ashish Sharma for reporting, everyone who participated in discussion and Pawan Verma for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1856620 13f79535-47bb-0310-9956-ffa450edef68
2019-03-30 12:46:14 +00:00
Swapnil Mane 911125af28 Applied fix from trunk for revision: 1856598
===

Fixed: Missing oldStatusId in error when no status valid change record found
(OFBIZ-10377)

In the case of entity auto service, when an invalid status change is performed, the error message doesn't show the current status of the item from which the user is changing the status.

Thanks:  Lalit Dashora for reporting the issue and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1856600 13f79535-47bb-0310-9956-ffa450edef68
2019-03-30 05:48:35 +00:00
Jacques Le Roux 362e3a27a4 "Applied fix from trunk for revision: 1856484"
------------------------------------------------------------------------
r1856484 | jleroux | 2019-03-28 16:36:13 +0100 (jeu. 28 mars 2019) | 13 lignes

Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

The white list was still not complete as reported by Ed Mack
This adds 
org.apache.ofbiz.widget.model.ModelTheme
java.util.Collections 
java.util.LinkedList 
java.util.ArrayList
java.util.TimeZonz


Thanks: Ed Mack at OFBIZ-10876
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1856486 13f79535-47bb-0310-9956-ffa450edef68
2019-03-28 15:37:09 +00:00
Jacques Le Roux 9589dfad9f "Applied fix from trunk for revision: 1856460"
------------------------------------------------------------------------
r1856460 | jleroux | 2019-03-28 09:30:21 +0100 (jeu. 28 mars 2019) | 10 lignes

Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

There was a recurring typo in previous commit.
For arrays of primitives it should be 
"\\[Z","\\[B","\\[S","\\[I","\\[J","\\[F","\\[D","\\[C"
and not 
"[Z","[B","[S","[I","[J","[F","[D","[C"
It shows how tired I'm :/

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1856462 13f79535-47bb-0310-9956-ffa450edef68
2019-03-28 08:30:59 +00:00
Jacques Le Roux 46550af3cb "Applied fix from trunk for revision: 1856455"
------------------------------------------------------------------------
r1856455 | jleroux | 2019-03-28 08:50:32 +0100 (jeu. 28 mars 2019) | 7 lignes

Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

The white list was still not complete as reported by Ed Mack
This adds all arrays of primitives and java.math.BigDecimal 

Thanks: Ed Mack at OFBIZ-10876
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1856457 13f79535-47bb-0310-9956-ffa450edef68
2019-03-28 07:52:08 +00:00
Jacques Le Roux daeab8d9b0 "Applied fix from trunk for revision: 1856405"
------------------------------------------------------------------------
r1856405 | jleroux | 2019-03-27 15:16:24 +0100 (mer. 27 mars 2019) | 12 lignes

Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

The white list was still not complete as reported by Wolfgang Rauchholz on user
ML 
This adds java.math.BigDecimal and "[B" (ie [B == byte[] and I don't understand
why in this case "byte[]" does not work)

It seems the warning in SafeObjectInputStream::resolveClass is not enough. 
Anyway I'll not change it.

Thanks: Ingo Wolfmayr at OFBIZ-10870
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1856407 13f79535-47bb-0310-9956-ffa450edef68
2019-03-27 14:25:03 +00:00
Jacques Le Roux 3244738784 Fixed: Update Tomcat to 9.0.16 due to CVE-2019-0199
(OFBIZ-10873)

The HTTP/2 implementation accepted streams with excessive numbers of
SETTINGS frames and also permitted clients to keep streams open without
reading/writing request/response data. By keeping streams open for
requests that utilised the Servlet API's blocking I/O, clients were able
to cause server-side threads to block eventually leading to thread
exhaustion and a DoS.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1856215 13f79535-47bb-0310-9956-ffa450edef68
2019-03-25 17:51:52 +00:00
Swapnil Mane abaddb9baa Applied fix from trunk for revision: 1855898
===

Improved: Moved the nodeType check after node.getTextContent() method call
(OFBIZ-10832)

Since most nodes will contain text then it will be more efficient to do a null check after retrieving nodeValue.

Thanks: Scott for your valuable inputs.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1855900 13f79535-47bb-0310-9956-ffa450edef68
2019-03-20 12:19:05 +00:00
Deepak Dixit b84008fbdf Applied fix from trunk for revision: 1855501
===

Improved: Added line separator while while generating svn/git info footer.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1855503 13f79535-47bb-0310-9956-ffa450edef68
2019-03-14 09:34:48 +00:00
Deepak Dixit beaa4b418c Applied fix from trunk for revision: 1855497
===

Reverted: Changes done at r#1854306, Removed the extra space from CommonBranch uiLabel values


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1855499 13f79535-47bb-0310-9956-ffa450edef68
2019-03-14 09:28:03 +00:00
Jacques Le Roux e4d53d9184 "Applied fix from trunk for revision: 1855492"
------------------------------------------------------------------------
r1855492 | jleroux | 2019-03-14 09:28:27 +0100 (jeu. 14 mars 2019) | 11 lignes

Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

The white list was still not complete as reported by Wolfgang Rauchholz on user
ML 
This adds java.util.Date

It seems the warning in SafeObjectInputStream::resolveClass is not enough. 
Anyway I'll not change it.

Thanks: Wolfgang Rauchholz
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1855494 13f79535-47bb-0310-9956-ffa450edef68
2019-03-14 08:28:49 +00:00
Jacques Le Roux 5cd62a82b8 "Applied fix from trunk for revision: 1855488"
------------------------------------------------------------------------
r1855488 | jleroux | 2019-03-14 08:42:17 +0100 (jeu. 14 mars 2019) | 11 lignes

Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

The white list was still not complete as reported by Wolfgang Rauchholz on user
ML 
This adds java.sql.Timestamp

It seems the warning in SafeObjectInputStream::resolveClass is not enough. 
Anyway I'll not change it.

Thanks: Wolfgang Rauchholz
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1855490 13f79535-47bb-0310-9956-ffa450edef68
2019-03-14 07:43:18 +00:00
Swapnil Mane f958cc6cdd Applied fix from trunk for revision: 1855403
===

Fixed: simpleTypeConvert always returns Null for Document, Document Type and Notation Node 
(OFBIZ-10832)

As per the code, getTextContent() method is used get text content of the node and its descendants but the node.getTextContent() always return Null for the following Node type
DOCUMENT_NODE, DOCUMENT_TYPE_NODE, NOTATION_NODE [1]

Since we can't get the text value of Document, Document Type and Notation Node, thus simply return the same object.

[1] https://docs.oracle.com/javase/7/docs/api/org/w3c/dom/Node.html#getTextContent()

Thanks: Deepak Dixit for reviewing the code.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1855410 13f79535-47bb-0310-9956-ffa450edef68
2019-03-13 12:39:06 +00:00
Jacques Le Roux 4d3bef9c25 "Applied fix from trunk for revision: 1855371"
------------------------------------------------------------------------
r1855371 | jleroux | 2019-03-13 09:19:32 +0100 (mer. 13 mars 2019) | 10 lignes

Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

The white list was still not complete as reported by Deepak at OFBIZ-10837
This adds sun.util.calendar.ZoneInfo

It seems the warning in SafeObjectInputStream::resolveClass is not enough. 
Anyway I'll not change it.

Thanks: Deepak Dexit
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1855373 13f79535-47bb-0310-9956-ffa450edef68
2019-03-13 08:20:04 +00:00
Jacques Le Roux d55a0a9676 "Applied fix from trunk for revision: 1855287"
------------------------------------------------------------------------
r1855287 | jleroux | 2019-03-12 09:29:37 +0100 (mar. 12 mars 2019) | 10 lignes

Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

The white list was still not complete as reported by Rohit at OFBIZ-10573
This adds FlexibleStringExpander

It seems the warning in SafeObjectInputStream::resolveClass is not enough. 
Anyway I'll not change it.

Thanks: Rohit Koushal
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1855289 13f79535-47bb-0310-9956-ffa450edef68
2019-03-12 08:30:04 +00:00
Suraj Khurana 460b7d1aa9 Applied fix from trunk for revision: 1855078
===

Fixed: Service failed to mark expired authorized payments of Authorize.net as void.
(OFBIZ-10727)
Thanks Amit Gadaley for reporting the issue and providing the patch, thanks Jacopo for discussion and feedback.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1855079 13f79535-47bb-0310-9956-ffa450edef68
2019-03-09 05:27:51 +00:00
Jacques Le Roux ea8ababf42 "Applied fix from trunk for revision: 1854457"
------------------------------------------------------------------------
r1854457 | jleroux | 2019-02-27 14:01:59 +0100 (mer. 27 févr. 2019) | 9 lignes

Fixed: No userLogin given in calculateProductPrice service call context
(OFBIZ-10842)

The call context for calculateProductPrice doesn't contain the userLogin
This is needed in the customPriceCalcService
So currently there's no chance to get the user information in a custom price 
calc service.

Thanks: Danny Trunk for the proposition (I changed the code myself)
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1854459 13f79535-47bb-0310-9956-ffa450edef68
2019-02-27 13:08:25 +00:00
Jacques Le Roux 4f1fc43856 "Applied fix from trunk for revision: 1854306"
------------------------------------------------------------------------
r1854306 | jleroux | 2019-02-25 11:33:53 +0100 (lun. 25 févr. 2019) | 6 lignes

Improved: no functional change

A missing space before CommonBranch label made the word trunkbranch instead of
trunk branch.

I'll backport this
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1854308 13f79535-47bb-0310-9956-ffa450edef68
2019-02-25 10:40:48 +00:00
Jacques Le Roux 19eb89fb1b "Applied fix from trunk for revision: 1853750 "
------------------------------------------------------------------------
r1853750 | jleroux | 2019-02-17 13:46:56 +0100 (dim. 17 févr. 2019) | 15 lignes

Fixed: Add To Order button not working on shopping list screen
(OFBIZ-10836)
Steps to generate:

1.Navigate to https://demo-trunk.ofbiz.apache.org/ordermgr/control/orderentry
2.Add any finished good to the order.
3.Select New Shopping List from Add Order Items To Shopping List section.
4.Click on Add To Shopping List.
5.Now Click on Add To Order button ahead of any product in that shopping list.
6.Error message displays on the screen

Thanks: Rohit Hukkeri

jleroux: note that there is another issue popping up when testing this issue.
It's related with  OFBIZ-10418 and maybe OFBIZ-5157
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1853752 13f79535-47bb-0310-9956-ffa450edef68
2019-02-17 12:48:05 +00:00
Jacques Le Roux 5a558c85d4 "Applied fix from trunk for revision: 1853745 "
------------------------------------------------------------------------
r1853745 | jleroux | 2019-02-17 13:38:06 +0100 (dim. 17 févr. 2019) | 8 lignes

Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

The white list I used was not complete.
This adds "java.util.HashMap", "Boolean", "Number", "Integer" which are the ones
missing I found so far. 
Maybe other classes could still miss OOTB. So I added a warning in 
SafeObjectInputStream::resolveClass
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1853747 13f79535-47bb-0310-9956-ffa450edef68
2019-02-17 12:39:57 +00:00
Jacques Le Roux 224a68f063 "Applied fix from trunk for revision: 1853691 "
------------------------------------------------------------------------
r1853691 | jleroux | 2019-02-16 10:42:03 +0100 (sam. 16 févr. 2019) | 9 lignes

Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

As reported by FindBugs and Sonar, it's troubling (a Bad practice in Sonar[1], 
a code smell in Findbugs[2]) when extending to use the same name than the 
extended Object

[1] https://sbforge.org/sonar/rules/show/findbugs:NM_SAME_SIMPLE_NAME_AS_SUPERCLASS?layout=false
[2] https://logging.apache.org/log4j/log4j-2.2/log4j-jul/findbugs.html
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1853694 13f79535-47bb-0310-9956-ffa450edef68
2019-02-16 09:46:03 +00:00
Swapnil Mane 97baf0ab58 Applied fix from trunk for revision: 1853109
===

Improved: Made the ecomThemeId field optional, since it is not the part of PK 
(OFBIZ-10567)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1853112 13f79535-47bb-0310-9956-ffa450edef68
2019-02-07 04:21:14 +00:00
Jacques Le Roux 073ea9d7a8 "Applied fix from trunk for revision: 1853070"
------------------------------------------------------------------------
r1853070 | jleroux | 2019-02-06 13:52:20 +0100 (mer. 06 févr. 2019) | 13 lignes

Fixed: URL not encoding in FTL 
(OFBIZ-10816)

I have created Product as TEST#01 in demo site and attached the Same to category 
101. In the category master searched for category 101 went to product tab, when 
I am trying to open a product master, link is generated like and asking for 
creating new product. But in product search and menu click is working fine 
problem is from ftl url are not getting encoded...Don`t know whats happening on 
FTL printing.... 

jleroux: fixes also catalog/control/EditProduct?productId=test%2301 (for test#1)

Thanks: Murugeswari for report and Pawan Verma for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1853074 13f79535-47bb-0310-9956-ffa450edef68
2019-02-06 12:53:58 +00:00
Deepak Dixit 281a3c74ce Applied fix from trunk for revision: 1852818
===

Fixed: Html escaping missing for portalPageId parameter of Help button
(OFBIZ-10828)
 Thanks, Niels Heinen of the Google security team for reporting the issue. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1852820 13f79535-47bb-0310-9956-ffa450edef68
2019-02-03 09:38:03 +00:00
Arun Patidar b565513d87 Applied fix from trunk for revision: 1852587
===

Fixed: Services of EntitySync Push and Pull functionalities
(OFBIZ-10818)

Set transaction timeout of 2hrs for the actual data transmission services.
Removed unwanted service updateEntitySyncRunning
Called the tracking and status update services in new transaction so that record can be maintain after current transaction rollback


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1852684 13f79535-47bb-0310-9956-ffa450edef68
2019-02-01 09:09:43 +00:00
Nicolas Malin 1036f65934 Fixed: Disable widget verbose property on context doesn't works for rendering ftl template
Backport from trunk

When OFBiz render a platform specific with a ftl template file, the widget verbosity throw function ModelWidget.widgetBoundary() was called with parameters as context. However this function control if a parameters is already present, so if you set a context.widgetVerbose = false, it was ignored and widget verbosity was present for ftl rendering. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1852575 13f79535-47bb-0310-9956-ffa450edef68
2019-01-31 07:51:20 +00:00
Deepak Dixit 0fb3d533a6 Manually applied fix from trunk for revision: 1852503
===
Fixed: Upgrade Apache Tika to 1.20 (CVE-2018-8017/CVE-2018-17197)
In Apache Tika 1.2 to 1.18, a carefully crafted file can trigger an infinite loop in the IptcAnpaParser. 
A carefully crafted or corrupt sqlite file can cause an infinite loop in Apache Tika's SQLite3Parser in versions 1.8-1.19.1 of Apache Tika. 
===


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1852517 13f79535-47bb-0310-9956-ffa450edef68
2019-01-30 11:32:51 +00:00
Deepak Dixit 631abf1f3d Applied fix from trunk for revision: 1813640
============
Fixed: Corrected wrong import introduced in 1813640.

Thanks Scott Gray for reporting.

============


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1852508 13f79535-47bb-0310-9956-ffa450edef68
2019-01-30 09:13:20 +00:00
Deepak Dixit b552ddbc29 Applied fix from trunk for revision: 1813640
============
Fixed: Corrected wrong import introduced in 1813640.

Thanks Scott Gray for reporting.

============


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1852507 13f79535-47bb-0310-9956-ffa450edef68
2019-01-30 09:12:04 +00:00
Jacques Le Roux b27ded6971 "Applied fix from trunk for revision: 1851998"
------------------------------------------------------------------------
r1851998 | jleroux | 2019-01-24 09:17:38 +0100 (jeu. 24 janv. 2019) | 11 lignes

Fixed: Impossible secure and autologin cookie names when mountpoint contains a 
slash inside its name
(OFBIZ-10766)

Deepak Nigam reported on dev ML:
When there is one web app with the empty mount point (i.e. deployed on root), 
the auto-login cookie will not work for that particular webapp due to the change 
in the path of the cookie from "/" to "/" + applicationName. Because the system 
will try to find the cookie at the "/" but it is actually at "/" + applicationName.

Thanks Deepak for report
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1852000 13f79535-47bb-0310-9956-ffa450edef68
2019-01-24 08:19:56 +00:00
Arun Patidar b887dff7cd Applied fix from trunk for revision: 1851805
===

Fixed: EntitySync Push and Pull functionalities
(OFBIZ-10818)

Removed unneccessary service implementation and used entity-auto
Fixed some create/update code block in the flow


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851812 13f79535-47bb-0310-9956-ffa450edef68
2019-01-22 13:14:49 +00:00
Paul Foxworthy 57ea5b8878 Fixed: In packing, only use reservations with stock on hand
(OFBIZ-9677)

During packing, OFBiz looks for reservations (OrderItemShipGrpInvRes)
for the order item. Some reservations are for back ordered items not on hand.
These reservations should not be used during packing, but they are.

Fixed bug in r1850914 when a single reservation's quantity exactly matches
the quantity to pack.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851359 13f79535-47bb-0310-9956-ffa450edef68
2019-01-15 14:09:16 +00:00
Jacques Le Roux e9a3dd7ea2 "Applied fix from trunk for revision: 1851350"
------------------------------------------------------------------------
r1851350 | jleroux | 2019-01-15 14:48:33 +0100 (mar. 15 janv. 2019) | 7 lignes

Fixed: Correct behaviour of Autologin cookies
(OFBIZ-10635)

As reported by Deepak Nigam on dev ML there was a risk of NPE with userLogin w/
my last commit at r1851074  

Thanks Deepak for the report and proposed fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851352 13f79535-47bb-0310-9956-ffa450edef68
2019-01-15 13:48:58 +00:00
Jacques Le Roux bdd64b1433 "Applied fix from trunk for revision: 1851319"
------------------------------------------------------------------------
r1851319 | jleroux | 2019-01-15 08:43:36 +0100 (mar. 15 janv. 2019) | 12 lignes

Fixed: partyId misses in EditEftAccount.ftl (party) when you create an EFT 
account from the quick finalize page
(OFBIZ-10680)

If you split the payment and want to create an EFT account you get an error in 
EditEftAccount.ftl (party) at line 40 colum 50: the partyId is missing.

Adds the patch to add the partyId field that was missing while creating an EFT 
account or credit card in split payment mode. Added proper checks to avoid the 
broken screen in case the parameter is missing.

Thanks: Ankit Joshi for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851321 13f79535-47bb-0310-9956-ffa450edef68
2019-01-15 07:44:33 +00:00
Michael Brohl 0627b5873c Fixed: Blank page is displayed on ecommerce
(OFBIZ-10741)

Fixed recursions in hashCode methods introduced wth OFBIZ-9774.

Thanks Arpit Mor for reporting, Jacques Le Roux amd Priya Sharma for
review and helpful hints.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851258 13f79535-47bb-0310-9956-ffa450edef68
2019-01-14 14:32:22 +00:00
Jacques Le Roux 12292fb990 "Applied fix from trunk for revision: 1851247"
------------------------------------------------------------------------
r1851247 | jleroux | 2019-01-14 14:53:18 +0100 (lun. 14 janv. 2019) | 13 lignes

Fixed: User's name is displayed on ecommerce even after user logs out
(OFBIZ-10666)

On further investigation, I found that cookie path and domain are different 
in the methods of creating the auto-login cookie i.e. LoginWorker.autoLoginSet() 
and removing the auto-login cookie i.e. LoginWorker.autoLoginRemove().

After following changes the issue seems to be fixed:
1. Removed getMaxAge() check from the condition used in 
   LoginWorker.getAutoUserLoginId() method.
2. Corrected the path and domain in the method LoginWorker.autoLoginRemove().

Thanks: Deepak Nigam for discussion and fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851249 13f79535-47bb-0310-9956-ffa450edef68
2019-01-14 13:54:42 +00:00
Jacques Le Roux cc97e3b633 "Applied fix from trunk for revision: 1851200"
------------------------------------------------------------------------
r1851200 | jleroux | 2019-01-13 14:31:13 +0100 (dim. 13 janv. 2019) | 11 lignes

Reverted: Impossible secure and autologin cookie names when mountpoint contains 
a slash inside its name
(OFBIZ-10766)

In my previous commit I reverted the initial change. As I said in the Jira
I had a second look and it's better to fix the problem at the root as I did 
initially. 

I wrote in my previous commit: "This method is used in other places where the 
name should not be changed." I checked there are no issues changing slashes to
underscores in the cookies names anywhere.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851203 13f79535-47bb-0310-9956-ffa450edef68
2019-01-13 13:43:44 +00:00
Jacques Le Roux d6218b293d "Applied fix from trunk for revision: 1850914"
------------------------------------------------------------------------
r1850914 | paulfoxworthy | 2019-01-10 04:32:33 +0100 (jeu. 10 janv. 2019) | 7 lignes

Fixed: In packing, only use reservations with stock on hand
(OFBIZ-9677)

During packing, OFBiz looks for reservations (OrderItemShipGrpInvRes)
for the order item. Some reservations are for back ordered items not on hand.
These reservations should not be used during packing, but they are.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851164 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 12:57:57 +00:00
Michael Brohl 9b1a54fefb Applied fix from trunk for revision: 1851158
===

Fixed: Errors and warnings in webtools' ArtifactInfo
(OFBIZ-10760)

This fixes an engine declaration mistake introduced in OFBIZ-9111, 
removes an unused service which should have been deleted in OFBIZ-8722
and removes unused services which should have been deleted in 
OFBIZ-10146.

Thanks Mathieu Lirzin for reporting and providing the patches.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851160 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 11:28:43 +00:00
Ashish Vijaywargiya 3dac28dbc5 Applied fix from trunk for revision: 1851147
===========================
Fixed:Product tags section displays 'Update' button, despite of having no results 
(OFBIZ-9642)
Thanks Jagpreet for reporting and Anushi for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851150 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 08:25:07 +00:00
Suraj Khurana a691af5e66 Applied fix from trunk for revision: 1851130
===

Fixed:Invoice date is not displayed on findInvoice screen.
(OFBIZ-10620)
When an invoice is created, current date is set as invoice date which can be viewed on FindInvoice screen, it was not rendering due to incorrect xml tag used.
Thanks Arpit Mor for reporting and Deepak Nigam for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851132 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 05:34:42 +00:00
Jacques Le Roux 826977b857 "Applied fix from trunk for revision: 1851074 "
------------------------------------------------------------------------
r1851074 | jleroux | 2019-01-11 17:26:13 +0100 (ven. 11 janv. 2019) | 17 lignes

Fixed: Correct behaviour of Autologin cookies
(OFBIZ-10635)

In the method to set the autoLogin cookie, LoginWorker::autoLoginSet,
system fetches the webAppInfo by using the
method ComponentConfig::getWebappInfo. In this method, serverId and
applicationName are passed as arguments.

*WebappInfo webappInfo = ComponentConfig.getWebappInfo((String)
context.getAttribute("_serverId"), UtilHttp.getApplicationName(request));*

If the mount-point of the web app is set as an empty string, then 'root'
will be used as the application name, due to which the object webAppInfo
will come null. If the webAppInfo is null then the autoLogin cookie will
not be created and added to the response object by the system.

Thanks: Aditya for report and Mathieu Lirzin for discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851076 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 16:27:11 +00:00
Jacques Le Roux c69fa05bd1 "Applied fix from trunk for revision: 1851068 "
------------------------------------------------------------------------
r1851068 | jleroux | 2019-01-11 17:12:01 +0100 (ven. 11 janv. 2019) | 12 lignes

Fixed: Add session tracking mode and make cookie secure
(OFBIZ-6655)

Following "Session timeout for webapps" discussion on dev ML 
https://markmail.org/message/p6fbiojjrwb2ybxd

We decided to put back the session-timeout value in web.xml files and to remove
the line
    session.setMaxInactiveInterval(60*60); //in seconds
from ControlEventListener.java

Thanks: Deepak Nigam for report and Girish Vasmatkar for discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851071 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 16:13:29 +00:00
Deepak Dixit a45169ebd8 Applied fix from trunk for revision: 1851006
===

Fixed: Page dropdown list on categorydetail page broken
(OFBIZ-10787)
Thanks Sebastian Wachinger for reporting the issue.
Corrected the condition to display pagination options for ordermgr template as well.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1851008 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 06:09:35 +00:00
Michael Brohl 110d13a4ea Applied fix from trunk for revision: 1850953
===

Fixed: Failed registration for virtual hosts with similar mount points
(OFBIZ-10765)

The name is now registered with the webbapp name prior to the context.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1850955 13f79535-47bb-0310-9956-ffa450edef68
2019-01-10 16:08:19 +00:00
Michael Brohl d2a3d710d7 Applied fix from trunk for revision: 1850948
===

Improved: Wrong German translation in PartyUiLabels
(OFBIZ-10786)

Thanks Dennis Balkir for reporting and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1850949 13f79535-47bb-0310-9956-ffa450edef68
2019-01-10 15:54:30 +00:00
Deepak Dixit 1d90a487a2 Applied fix from trunk for revision: 1850918
===

Fixed: Unable to add additional product images from catalog
(OFBIZ-10673)
Removed code that was unused after r1081272, as logic to prepare the fileLocation was modified at r1081272
Thanks Rohit Koushal and Ingo Wolfmayr for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1850919 13f79535-47bb-0310-9956-ffa450edef68
2019-01-10 06:08:03 +00:00
Jacques Le Roux cce92d2a46 "Applied fix from trunk for revision: 1850694"
------------------------------------------------------------------------
r1850694 | jleroux | 2019-01-07 22:58:01 +0100 (lun. 07 janv. 2019) | 13 lignes

Fixed: Correct behaviour of Autologin cookies
(OFBIZ-10635)

Michael spotted that I used "default-server" in r1845558:

Quoting him:

    It only works for webapps using "default-server". This name is configurable 
    in the ofbiz-component.xml and and should not be hard-coded in the code. 

This fixes it

Thanks: Michael Brohl
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1850696 13f79535-47bb-0310-9956-ffa450edef68
2019-01-07 21:59:34 +00:00
Jacques Le Roux 5298601fa9 "Applied fix from trunk for revision: 1850685"
------------------------------------------------------------------------
r1850685 | jleroux | 2019-01-07 21:37:10 +0100 (lun. 07 janv. 2019) | 8 lignes

Fixed: Impossible secure and autologin cookie names when mountpoint contains a 
slash inside its name
(OFBIZ-10766)

My previous commit was wrong this one fixes it.
I made a mistake trying to generalise changing UtilHttp::getApplicationName. 
This method is used in other places where the name should not be changed. 
Only cookies are concerned.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1850687 13f79535-47bb-0310-9956-ffa450edef68
2019-01-07 20:41:58 +00:00
Jacques Le Roux c0904e1cc9 "Applied fix from trunk for revision: 1850647"
------------------------------------------------------------------------
r1850647 | jleroux | 2019-01-07 15:46:50 +0100 (lun. 07 janv. 2019) | 11 lignes

Improved: Update Apache commons-fileupload to last version
(OFBIZ-10770)

Fixes CVE-2019-0189

This is an easy doing, we just need to add

    compile 'commons-fileupload:commons-fileupload:1.3-3'

to the build.gradle file.

So far the dependency was not given directly but by other dependencies

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1850649 13f79535-47bb-0310-9956-ffa450edef68
2019-01-07 14:48:20 +00:00
Jacques Le Roux 7a8e3eb583 "Applied fix from trunk for revision: 1850530"
------------------------------------------------------------------------
r1850530 | jleroux | 2019-01-06 09:40:38 +0100 (dim. 06 janv. 2019) | 8 lignes

Fixed: Impossible secure and autologin cookie names when mountpoint contains a 
slash inside its name
(OFBIZ-10766)

When you set a mountpoint which contains a slash inside its name 
(ie not only a slash as a trailer, which is possible), as it's needed with 
OFBIZ-10765, OFBiz tries to create a cookie with a slash in its name and 
that's impossible
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1850532 13f79535-47bb-0310-9956-ffa450edef68
2019-01-06 08:41:21 +00:00
Jacques Le Roux cfd88952d8 "Applied fix from trunk for revision: 1850023 "
------------------------------------------------------------------------
r1850023 | jleroux | 2018-12-31 10:09:33 +0100 (lun. 31 déc. 2018) | 12 lignes

Improved: Product Promo Worker description patch
(OFBIZ-3907)

Completes initial work from Sascha Rodekamp

Returns promoName then promoText if promoName absent then and 
"No promotion name nor text" if either are present.

We lose the information in promoText but at least it's correctly rendered in 
invoices PDF and accounting component.

Thanks: Scott for report
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1850025 13f79535-47bb-0310-9956-ffa450edef68
2018-12-31 09:10:20 +00:00
Jacques Le Roux ec763d3196 "Applied fix from trunk for revision: 1850015 "
------------------------------------------------------------------------
r1850015 | jleroux | 2018-12-31 07:38:36 +0100 (lun. 31 déc. 2018) | 16 lignes

Improved: Prepare the migration to XStream 1.5
(OFBIZ-10756)

Fixes CVE-2018-17200

We currently use the UnsupportedClassConverter method in UtilXml class. 
When the 1.5 version of XStream will be available another way to handle this 
kind of things will be available and used by default. It's already possible to 
use the same with the 1.4 version of XStream with its setupDefaultSecurity method.

So this replaces the UnsupportedClassConverter in UtilXml class by 
XStream::setupDefaultSecurity method.

It's an improvement but better to backport it as much as possible

The UtilXmlTests class and its use is removed and the UnsupportedClassConverter 
method deprecated (no use OOTB)


------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1850016 13f79535-47bb-0310-9956-ffa450edef68
2018-12-31 06:39:23 +00:00
Jacques Le Roux 6df5f511e8 "Applied fix from trunk for revision: 1849693 "
------------------------------------------------------------------------
r1849693 | jleroux | 2018-12-24 15:57:08 +0100 (lun. 24 déc. 2018) | 13 lignes

Fixed: Having condition is ignored on queryList() and queryFirst() calls in 
EntityQuery
(OFBIZ-9890)

queryList() and queryFirst() both call internal private query() method. 
This method calls delegator.findList if a normal Entity/ViewEntity is used 
(not a DVE). 

DVE has no option to include a having condition and so must opt to use 
queryIterator(). Even queryCount() can use a having condition.

Thanks: Rupert Howell and Gareth Carter for report,  Prakhar Kumar for discussion
 and Gareth Carter for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849694 13f79535-47bb-0310-9956-ffa450edef68
2018-12-24 14:58:24 +00:00
Jacques Le Roux 62233b8f7f "Applied fix from trunk for revision: 1849567"
------------------------------------------------------------------------
r1849567 | jleroux | 2018-12-22 20:18:49 +0100 (sam. 22 déc. 2018) | 10 lignes

Fixed: Dependent dropdowns should be used in createPostalAddress and 
Set Billing screens of ordermgr.
(OFBIZ-10681)

If you create an EFT account from the quick finalyse page, at 
ordermgr/control/createPostalAddress the US states which are proposed by default 
are not the US states but all states. 
You still can pick one US state, but it's counter intuitive.

Thanks: Aman Mishra for the fix and finding of Set Billing screen
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849569 13f79535-47bb-0310-9956-ffa450edef68
2018-12-22 19:23:43 +00:00
Akash Jain d788a1b6a3 Fixed: Date format does not change on change of locale.
(OFBIZ-10736)
Length of date in any formate will always be 10 (2(DD)+1(/)+2(MM)+1(/)+4(YYYY))
Thanks, Aditi Patidar for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849543 13f79535-47bb-0310-9956-ffa450edef68
2018-12-22 11:40:38 +00:00
Akash Jain 2dcfa46773 Applied fix from trunk for revision: 1849528
===

Fixed: The child event added is not listed in the Child Work Efforts. While if we add an existing event it is listed in the WorkEffort component, applied patch from jira issue (OFBIZ-10111)
Thanks, Rubia Elza Joshep and Pradeep Choudhary for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849529 13f79535-47bb-0310-9956-ffa450edef68
2018-12-22 09:23:58 +00:00
Suraj Khurana f1e833ea23 Fixed: Wrong title in table header of Config Option List.
(OFBIZ-10713)
Thanks Sebastian Wachinger for reporting and Anushi Gupta for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849523 13f79535-47bb-0310-9956-ffa450edef68
2018-12-22 07:05:40 +00:00
Suraj Khurana e5ab43d483 Fixed: Classification group filter not working on find party screen.
(OFBIZ-10580)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849519 13f79535-47bb-0310-9956-ffa450edef68
2018-12-22 05:45:58 +00:00
Suraj Khurana d7df6e5cae Fixed: Incorrect PartyContactMechPurpose created while calling createUpdateBillingAddress service.
(OFBIZ-10588)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849515 13f79535-47bb-0310-9956-ffa450edef68
2018-12-22 05:00:31 +00:00
Deepak Dixit ca74b49697 Applied fix from trunk for revision: 1826780
===

Improved: no functional change removes a duplicate getAssociatedStateList 
request map already present in the common-controller.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849469 13f79535-47bb-0310-9956-ffa450edef68
2018-12-21 12:51:52 +00:00
Deepak Dixit d6a20ccebe Applied fix from trunk for revision: 1849467
===

Removed: Duplicate request getAssociatedStateList, committed at r#1848469. We have getAssociatedStateList request in common-controller and common-controller included in humanres controller.xml.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849468 13f79535-47bb-0310-9956-ffa450edef68
2018-12-21 12:49:54 +00:00
Deepak Dixit 057567e23a Applied fix from trunk for revision: 1819947
===

Reverted: Revision #1816270 not able to add a option with empty key in drop-down, (OFBIZ-9759)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849291 13f79535-47bb-0310-9956-ffa450edef68
2018-12-19 11:34:01 +00:00
Aditya Sharma e5f863e422 Applied fix from trunk for revision: 1849275
===

Improved: Remove all the fk dependencies from stats entities to the business entities
(OFBIZ-10721)
stats related entities foreign key relation has been removed by Jacopo at r#1647271 and new group org.apache.ofbiz.stats introduced for stats related entity. Some remnants were still left in stats entities. 
Removed relations of Party, ContactMech and Content from ServerHit entity.
Removed relations of Content from ServerHitBin entity.
Removed relations of UserLogin from Visitor entity.
Thanks Jacques Le Roux and Deepak Dixit for the review.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849288 13f79535-47bb-0310-9956-ffa450edef68
2018-12-19 10:33:30 +00:00
Deepak Dixit 4b86c4d0b3 Applied fix from trunk for revision: 1849191
===

Improved: EntityUtilProperties.getProperties method should use cache.
(OFBIZ-10717)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849197 13f79535-47bb-0310-9956-ffa450edef68
2018-12-18 17:12:08 +00:00
Deepak Dixit 8e7b288ebe Applied fix from trunk for revision: 1849193
===

Fixed: Inconsistent behaviour of ServiceDispatcher.checkAuth 
(OFBIZ-10712)


We have checkAuth method in service dispatcher class, this method performs multiple auth related check.

if all checks passed it call the modelService.makeValid method to prepare service context (line#960) but this code executed only when service definition has a permission service call.

If service does not have any permission service call then it does not call the modelService.makeValid and this may cause the service validation issue unknown parameter found.

Ideally modelService.makeValid should call irrespective to permission service check.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849194 13f79535-47bb-0310-9956-ffa450edef68
2018-12-18 16:48:10 +00:00
Deepak Dixit 06e7bff4f3 Applied fix from trunk for revision: 1849021
===

Improved: request map to create party content in controller.xml exists twice
(OFBIZ-10699)
Renamed ambiguous controller request CreatePartyContent to EditPartyContent as per OOTB pattern.
Thanks Pierre Smits for reporting the issue and Jacques Le Roux for the the details and discussion


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849022 13f79535-47bb-0310-9956-ffa450edef68
2018-12-16 11:38:42 +00:00
Jacques Le Roux 729bab1c7b "Applied fix from trunk for revision: 1848849"
------------------------------------------------------------------------
r1848849 | jleroux | 2018-12-13 15:39:17 +0100 (jeu. 13 déc. 2018) | 5 lignes

Improved: Plugins Asciidoc documentation must be standalone
(OFBIZ-10658)

Use ":toclevels: 3" after discussion ion dev ML

Thanks to all who participated
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848853 13f79535-47bb-0310-9956-ffa450edef68
2018-12-13 14:54:09 +00:00
Jacques Le Roux 62d16c2b5b "Applied fix from trunk for revision: 1848850"
------------------------------------------------------------------------
r1848850 | jleroux | 2018-12-13 15:52:12 +0100 (jeu. 13 déc. 2018) | 9 lignes

Fixed: ‘./gradlew generateOfbizDocumentation’ fails with Gradle 5.0
(OFBIZ-10693)

Downgrades AsciiDoc Gradle Plugin 1.5.9.1 to 1.5.8.1 to fix the issue. 
I have deduced from the stacktrace that the 
org.asciidoctor.gradle.backported.AsciidoctorJavaExec class was causing the 
issue and since it was introduced in 1.5.9 as stated in the comment at the 
top of its source file I have tried the latest version before this release.

Thanks: Mathieu for the fix and Jinghai for discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848851 13f79535-47bb-0310-9956-ffa450edef68
2018-12-13 14:53:01 +00:00
Jacques Le Roux 5283ed488a "Applied fix from trunk for revision: 1848745 "
------------------------------------------------------------------------
r1848745 | jleroux | 2018-12-12 12:41:25 +0100 (mer. 12 déc. 2018) | 6 lignes

Improved: Convert Minilang to Groovy Guide into asciidoc 
(OFBIZ-10300)

Convert Dennis Balkirs Minilang to Groovy Guide into AsciiDoc.

Thanks: Benjamin Jugl
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848746 13f79535-47bb-0310-9956-ffa450edef68
2018-12-12 11:42:46 +00:00
Michael Brohl 7b791f22f6 Applied fix from trunk for revision: 1848469
===

Improved: Implement dependency from "State/Province" Field to "Country" 
in New Employee Form.
(OFBIZ-10326)

Thanks Benjamin Jugl and Julian Leichert for reporting and providing 
the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848472 13f79535-47bb-0310-9956-ffa450edef68
2018-12-08 13:46:02 +00:00
Michael Brohl 346f618c57 Applied fix from trunk for revision: 1848467
===

Improved: ControlEventListener - Change Log-Level
(OFBIZ-10330)

The Log-Level of the Message "Could not find visit value object in 
session..." is changed from "warning" to "info".

Thanks Benjamin Jugl for reporting and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848468 13f79535-47bb-0310-9956-ffa450edef68
2018-12-08 12:53:09 +00:00
Michael Brohl 8336ac5795 Applied fix from trunk for revision: 1848449
===

Seed data sequence bug regarding "MIDNIGHT_DAILY" TemporalExpression.
(OFBIZ-10533)

The TemporalExpression for "MIDNIGHT_DAILY" has to be loaded as seed 
data instead of initial-seed data to be available for other seed-initial
usages of this TemporalExpression.
The fix moves this TemporalExpression to the other TemporalExpression 
seed data in ServiceSeedData.xml.

Thanks Martin Becker for reporting and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848450 13f79535-47bb-0310-9956-ffa450edef68
2018-12-08 09:50:15 +00:00
Michael Brohl 6fa22aa6cc Applied fix from trunk for revision: 1848447
===

Fallthrough in switch-case of eway/GatewayResponse.java
(OFBIZ-10642)

There were breaks missing in the switch case.

Thanks Benjamin Jugl for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848448 13f79535-47bb-0310-9956-ffa450edef68
2018-12-08 09:41:42 +00:00
Michael Brohl 3d0ade3001 Applied fix from trunk for revision: 1848444
===

Fixed: Missing nullcheck in service createContactListParty.
(OFBIZ-10653)

This fix adds a nullcheck for the partyEmail and provides a better 
errorMessage for the in-request service call. In addition the failing 
partyID will be logged for the admin to see.

Thanks Dennis Balkir for reporting and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848445 13f79535-47bb-0310-9956-ffa450edef68
2018-12-08 09:28:55 +00:00
Michael Brohl e483e37a7a Applied fix from trunk for revision: 1848441
===

Fixed: UI bug in scrum component
(OFBIZ-10676)

When editing product backlog items, inserted javascript code was
executed on the client side. The confirmational blinking of the newly 
added or changed value was implemented using the .html(value) function 
of jQuery. This causes the html to be interpreted and the script to be
executed. But the data is stored, converting it into html, so not 
considered to be a vulnerability.
The fix changes the call to .text. This prevents the html to be 
interpreted.

Thanks Benjamin Jugl for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848442 13f79535-47bb-0310-9956-ffa450edef68
2018-12-08 08:58:52 +00:00
Michael Brohl 5e026126c6 Fixed: Update and fix openstreetmap.org integration.
(OFBIZ-10553)

Manual backport because of the renamed paths.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848436 13f79535-47bb-0310-9956-ffa450edef68
2018-12-08 08:05:52 +00:00
Jacques Le Roux 9e831df166 "Applied fix from trunk for revision: 1848398 "
------------------------------------------------------------------------
r1848398 | jleroux | 2018-12-07 14:14:48 +0100 (ven. 07 déc. 2018) | 17 lignes

Fixed: User's name is displayed on ecommerce even after user logs out
(OFBIZ-10666)

Steps to regenerate:
Open URL: https://demo-trunk.ofbiz.apache.org/ecommerce/control/main. 
  Welcome is displayed and user's name is not displayed when URL is opened.
Login at ecommerce, username will be displayed after user logs in.
Logout of ecommerce by clicking on logout. User will be logged out and login 
  link will be displayed in place of logout link, but the name of user is still 
  displayed.

Actual: Username is still displayed after user logs out
Expected: Username should not be displayed after the user logs out

Note: Similar issue also exists when the user clicks on (Not You?) link.

Thanks: Arpit Mor for detailled report, Deepak Dixit for discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848399 13f79535-47bb-0310-9956-ffa450edef68
2018-12-07 13:16:46 +00:00
Jacques Le Roux 8aa4a5d85f "Applied fix from trunk for revision: 1848386 "
------------------------------------------------------------------------
r1848386 | jleroux | 2018-12-07 10:30:28 +0100 (ven. 07 déc. 2018) | 5 lignes

Fixed: Standalone Asciidoc plugins documents can't render logo correctly in PDF
(OFBIZ-10677)

Modifies the generatePluginDocumentation and generateAllPluginsDocumentation 
tasks by temporary copying the OFBiz-Logo.svg in plugin/s
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848387 13f79535-47bb-0310-9956-ffa450edef68
2018-12-07 09:30:55 +00:00
Jacques Le Roux 4a0e1cae4e "Applied fix from trunk for revision: 1848336 "
------------------------------------------------------------------------
r1848336 | jleroux | 2018-12-06 17:15:54 +0100 (jeu. 06 déc. 2018) | 7 lignes

Fixed: ConcurrentModificationException in ShoppingCart.cleanUpShipGroups
(OFBIZ-10696)

There's a for-loop over shipInfo and a call to clear inside this loop which 
leads to a ConcurrentModificationException

Thanks: Danny Trunk
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848337 13f79535-47bb-0310-9956-ffa450edef68
2018-12-06 16:16:38 +00:00
Jacques Le Roux 9a17edc2e3 "Applied fix from trunk for revision: 1848263 "
------------------------------------------------------------------------
r1848263 | jleroux | 2018-12-06 08:24:13 +0100 (jeu. 06 déc. 2018) | 13 lignes

Fixed: Error on createShoppingListItem when adding item to cart as anonymous
(OFBIZ-5157)

It can be reproduced by setting the product_store field autoSaveCart to 'Y' 
(In Store 9000 for the demo-data). Then the error occurs upon the first visit of 
the ecommerce-site, provided the user is not logged in.

    First Visit: no userLogin
    OFBiz wants to autosave list
    saving list requires userLogin (forsecuritycheck)
    result: error

Thanks: Mirko Vogelsmeier for report, Benjamin Jugl for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1848266 13f79535-47bb-0310-9956-ffa450edef68
2018-12-06 07:50:22 +00:00
Jacques Le Roux 512560e335 "Applied fix from trunk for revision: 1847478"
------------------------------------------------------------------------
r1847478 | jleroux | 2018-11-26 17:41:52 +0100 (lun. 26 nov. 2018) | 21 lignes

Improved: Multi Part Input Parameters not Available in Groovy Event
(OFBIZ-5048)

If a form is of type enctype="multipart/form-data" and we are handling its 
submission through Groovy Event then in the parameters Map Ofbiz does not set 
the multipart input parameters from request parameters.

The same are available when multipart form submission is handled through service.

The reason being the code that sets the multipart parameters in request 
attribute is only available in ServiceEventHandler.java and in 
GroovyEventHandler the multipart are never set.

So I have created a method getMultiPartParameterMap in the class UtilHttp.java 
and put the common logic in that method so that when getCombinedMap method is 
called from the GroovEventHandler the method also call getMultiPartParameterMap 
and in the ServiceEventHandler I have written a call for 
getMultiPartParameterMap method.

Thanks: Vikramjit Singh for report and initial patch, Rohit Koushal for updated
and revised patch with some minor changes.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1847955 13f79535-47bb-0310-9956-ffa450edef68
2018-12-02 10:36:09 +00:00
Jacques Le Roux 5afdd847c7 "Applied fix from trunk for revision: 1847890"
------------------------------------------------------------------------
r1847890 | jleroux | 2018-12-01 13:30:50 +0100 (sam. 01 déc. 2018) | 18 lignes

Fixed: Create a PoC for a documentation system for OFBiz based on Asciidoc
(OFBIZ-9873)

At r1831619 we committed a workaround to "turn off PDF in windows for now"

I have found a real solution for this bug which prevents to check PDF results in 
Windows because the PDF were not generated there.

I found this solution at 
https://github.com/asciidoctor/asciidoctorj-pdf/issues/8. 
After reading https://github.com/asciidoctor/asciidoctor-pdf/issues/850 
I checked it also works on Linux.

It uses the last version of jruby-complete.

I guess the gradle-versions-plugin should be able to warn us when an upgrade of 
jruby-complete is available like it does for junitReport.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1847892 13f79535-47bb-0310-9956-ffa450edef68
2018-12-01 12:36:27 +00:00
Jacques Le Roux 099353dd1f "Applied fix from trunk for revision: 1847715 "
------------------------------------------------------------------------
r1847715 | jleroux | 2018-11-29 14:09:53 +0100 (jeu. 29 nov. 2018) | 6 lignes

Fixed: Tax not added for order shipping or promotion
(OFBIZ-4160)

Removes AccountingTaxAuthorityCategoryAdvice and usage, now useless

Fixes possible "BigInteger divide by zero" in rateProductTaxCalc
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1847716 13f79535-47bb-0310-9956-ffa450edef68
2018-11-29 13:10:40 +00:00
Jacques Le Roux 8bff1a5720 "Applied fix from trunk for revision: 1847670 "
------------------------------------------------------------------------
r1847670 | jleroux | 2018-11-28 20:29:04 +0100 (mer. 28 nov. 2018) | 20 lignes

Fixed: Tax not added for order shipping or promotion
(OFBIZ-4160)

The r1070830 commit works fine. Except when there are shippings and promotions 
to calculate. Then the algorithm searches for all entries in 
TAX_AUTHORITY_RATE_PRODUCT that are available for the PRODUCT_STORE and 
TAX_AUTH (and apply to shipping/promotions). So all taxes (regular and reduced) 
are applied to the shipping costs, which naturally leads to a higher 
amount overall.

The correct procedure (at least in some countries in Europe) is to apply the 
tax for shipping  according to the shipped items. So, if regular tax applies 
to the good, regular tax is applied to the shipping-costs. If multiple items are 
shipped and they  have mixed taxes (some regular, some reduced) the calculation 
of the tax for shipping is weighted accordingly. 

jleroux: there are other ways to calculate VAT on shipping depending on 
countries and situations. This will be addressed by OFBIZ-10679

Thanks: Benjamin Jugl 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1847671 13f79535-47bb-0310-9956-ffa450edef68
2018-11-28 19:29:54 +00:00
Jacques Le Roux dec72028e4 "Applied fix from trunk for revision: 1847402"
------------------------------------------------------------------------
r1847402 | jleroux | 2018-11-25 10:16:28 +0100 (dim. 25 nov. 2018) | 9 lignes

Fixed: Mime Type not supported Error while generating a Composite Pdf
(OFBIZ-9840)

When generating a Composite Pdf in the Content Manager an Error occurs :
 Mime Type not Supported
 Steps to recreate the Error Message:
Content Manager->CompDoc->Tree->View Instances->Tree-> Generate Composite Pdf

Thanks: Thanks Julian Leichert for report, Aman Mishra for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1847403 13f79535-47bb-0310-9956-ffa450edef68
2018-11-25 09:25:46 +00:00
Jacques Le Roux 5075b6f85a "Applied fix from trunk for revision: 1847398 "
------------------------------------------------------------------------
r1847398 | jleroux | 2018-11-25 09:40:23 +0100 (dim. 25 nov. 2018) | 15 lignes

Fixed: Instructions for Configurable PC don't work
(OFBIZ-10542)

This concerns only R16, R17 and the trunk. The "Instructions" button was not 
present in R13.

This kind of message shows:
Trunk:
<a href="javascript:showErrorAlert('The following errors occurred','');"
R16:
<a href="javascript:showErrorAlert(" the="" following="" errors="" occurred","")

The same exists for all configurable products, notably Gold Pizza

Thanks: Priya Sharma
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1847399 13f79535-47bb-0310-9956-ffa450edef68
2018-11-25 08:41:34 +00:00
Suraj Khurana 54b0dcaf16 Fixed: Update Contact Mech ID with Billing Account not working.
> (OFBIZ-10315)
> Thanks Shikha Jaiswal for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1847361 13f79535-47bb-0310-9956-ffa450edef68
2018-11-24 12:43:28 +00:00
Suraj Khurana 11fa711dbf Fixed: Force complete Purchase Order button throws error.
> (OFBIZ-9912)
> Thanks Priya Sharma for reporting and Amit Gadaley for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1847353 13f79535-47bb-0310-9956-ffa450edef68
2018-11-24 09:52:22 +00:00
Suraj Khurana cd8459d0b3 Fixed: Typo in shipmentTypeId. It should be INCOMING_SHIPMENT instead of INGOING_SHIPMENT.
> (OFBIZ-6958)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1847339 13f79535-47bb-0310-9956-ffa450edef68
2018-11-24 06:03:57 +00:00
Jacques Le Roux ac70b60e1c Documented: Backport the Asciidoc documentation and means to generate it to
R17 branch
(OFBIZ-10657)
Convert Birt component doc from Markdown to AsciiDoc 
(OFBIZ-10647)

As discussed in https://markmail.org/message/x7sv2mpvtytr4vl4 we decided to 
backport the Asciidoc documentation, and means to generate it, to R17 branch

This is related with OFBIZ-10651 and OFBIZ-10652 tasks. 
So 2 parts are impacted: code in framework and plugins and Buildbot script. 
It's only a copy from the trunk to the R17 branch, including *.adoc files, 
related images and the build.gradle script.

I previous commit I missed to remove security-impersonation.adoc now replaced 
by sy-impersonation.adoc
Forgot to commit the plugins part. Including replacing Birt Markdown 
documentation by Asciidoc  (OFBIZ-10647)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1847253 13f79535-47bb-0310-9956-ffa450edef68
2018-11-23 12:16:52 +00:00
Jacques Le Roux fad06400e2 Documented: Backport the Asciidoc documentation and means to generate it to
R17 branch
(OFBIZ-10657)

As discussed in https://markmail.org/message/x7sv2mpvtytr4vl4 we decided to 
backport the Asciidoc documentation, and means to generate it, to R17 branch

This is related with OFBIZ-10651 and OFBIZ-10652 tasks. 
So 2 parts are impacted: code in framework and plusing and Buildbot script. 
It's only a copy from the trunk to the R17 branch, including *.adoc files, 
related images and the build.gradle script.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1847248 13f79535-47bb-0310-9956-ffa450edef68
2018-11-23 12:00:10 +00:00
Aditya Sharma 359fb39788 Applied fix from trunk for revision: 1846632
===

Fixed: Missing Security and Cache Headers in CMS Events
(OFBIZ-10597)
Instead of having multiple null checks for viewMap separately for each security header we can have a single combined null check at the top in setResponseBrowserDefaultSecurityHeaders() method.

With increasing security headers these may become expensive.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1846633 13f79535-47bb-0310-9956-ffa450edef68
2018-11-15 10:44:00 +00:00
Jacques Le Roux 2d4fa571d3 "Applied fix from trunk for revision: 1846594 "
------------------------------------------------------------------------
r1846594 | jleroux | 2018-11-14 18:31:27 +0100 (mer. 14 nov. 2018) | 17 lignes

Fixed: Manufacturing BOM search returning duplicate entries in search results
(OFBIZ-10648)

Bill of Materials search returning duplicate entries in search results.

Test Steps:
1. Login to Manufacturing application.
2. Navigate to Bill of Materials tab.
3. Observe the issue in Search results.

Expected Result:
Unique products should be displayed on Bill of Materials search results.
Actual Result:
Bill of Materials search returning duplicate entries in search results. 
The distinct constraint is missing in FindProductBom.groovy find query.

Thanks: Aditya Barve
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1846595 13f79535-47bb-0310-9956-ffa450edef68
2018-11-14 17:32:33 +00:00
Jacques Le Roux 61a2d71238 "Applied fix from trunk for revision: 1846214"
------------------------------------------------------------------------
r1846214 | jleroux | 2018-11-09 09:11:46 +0100 (ven. 09 nov. 2018) | 20 lignes

Fixed: Content - Able to add empty Forum Group
(OFBIZ-10615)

Steps to Regenerate issue:
 # Login to demo-trunk or demo-stable instance with details:
URL - [https://demo-trunk.ofbiz.apache.org/content/control/findForumGroups] 
admin/ ofbiz  OR
URl - [https://demo-stable.ofbiz.apache.org/content/control/createForumGroup]
admin/ ofbiz
 # Go to Content > Forum and try to create new forum group.
 # do not enter Forum Group Name and Description.
 # Click on the Submit button.

Actual - System allowed the user to enter an empty forum group. 
This issue is occurring at demo-trunk and demo-stable instance. 

Expected - Empty Forum group should not be added. If the user tries to do this
s/he should not be allowed and proper validation error message should display.

Thanks: Sanjay Yadav
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1846215 13f79535-47bb-0310-9956-ffa450edef68
2018-11-09 08:12:42 +00:00
Jacques Le Roux 33e6c072fd "Applied fix from trunk for revision: 1846107 "
------------------------------------------------------------------------
r1846107 | jleroux | 2018-11-08 10:17:37 +0100 (jeu. 08 nov. 2018) | 6 lignes

Fixed: Stores can't be modified at catalog/control/updateProductStore
(OFBIZ-10567)

I forgot the label, here it is.
I kept the old one, could be useful elsewhere. 
I amended the English version.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1846108 13f79535-47bb-0310-9956-ffa450edef68
2018-11-08 09:19:53 +00:00
Jacques Le Roux cbdfadfba1 "Applied fix from trunk for revision: 1846097"
------------------------------------------------------------------------
r1846097 | jleroux | 2018-11-08 08:18:43 +0100 (jeu. 08 nov. 2018) | 22 lignes

Fixed: Stores can't be modified at catalog/control/updateProductStore
(OFBIZ-10567)

This is related with the common-theme introduction.

There are 2 fields named visualThemeId in the data model. The one in 
ProductStore entity existed before the common-theme introduction with the new 
entity VisualTheme. When the theme is initialised with InitTheme.groovy it sets 
the context.visualThemeId value if it does not exist yet with 
parameters.visualThemeId. At this point things get confused and the 
backend theme used is replaced by the ecommerce theme defined for the 
productStore.

I think it would overwhelming to change the data model when only the 
EditProductStore form and updateProductStore service are concerned. 

So here is a very simple workaround where visualThemeId is replaced by 
ecomThemeId in the EditProductStore form and updateProductStore service.

If someone prefers to change the data model and related code feel free to revert, 
reopen the Jira and do.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1846098 13f79535-47bb-0310-9956-ffa450edef68
2018-11-08 07:19:20 +00:00
Jacques Le Roux 82b0fc150c "Applied fix from trunk for revision: 1845995"
------------------------------------------------------------------------
r1845995 | jleroux | 2018-11-07 10:36:50 +0100 (mer. 07 nov. 2018) | 6 lignes

Fixed: Stores can't be modified at catalog/control/updateProductStore
(OFBIZ-10567)

Removes a hidden duplicate productStoreId field introduced with  OFBIZ-6924

This does not completely fixes the issue but allow to get ahead
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1845996 13f79535-47bb-0310-9956-ffa450edef68
2018-11-07 09:37:13 +00:00
Jacques Le Roux 31c0e14f48 "Applied fix from trunk for revision: 1845933"
------------------------------------------------------------------------
r1845933 | jleroux | 2018-11-06 17:33:11 +0100 (mar. 06 nov. 2018) | 16 lignes

Fixed: Error in GetLocaleListTests.java 
(OFBIZ-10641)

A test error related to GetLocaleListTests.java seems to happen only on a fresh 
trunk install when running unit tests. It's no stopping tests. 

I'm not sure yet if R17 is concerned. I did not try, but will 1st confirm with
this commit with trunk demo error.loç

Mathieu suggested to  replace the location 
component://base/config/GroovyInit.groovy 
with ofbizhome://framework/base/config/GroovyInit.groovy
because GroovyUtil [should not] depend on the component container in the 
1st place, and it seems to work.

Thanks: Mathieu for the idea.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1845989 13f79535-47bb-0310-9956-ffa450edef68
2018-11-07 08:05:02 +00:00
Jacques Le Roux 48db7b0306 "Applied fix from trunk for revision: 1845558 "
------------------------------------------------------------------------
r1845558 | jleroux | 2018-11-02 10:46:42 +0100 (ven. 02 nov. 2018) | 15 lignes

Fixed: Correct behaviour of Autologin cookies
(OFBIZ-10635)

Renames "keep-autologin-cookie" to "use-autologin-cookie", and only create 
Autologin cookies when needed. No need to create Autologin cookies in 
applications that don't need it.

Don't pass webAppName to LoginWorker::getSecuredUserLoginId, that can be handled
with improved LoginWorker::getSecuredLoginIdCookieName

Removes LoginWorker::autoLogoutCleanCookies, no longer needed since only those
needed are created and kept (1 year at least after creation).

For both autoLogin and securedLoginId cookies sets the path to the application.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1845568 13f79535-47bb-0310-9956-ffa450edef68
2018-11-02 10:38:33 +00:00
Jacques Le Roux d4f56344e1 "Applied fix from trunk for revision: 1845552 "
------------------------------------------------------------------------
r1845552 | jleroux | 2018-11-02 09:48:31 +0100 (ven. 02 nov. 2018) | 9 lignes

Fixed: ComponentConfig::getAppBarWebInfos creates infos only for components 
without <<app-bar-display="false">>
(OFBIZ-10637)

LoginWorked::getAppBarWebInfos is used to define the apps menus in themes so we
need to also check that no menuName is passed to 
ComponentConfig::getAppBarWebInfos. Else all menus appears in the secondary menu
bars

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1845553 13f79535-47bb-0310-9956-ffa450edef68
2018-11-02 08:49:11 +00:00
Jacques Le Roux 19a3348c27 "Applied fix from trunk for revision: 1845544"
------------------------------------------------------------------------
r1845544 | jleroux | 2018-11-02 08:59:16 +0100 (ven. 02 nov. 2018) | 5 lignes

Fixed: ComponentConfig::getAppBarWebInfos creates infos only for components 
without <<app-bar-display="false">>
(OFBIZ-10637)

It makes no sense since if the menuName var is empty the infos are returned.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1845545 13f79535-47bb-0310-9956-ffa450edef68
2018-11-02 08:00:09 +00:00
Jacques Le Roux bee23f5f83 "Applied fix from trunk for revision: 1845466"
------------------------------------------------------------------------
r1845466 | jleroux | 2018-11-01 13:55:26 +0100 (jeu. 01 nov. 2018) | 3 lignes

Improved: no functional change, just some formatting 

Thanks: Taher for review
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1845467 13f79535-47bb-0310-9956-ffa450edef68
2018-11-01 12:55:52 +00:00
Jacques Le Roux fc94661783 "Applied fix from trunk for revision: 1845420"
------------------------------------------------------------------------
r1845420 | jleroux | 2018-11-01 10:39:17 +0100 (jeu. 01 nov. 2018) | 20 lignes

Fixed: Missing Security and Cache Headers in CMS Events
Fixed:
(OFBIZ-10597)

While rendering the view through the controller request we set the important 
security headers like x-frame-options, strict-transport-security, 
x-content-type-options, X-XSS-Protection and Referrer-Policy etc. in the 
response object. (Please see the 'rendervView' method of RequestHandler class.) 
 
In the similar line, we set the cache related headers like Expires, 
Last-Modified, Cache-Control, Pragma.
 
But these security headers are missing in the pages rendered through CMS. 
(Please visit the CmsEvents class).
 
These headers are very crucial for the security of the application as they help 
to prevent various security threats like cross-site scripting, 
cross-site request forgery, clickjacking etc. 

Thanks: Deepak Nigam for initial patch and review
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1845421 13f79535-47bb-0310-9956-ffa450edef68
2018-11-01 09:40:01 +00:00
Jacques Le Roux 642d871210 "Applied fix from trunk for revision: 1845418"
------------------------------------------------------------------------
r1845418 | jleroux | 2018-11-01 10:36:35 +0100 (jeu. 01 nov. 2018) | 20 lignes

Fixed: Missing Security and Cache Headers in CMS Events
Fixed:
(OFBIZ-10597)

While rendering the view through the controller request we set the important 
security headers like x-frame-options, strict-transport-security, 
x-content-type-options, X-XSS-Protection and Referrer-Policy etc. in the 
response object. (Please see the 'rendervView' method of RequestHandler class.) 
 
In the similar line, we set the cache related headers like Expires, 
Last-Modified, Cache-Control, Pragma.
 
But these security headers are missing in the pages rendered through CMS. 
(Please visit the CmsEvents class).
 
These headers are very crucial for the security of the application as they help 
to prevent various security threats like cross-site scripting, 
cross-site request forgery, clickjacking etc. 

Thanks: Deepak Nigam for initial patch and review
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1845419 13f79535-47bb-0310-9956-ffa450edef68
2018-11-01 09:37:06 +00:00
Aditya Sharma b528df23a7 Fixed: updateContent service does not return an error/success message
(OFBIZ-9743)
Additional change:
Added success message to createContent and removeContent service too.
Thanks Rohit Rai for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1844954 13f79535-47bb-0310-9956-ffa450edef68
2018-10-27 11:39:45 +00:00
Deepak Dixit 4c577b5a7d Applied fix from trunk for revision: 1844943
===

Improved: Updated google libphonenumber to v8.9.16 
(OFBIZ-10618)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1844944 13f79535-47bb-0310-9956-ffa450edef68
2018-10-27 07:56:40 +00:00
Jacques Le Roux 6bd3532cf9 "Applied fix from trunk for revision: 1843893"
------------------------------------------------------------------------
r1843893 | jleroux | 2018-10-15 12:06:04 +0200 (lun. 15 oct. 2018) | 4 lignes

Fixed: Creating Javadoc on Windows fails
(OFBIZ-10605)

This is due to the lack of UTF-8 encoding
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1843894 13f79535-47bb-0310-9956-ffa450edef68
2018-10-15 10:08:25 +00:00
Jacques Le Roux 758db9b5f5 "Applied fix from trunk for revision: 1843225 "
------------------------------------------------------------------------
r1843225 | jleroux | 2018-10-09 10:16:01 +0200 (mar. 09 oct. 2018) | 6 lignes

Documented: Wrong handling of response type "cross-redirect"
(OFBIZ-10569)

The documentation was wrong, this fixes it

Thanks: Dennis Balkir for the report and discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1843226 13f79535-47bb-0310-9956-ffa450edef68
2018-10-09 08:17:12 +00:00
Jacques Le Roux c15ad95d26 "Applied fix from trunk for revision: 1842921"
------------------------------------------------------------------------
r1842921 | jleroux | 2018-10-05 16:22:15 +0200 (ven. 05 oct. 2018) | 11 lignes

Fixed: The query iCalendar/CALENDAR_PUB_DEMO/ no longer work
(OFBIZ-10595)

ControlFilter does not allow the untypical iCalendar/CALENDAR_PUB_DEMO/ query 
to pass.
I have not checked deep, but since R13 works I believe it's due to OFBIZ-6760 
where ControlFilter was added. Then CALENDAR_PUB_DEMO/ is considered a 
[Filtered request] and the whole iCalendar process in Thunderbird Calendar is 
broken

Thanks:  Jyri Sillanpaa for the detailled report
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1842922 13f79535-47bb-0310-9956-ffa450edef68
2018-10-05 14:22:36 +00:00
Jacques Le Roux e51a26f3c4 "Applied fix from trunk for revision: 1842372 "
------------------------------------------------------------------------
r1842372 | jleroux | 2018-09-30 15:49:30 +0200 (dim. 30 sept. 2018) | 11 lignes

Fixed: Service Log screen is broken
(OFBIZ-10342)

Steps to regenerate

    Navigate to Logging menu under webtools
    https://demo-trunk.ofbiz.apache.org/webtools/control/LogView

    Select Service Log menu, see NPE error

Thanks: Swapnil M Mane for report and Swapnil and Rishi Solanki for reviews
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1842373 13f79535-47bb-0310-9956-ffa450edef68
2018-09-30 13:55:13 +00:00
Aditya Sharma cbc4d7097c Applied fix from trunk for revision: 1841662
===

Fixed: Broken page renders while click on Submit button
(OFBIZ-7535)
Submit button on ListEmploymentApps form has no check to hide when no record in List due to which button always appears and shows broken screen when submitting empty list.
Thanks Ankush Upadhyay for reporting the issue


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1841663 13f79535-47bb-0310-9956-ffa450edef68
2018-09-22 08:46:49 +00:00
Suraj Khurana f40fab2954 Applied fix from trunk for revision: 1841657
===

Fixed: Search operation on 'AssocRevisionItemView' entity causing exception.
(OFBIZ-8842)
Thanks Humera Khan for reporting the issue and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1841658 13f79535-47bb-0310-9956-ffa450edef68
2018-09-22 07:16:02 +00:00
Jacopo Cappellato db343122f7 Applied fix from trunk for revision: 1840828
===

Improved: Upgraded Freemarker to the latest stable version (from 
2.3.27-incubating to 2.3.28).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1840895 13f79535-47bb-0310-9956-ffa450edef68
2018-09-14 07:49:50 +00:00
Jacques Le Roux 2d74cb07d0 "Applied fix from trunk for revision: 1840199"
------------------------------------------------------------------------
r1840199 | jleroux | 2018-09-06 11:53:23 +0200 (jeu. 06 sept. 2018) | 7 lignes

Fixed: Action (find) button not visible in LabelManager search screen
(OFBIZ-10549)

When a user executes a search/find action in the Label Manager, and there are 
duplicated labels the 'Find' button is not visible anymore.

Thanks: Pierre Smits
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1840200 13f79535-47bb-0310-9956-ffa450edef68
2018-09-06 09:54:23 +00:00
Jacques Le Roux 5adfc2c434 "Applied fix from trunk for revision: 1840189"
------------------------------------------------------------------------
r1840189 | jleroux | 2018-09-06 09:50:54 +0200 (jeu. 06 sept. 2018) | 9 lignes

Improved: Display From address in send confirmation email form
(OFBIZ-10493)

Open any sales order and press "Send a confirmation email" button. 
Note that header From is read-only and empty. No problem with read-only mode as 
the address has been taken from ProductStoreEmailSetting but I think it would 
be better to display this address.

Thanks: Oleg Andreyev
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1840190 13f79535-47bb-0310-9956-ffa450edef68
2018-09-06 07:53:22 +00:00
Deepak Dixit 6407bae517 Improved: Use of layered-modal with parameter does not work
(OFBIZ-10511)
Thanks Arsalane Arrach for your contribution. Use &quot; to escape the double quotation marks

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1840094 13f79535-47bb-0310-9956-ffa450edef68
2018-09-05 07:19:13 +00:00
Jacques Le Roux 3350c11513 "Applied fix from trunk for revision: 1838381 "
------------------------------------------------------------------------
r1838381 | jleroux | 2018-08-19 17:30:42 +0200 (dim. 19 août 2018) | 8 lignes

Fixed: Search in Ecommerce no longer works
(OFBIZ-10531)

I guess that when I worked on OFBIZ-9164 I broke that.

I found 3 occurences where the dispatcher was not in the session because the 
session comes from the request and the request has not it in.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1838382 13f79535-47bb-0310-9956-ffa450edef68
2018-08-19 15:31:26 +00:00
Aditya Sharma 79ef78445e Reverted: Unwanted changes from AccountingScheduledServiceData.xml done at r1838257
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1838261 13f79535-47bb-0310-9956-ffa450edef68
2018-08-17 13:05:19 +00:00
Aditya Sharma efb9ecbeaa Applied fix from trunk for revision: 1838256
===

Improved: Remove checks to store only 250 characters of URL in VisitHandler.getVisit() & ServerHitBin.saveHit()
(OFBIZ-10508)
When the code was committed the 'URL' field type had a size of 255 characters only which was later changed to 2000 characters. So, the above code logic to restrict no of characters can be removed now. 
Removed null pointer check for initialRequest and initialReferrer as it is already handled while setting the values in UtilHttp.setInitialRequestInfo() method.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1838257 13f79535-47bb-0310-9956-ffa450edef68
2018-08-17 12:53:32 +00:00
Jacques Le Roux f71734ffac Improved: no functional change
Removes io.jsonwebtoken:jjwt, this was not supposed to be part of OFBIZ-10523

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1838059 13f79535-47bb-0310-9956-ffa450edef68
2018-08-14 22:28:28 +00:00
Jacques Le Roux e0b076d76f "Applied fix from trunk for revision: 1838032"
------------------------------------------------------------------------
r1838032 | jleroux | 2018-08-14 18:44:17 +0200 (mar. 14 août 2018) | 4 lignes

Fixed: You can't create a New Payment Group
(OFBIZ-10523)

There is a duplicated paymentGroupTypeId, it should a string not a list.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1838033 13f79535-47bb-0310-9956-ffa450edef68
2018-08-14 16:45:09 +00:00
Jacques Le Roux a6f4438e9b Improved: no functional change
Removes io.jsonwebtoken:jjwt, this was not supposed to be part of OFBIZ-10517

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1837863 13f79535-47bb-0310-9956-ffa450edef68
2018-08-11 10:49:10 +00:00
Jacques Le Roux 6fb3531f64 "Applied fix from trunk for revision: 1837857"
------------------------------------------------------------------------
r1837857 | jleroux | 2018-08-11 12:37:40 +0200 (sam. 11 août 2018) | 10 lignes

Fixed: Update Apache Tomcat to 9.0.10 because of CVE-2018-8037
(OFBIZ-10517)

If an async request was completed by the application at the same time as the 
container triggered the async timeout, a race condition existed that could 
result in a user seeing a response intended for a different user. 
An additional issue was present in the NIO and NIO2 connectors that did not 
correctly track the closure of the connection when an async request was 
completed by the application and timed out by the container at the same time.
This could also result in a user seeing a response intended for another user. 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1837860 13f79535-47bb-0310-9956-ffa450edef68
2018-08-11 10:40:18 +00:00
Gil Portenseigne 2a7de2a39e Fixed: Use of layered-modal with parameter does not work
(OFBIZ-10511)

Thanks Deepak and Aditya for the review and providing a better patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1837807 13f79535-47bb-0310-9956-ffa450edef68
2018-08-10 14:12:52 +00:00
Taher A. Alkhateeb b82c52b234 Backported fix from trunk for revision: 1837697
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1837707 13f79535-47bb-0310-9956-ffa450edef68
2018-08-09 09:57:26 +00:00
Gil Portenseigne dc1864f983 Fixed: Initial set of hasLoggedOut flag when logging in
(OFBIZ-10506)

Thanks Dennis for your patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1837585 13f79535-47bb-0310-9956-ffa450edef68
2018-08-07 09:35:23 +00:00
Deepak Dixit a4b50a46b1 Applied fix from trunk for revision: 1836871
===

Improved: Use application/javascript instead of text/javascript
(OFBIZ-10492)
Updated compressibleMimeType list and use application/javascript in place of text/javascript


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1836872 13f79535-47bb-0310-9956-ffa450edef68
2018-07-28 06:28:05 +00:00
Deepak Dixit 826d7e6bd7 Applied fix from trunk for revision: 1836144
===

Fixed: compressableMimeType is not a valid attribute of apache http connector 
(OFBIZ-10487)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1836145 13f79535-47bb-0310-9956-ffa450edef68
2018-07-18 06:42:52 +00:00
Taher A. Alkhateeb e8e2791fd8 Backported fix from trunk for revision: 1836141
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1836142 13f79535-47bb-0310-9956-ffa450edef68
2018-07-18 06:32:46 +00:00
Deepak Dixit d0e1a957e5 Applied fix from trunk for revision: 1835964
===

Fixed: Not able to delete PartyRate 
(OFBIZ-10483)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1835965 13f79535-47bb-0310-9956-ffa450edef68
2018-07-15 10:48:39 +00:00
Deepak Dixit 1777b217c9 Applied fix from trunk for revision: 1835953
===

Fixed: Missing Import in CmsEditAddPrep.groovy 
(OFBIZ-10475)

Applied slightly modified patch, Thanks Dennis Balkir for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1835955 13f79535-47bb-0310-9956-ffa450edef68
2018-07-15 08:48:00 +00:00
Jacques Le Roux d698865837 "Applied fix from trunk for revision: 1835891 "
------------------------------------------------------------------------
r1835891 | jleroux | 2018-07-14 11:52:26 +0200 (sam. 14 juil. 2018) | 35 lignes

Fixed: Refactor ContentWorkerInterface methods signatures
(OFBIZ-9164)

If you go at: catalog/control/main then open the lookup on the left for category
 id, click the first category (20111) and then click on search, you will be 
prompted with this:
java.lang.IllegalArgumentException: Error running script at location 
[component://product/groovyScripts/catalog/find/KeywordSearch.groovy]: 
java.lang.NullPointerException

This is the result of the changes I made for this issue 1.5 years ago.

I missed the case where a null is passed instead of a dispatcher in
getProductCategoryContentAsText()
which is then used inside of getProductCategoryContentAsText:
ContentWorker.renderContentAsText()
The problem is, that the method renderContentAsText as a result of my changes 
uses the dispatcher to get the delegator.
Because the dispatcher is a given a null value at this point, this results in a 
null pointer.

The solution was to introduce and abstract prettyPrintConstraint method with a 
LocalDispatcher as argument and to implement it in CategoryConstraint class. 

Other implementations don't use getProductCategoryContentAsText so can simply 
return null.

CatalogConstraint.prettyPrintConstraint with a delegator is now not
used OOTB but I prefer to keep its implementation for custom projects which 
might use it in other circumstances. I though put a TODO to possibly simply
return null.

Also while at it remove a unused requestParams variable in ProductSearchSession

Thanks: Dennis Balkir for the detailed reporting
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1835892 13f79535-47bb-0310-9956-ffa450edef68
2018-07-14 09:53:00 +00:00
Akash Jain 5f35bd4387 Applied fix from trunk for revision: 1835887
===

Fixed: Not able to expire the rate amount and an error is displayed in Workeffort (OFBIZ-10114)

Thanks, Rubia Elza Joshep and Chandrashekhar Dhakad for your contibution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1835888 13f79535-47bb-0310-9956-ffa450edef68
2018-07-14 09:11:44 +00:00
Jacques Le Roux 907445c6e4 Reverted: setLocaleFromBrowser requires authentification
(OFBIZ-10460)

The setLocaleFromBrowser request map defined in common-controller.xml has an 
attribute of auth=false
While the service associated with it in framework/common/servicedef/services.xml 
has an attribute of auth=true.

jleroux: this was missing in the initial patch. At OFBIZ-9264 the description is
    "it sets the time zone of the user logged in to it's browser time zone."
So being logged in seems needed, hence better to set auth=true everywhere

Thanks: as reported by Deepak in OFBIZ-10460 there is a problem with that.
So we need keep the inconsistence and the service protected.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1835616 13f79535-47bb-0310-9956-ffa450edef68
2018-07-11 08:14:29 +00:00
Jacques Le Roux 073c3f71e5 "Applied fix from trunk for revision: 1835586"
------------------------------------------------------------------------
r1835586 | jleroux | 2018-07-10 19:31:50 +0200 (mar. 10 juil. 2018) | 13 lignes

Fixed: setLocaleFromBrowser requires authentification
(OFBIZ-10460)

The setLocaleFromBrowser request map defined in common-controller.xml has an 
attribute of auth=false
While the service associated with it in framework/common/servicedef/services.xml 
has an attribute of auth=true.

jleroux: this was missing in the initial patch. At OFBIZ-9264 the description is
    "it sets the time zone of the user logged in to it's browser time zone."
So being logged in seems needed, hence better to set auth=true everywhere

Thanks: Mathieu Lirzin for report
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1835587 13f79535-47bb-0310-9956-ffa450edef68
2018-07-10 17:33:59 +00:00
Gil Portenseigne a0df9e164a Fixed: GetLocaleList call can provide duplicate results
(OFBIZ-10458)

A new Junit test is implemented to validate that no duplicates are present.
Groovy service has been refactored to use a more functional style

Thanks Mathieu Lirzin for reporting and providing the patch


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1835283 13f79535-47bb-0310-9956-ffa450edef68
2018-07-06 21:10:50 +00:00
Deepak Dixit daae6ed07e Applied fix from trunk for revision: 1835235
===

Fixed: Framework webapp freemarkerTransform.properties has dependency on proudct component
(OFBIZ-10463)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1835238 13f79535-47bb-0310-9956-ffa450edef68
2018-07-06 11:51:24 +00:00
Jacques Le Roux ac3c0debd4 "Applied fix from trunk for revision: 1834736"
------------------------------------------------------------------------
r1834736 | jleroux | 2018-06-30 16:00:16 +0200 (sam. 30 juin 2018) | 16 lignes

Fixed: Put back the com.lowagie:itext license from 4.2.0 to 2.1.7
(OFBIZ-10455)

At r1812161 for OFBIZ-9674 we updated com.lowagie:itext license from 2.1.7 to 
4.2.0. Scott mentionned at https://s.apache.org/ixHW:

<<I just noticed that the iText maven bundle is a bit tricksy and includes iText
 5.6.6 as a dependency, with the latter being GPL licensed.>>

Actually Scott meant itextpdf (was clear in his message), and it turned out that 
not only itextpdf was a problem but the 4.2.0 version in its entirety as 
discovered in the thread.

The solution is to get back to the 2.1.7 version which is still MPL licensed.

Thanks: Scott for discovering the issue and others for the discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1834737 13f79535-47bb-0310-9956-ffa450edef68
2018-06-30 14:00:39 +00:00
Akash Jain 86aa890ef4 Applied fix from trunk for revision: 1834191
===

Fixed: Values are not aligned with column over EditShoppingList Screen, applied patch from jira issue. (OFBIZ-10210)

Thanks, Yogesh Naroliya for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1834196 13f79535-47bb-0310-9956-ffa450edef68
2018-06-23 12:22:06 +00:00
Arun Patidar 26b319052b Applied fix from trunk for revision: 1834181
===

FIXED:Incorrect succes mesage after creating customer.
(OFBIZ-9898)

Thanks Anushi Gupta for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1834182 13f79535-47bb-0310-9956-ffa450edef68
2018-06-23 06:28:48 +00:00
Taher A. Alkhateeb 38f7330f88 Applied trunk fix on revision r1833708 (OFBIZ-10435)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1833709 13f79535-47bb-0310-9956-ffa450edef68
2018-06-18 12:26:14 +00:00
Jacques Le Roux 0279d8f99f "Applied fix from trunk for revision: 1833211 "
------------------------------------------------------------------------
r1833211 | jleroux | 2018-06-08 22:37:32 +0200 (ven. 08 juin 2018) | 8 lignes

Fixed: streaming large content cause out of memory exception.
(OFBIZ-10133)

With r1821036 DataResourceWorker.getDataResourceStream() may return an 
InputStream (if the data resource is a file) instead of a ByteArrayInputStream 
which was expected in few places.

This fixes it
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1833212 13f79535-47bb-0310-9956-ffa450edef68
2018-06-08 20:38:19 +00:00
Michael Brohl 2d83f1962d Applied fix from trunk for revision: 1833173
===

Improved: Add a VERSION file in root dir.
(OFBIZ-10141)

This adds a VERSION file to store the release version information
and changes the footer of the themes to show the release version.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1833174 13f79535-47bb-0310-9956-ffa450edef68
2018-06-08 14:46:12 +00:00
Jacques Le Roux a03229ea99 "Applied fix from trunk for revision: 1832944 "
------------------------------------------------------------------------
r1832944 | jleroux | 2018-06-05 15:56:29 +0200 (mar. 05 juin 2018) | 17 lignes

Fixed: The first visit event are not executed in case of CMS
(OFBIZ-10389)

Execution of the first visit events depends on the trackVisit function

In RequestHandler.java file

if (this.trackVisit(request) && session.getAttribute("_FIRST_VISIT_EVENTS_") == null) {
    // execute first visit event
}

trackVisit function does not honor the default controller request 
(in this case, cms) So, we should improve the code of trackVisit to honor 
default controller request.


Thanks: Swapnil M Mane
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1832945 13f79535-47bb-0310-9956-ffa450edef68
2018-06-05 13:57:18 +00:00
Jacques Le Roux bac7aeb9ef "Applied fix from trunk for revision: 1832756"
------------------------------------------------------------------------
r1832756 | jleroux | 2018-06-03 10:33:09 +0200 (dim. 03 juin 2018) | 21 lignes

Fixed: Session fixation issue
(OFBIZ-10420)

Prevents the session fixation by making Tomcat generate a new jsessionId 
(ultimately put in cookie). Only do when really signing in to avoid unnecessary 
calls

This improves the way it's done by using request.changeSessionId() instead of 
creating a brand new session. So there is no possible side effects on client and
no need to set initial request info (using setInitialRequestInfo)

Thanks: Taher for asking about it









------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1832757 13f79535-47bb-0310-9956-ffa450edef68
2018-06-03 08:34:32 +00:00
Jacques Le Roux c9c60234ad "Applied fix from trunk for revision: 1832662 "
------------------------------------------------------------------------
r1832662 | jleroux | 2018-06-01 09:37:27 +0200 (ven. 01 juin 2018) | 12 lignes

Fixed: Session fixation issue
(OFBIZ-10420)

Fixes a session fixation security issue discovered by a client with the security
 audit tool "IBM Security AppScan Enterprise , Version : 9.0.3.7"

Prevents the session fixation by making Tomcat generate a new jsessionId 
(ultimately put in cookie). 

Only do when really signing in to avoid unnecessary calls
Though if the client has disabled the use of cookies, then a session will be 
new on each request, not a good choice on client side!

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1832663 13f79535-47bb-0310-9956-ffa450edef68
2018-06-01 07:38:09 +00:00
Jacques Le Roux 8a40cc383f "Applied fix from trunk for revision: 1832577"
------------------------------------------------------------------------
r1832577 | zhangwei | 2018-05-31 03:20:54 +0200 (jeu. 31 mai 2018) | 1 ligne

Fixed: Incorrect data type conversion of variable serviceEndTime in CoreEvents.java
(OFBIZ-10419)

A minor fix for serviceEndTime conversion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1832659 13f79535-47bb-0310-9956-ffa450edef68
2018-06-01 06:27:03 +00:00
Jacques Le Roux df14817adf "Applied fix from trunk for revision: 1831831"
------------------------------------------------------------------------
r1831831 | jleroux | 2018-05-18 10:11:55 +0200 (ven. 18 mai 2018) | 11 lignes

Fixed:: Dynamic values not rendering properly in property tag of fail-property 
attribute
(OFBIZ-10406)

While calling checkProductRelatedPermission, if permission is failed ten 
fail-property tag uses ${checkActionLabel} which is not handled properly in 
MessageElement.java.
There are 2-3 other occurrences as well of such type but not in working 
condition.

Thanks: Suraj
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1831832 13f79535-47bb-0310-9956-ffa450edef68
2018-05-18 08:13:40 +00:00
Gil Portenseigne 44e48e5824 Fixed : change OFBiz always log level to OFF log4j level, instead of using FATAL log4j level
(OFBIZ-6206)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1831789 13f79535-47bb-0310-9956-ffa450edef68
2018-05-17 15:03:51 +00:00
Deepak Dixit 8f8628effe Applied fix from trunk for revision: 1831608
===

Fixed: Wrong permission action leads to error
(OFBIZ-10405)
Thanks Suraj Khurana for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1831609 13f79535-47bb-0310-9956-ffa450edef68
2018-05-15 06:21:47 +00:00
Jacques Le Roux 3e6c7b40eb "Applied fix from trunk for revision: 1831234 "
------------------------------------------------------------------------
r1831234 | jleroux | 2018-05-09 10:26:44 +0200 (mer. 09 mai 2018) | 4 lignes

Fixed: Sending mail button from viewProfile doesn't work
(OFBIZ-7075)

There was a quote error in the Montalbano Florian's patch, this fix it
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1831236 13f79535-47bb-0310-9956-ffa450edef68
2018-05-09 08:27:59 +00:00
Rishi Solanki 22c6ec51ad Fixed: Existing BILLING_LOCATION record of party should expire while creating a new one. Now service will first expires all the billing location against party and create new one. Applied fix from trunk revision 1831183.
(OFBIZ-10374)
Thank you Suraj Khuran for reporting the issue and providing patch for the same.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1831185 13f79535-47bb-0310-9956-ffa450edef68
2018-05-08 13:36:37 +00:00
Jacques Le Roux 240eea1adf "Applied fix from trunk for revision: 1831078"
------------------------------------------------------------------------
r1831078 | jleroux | 2018-05-07 09:48:57 +0200 (lun. 07 mai 2018) | 6 lignes

Fixed: The "request" attribute type of the userLogin service is wrong
(OFBIZ-10304)

Now that we use Tomcat 9 this problem is over

Thanks: Jacopo for upgrading to Tomcat 9 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1831080 13f79535-47bb-0310-9956-ffa450edef68
2018-05-07 08:27:05 +00:00
Jacopo Cappellato 9f94f97b03 Applied fix from trunk for revision: 1831074
===

Implemented: Upgraded to latest Tomcat (9.0.7).
(OFBIZ-10036)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1831076 13f79535-47bb-0310-9956-ffa450edef68
2018-05-07 07:24:53 +00:00
Deepak Dixit d81197e3be Applied fix from trunk for revision: 1830936
===

Fixed: Fix typo 'paramters' => 'parameters'
(OFBIZ-10394)
Thanks Mathieu Lirzin for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1830938 13f79535-47bb-0310-9956-ffa450edef68
2018-05-04 19:35:37 +00:00
Nicolas Malin 5b347ad958 Fixed: Backport from trunk, ConfigXMLReader - Events are not executed in the order defined
(OFBIZ-10369)
The events contained in the controller configuration for first-visit, pre-post processor and before-after login are executed in arbitrary order rather than the defined order.
If we define an event configuration as follow:

    <after-login>
        <event name=keepCartUpdated type=java path=org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents invoke=keepCartUpdated/>
        <event name=restoreAutoSaveList type=java path=org.apache.ofbiz.order.shoppinglist.ShoppingListEvents invoke=restoreAutoSaveList/>
        <event name=saveCartToAutoSaveList type=java path=org.apache.ofbiz.order.shoppinglist.ShoppingListEvents invoke=saveCartToAutoSaveList/>
    </after-login>

We wait that OFBIz run keepCartUpdated, restoreAutoSaveList and after saveCartToAutoSaveList event but the HashMap who organise them return arbitrary order and can return saveCartToAutoSaveList, keepCartUpdated and restoreAutoSaveList. Convert the HashMap to LinkedHashMap help to keep the loaded order.

Thanks to Vikas Mayur for solve this issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1830305 13f79535-47bb-0310-9956-ffa450edef68
2018-04-27 07:40:28 +00:00
Deepak Dixit eaa434b1e8 Applied fix from trunk for revision: 1829690
===

Improved: Update Currency UOM data as per iso amendment 164, 165 and 166
(OFBIZ-10364)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1829692 13f79535-47bb-0310-9956-ffa450edef68
2018-04-21 05:27:56 +00:00
Michael Brohl b083eb03d1 Applied fix from trunk for revision: 1828514
===

Improved: removed outdated, empty folders.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1828515 13f79535-47bb-0310-9956-ffa450edef68
2018-04-06 12:29:43 +00:00
Michael Brohl 22861cab08 Applied fix from trunk for revision: 1828512
===

Improved: removed outdated, empty folders.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1828513 13f79535-47bb-0310-9956-ffa450edef68
2018-04-06 12:22:49 +00:00
Michael Brohl 5d9464d242 Applied fix from trunk for revision: 1828424
===

Improved: removed outdated, empty folder.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1828425 13f79535-47bb-0310-9956-ffa450edef68
2018-04-05 12:36:00 +00:00
Michael Brohl 3d78334bd3 Applied fix from trunk for revision: 1828346
===

Improved: removed outdated, empty folder.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1828347 13f79535-47bb-0310-9956-ffa450edef68
2018-04-04 13:59:22 +00:00
Michael Brohl 338900028f Applied fix from trunk for revision: 1828316
===

Improved: removed outdated script folder.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1828317 13f79535-47bb-0310-9956-ffa450edef68
2018-04-04 10:23:35 +00:00
Jacques Le Roux 33fc0fff1c "Applied fix from trunk for revision: 1828255"
------------------------------------------------------------------------
r1828255 | jleroux | 2018-04-03 18:37:09 +0200 (mar., 03 avr. 2018) | 7 lines

Fixed: Required parameters are optional for createWorkRequirementFulfillment service
(OFBIZ-8622)

As per entity def, required parameter should be  requirementId instead of 
requirementTypeId.

Thanks: Suraj for the last patch
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1828306 13f79535-47bb-0310-9956-ffa450edef68
2018-04-04 07:27:56 +00:00
Rishi Solanki 268cdab7e5 Fixed: loadCartFromOrder changes order date even when updating order items. It should only set orderDate as nowTimeStamp only if createAsNewOrder flag is true other wise it should set orderDate from existing orderHeader. Also, removed setting of redundant orderName on cart. Applied fix from trunk revision 1827827.
(OFBIZ-10301)
Thanks Suraj Khurana for reporting the issue and providing fix for the same.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1827828 13f79535-47bb-0310-9956-ffa450edef68
2018-03-27 10:40:18 +00:00
Jacques Le Roux 61f2257f69 Improved: Logout do not remove autoLogin
(OFBIZ-4959)

No functional change: formatting

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1827533 13f79535-47bb-0310-9956-ffa450edef68
2018-03-22 21:39:58 +00:00
Jacques Le Roux 28bc3fba9b Reverted: Token Based Authentication
(OFBIZ-9833)

Completes r1827528, I saw it but forgot to put it back: 
login.secret_key_string=Secret Key

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1827532 13f79535-47bb-0310-9956-ffa450edef68
2018-03-22 21:36:33 +00:00
Jacques Le Roux 9d42de74dd Reverted: Token Based Authentication
(OFBIZ-9833)

This was a new feature committed the 2017-10-29 and has completely changed since.
It should not stay as is in R17.12



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1827528 13f79535-47bb-0310-9956-ffa450edef68
2018-03-22 20:57:26 +00:00
Jacques Le Roux cf996f24a3 "Applied fix from trunk for revision: 1827441 "
------------------------------------------------------------------------
r1827441 | jleroux | 2018-03-21 21:59:49 +0100 (mer., 21 mars 2018) | 4 lines

Fixed: Token Based Authentication
(OFBIZ-9833)

Reverts change in ContextFilter.java committed with 1813679, was wrong
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1827442 13f79535-47bb-0310-9956-ffa450edef68
2018-03-21 21:00:50 +00:00
Jacques Le Roux be4ad8b7ee "Applied fix from trunk for revision: 1827439 "
------------------------------------------------------------------------
r1827439 | jleroux | 2018-03-21 21:53:41 +0100 (mer., 21 mars 2018) | 5 lines

Fixed: The "request" attribute type of the userLogin service is wrong
(OFBIZ-10304)

It should have been org.apache.catalina.connector.RequestFacade"
instead of javax.servlet.http.HttpServletRequest see the Jira for details
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1827440 13f79535-47bb-0310-9956-ffa450edef68
2018-03-21 20:54:36 +00:00
Jacques Le Roux 7381c43f89 "Applied fix from trunk for revision: 1826997 "
------------------------------------------------------------------------
r1826997 | jleroux | 2018-03-16 16:39:18 +0100 (ven., 16 mars 2018) | 7 lines

Fixed: The server hour normally shown in the jobs list is no longer showing
(OFBIZ-10278)

With FTL formatting in OFBIZ-7636, the commented single line got broken into 3 
lines making it an invalid js code.

Thanks: Aditya
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1827000 13f79535-47bb-0310-9956-ffa450edef68
2018-03-16 15:45:00 +00:00
Jacques Le Roux 1c7ef515a6 "Applied fix from trunk for revision: 1826938 "
------------------------------------------------------------------------
r1826938 | jleroux | 2018-03-16 10:35:06 +0100 (ven., 16 mars 2018) | 12 lines

Fixed: Logout do not remove autoLogin
(OFBIZ-4959)

I used the only available (and I must say confusing) WebappInfo.getName() when
I needed the webAppName not the WebappInfoName. So this put in a new 
WebappInfo.getMountPoint() and use it in getWebappInfo

Also use LoginWorker.autoLoginSet() in different places where I missed it. In 
other words all autoUserLogin coockies are deleted on login and logout, and
an autoUserLogin cookie is created when going locally from a webapp to another,
with checkExternalLoginKey

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1826939 13f79535-47bb-0310-9956-ffa450edef68
2018-03-16 09:36:18 +00:00
Michael Brohl db6c508d0a Applied fix from trunk for revision: 1826805
===

Fixed: Removing Birt dependencies in ReportScreens.xml.
(OFBIZ-10283)

Thanks Dennis Balkir for reporting and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1826806 13f79535-47bb-0310-9956-ffa450edef68
2018-03-15 12:32:32 +00:00
Jacques Le Roux c247b795d1 "Applied fix from trunk for revision: 1826797"
------------------------------------------------------------------------
r1826797 | jleroux | Thu Mar 15 11:29:59 2018 | 5 lines

Fixed: The getJSONuiLabel javascript function is no longer working
(OFBIZ-10277)

The data were well retrieve, but the syntax used to extract them was not working
 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1826798 13f79535-47bb-0310-9956-ffa450edef68
2018-03-15 11:33:59 +00:00
Michael Brohl 08b6dea931 Fixed: Theme screens do not load properly
(OFBIZ-10276)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1826681 13f79535-47bb-0310-9956-ffa450edef68
2018-03-13 20:33:28 +00:00
Michael Brohl e697cde814 Applied fix from trunk for revision: 1826674
===

Fixed: EmailServices.sendMailFromScreen attachment rendering broken.
(OFBIZ-10246)

Thanks Martin for reporting and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1826675 13f79535-47bb-0310-9956-ffa450edef68
2018-03-13 19:47:09 +00:00
Michael Brohl de532baccd Applied fix from trunk for revision: 1826671
===

Fixed: Wrong locale/fallbackLocale logic in CategoryContentWrapper leads 
to unavailable alternate locale content.
(OFBIZ-10274)

Thanks Martin Becker for reporting and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1826673 13f79535-47bb-0310-9956-ffa450edef68
2018-03-13 19:39:33 +00:00
Michael Brohl 9ff8084577 Applied fix from trunk for revision: 1826592
===

Fixed: UtilCodec URL decoding breaks values with german umlauts.
(OFBIZ-10275)

Thanks Martin Becker for reporting and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1826594 13f79535-47bb-0310-9956-ffa450edef68
2018-03-12 21:45:38 +00:00
Deepak Dixit b369039080 Applied fix from trunk for revision: 1826502
===

Improved: Update postgres datasource name in entityengine file for consistency
OFBIZ-10273



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1826503 13f79535-47bb-0310-9956-ffa450edef68
2018-03-12 06:41:16 +00:00
Michael Brohl 24801b533e Applied fix from trunk for revision: 1826374
===

Improved: Pass JVM options to OFBiz when using Gradle.
(OFBIZ-10253)

This enables passing JVM options like memory, garbage collection or JMX
configurations to the OFBiz VM. Falls back to the previously hard coded
default if not set.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1826377 13f79535-47bb-0310-9956-ffa450edef68
2018-03-09 20:53:14 +00:00
Gil Portenseigne 93ab772386 Applied fix from trunk for revision: 1825450
===

Fixed: Error in service definition for deleteOrderHeaderWorkEffort
(OFBIZ-10243)

Thanks Pierre Gaudin for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1825451 13f79535-47bb-0310-9956-ffa450edef68
2018-02-27 13:58:19 +00:00
Gil Portenseigne a128eab035 Applied fix from trunk for revision: 1825444
===

Fixed: French typo fix
(OFBIZ-10244)

Thanks Pierre Gaudin for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1825447 13f79535-47bb-0310-9956-ffa450edef68
2018-02-27 13:36:30 +00:00
Arun Patidar cff199183c Applied fix from trunk for revision: 1825233
===

Fixed: Incorrect Party profile view redirection in SFA due to missing roleType.
(OFBIZ-10121)
Thanks Ankit Joshi for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1825234 13f79535-47bb-0310-9956-ffa450edef68
2018-02-24 12:42:30 +00:00
Arun Patidar ff3653ed11 Applied fix from trunk for revision: 1825216
===

Improved:Update regex used for validating credit cards.
(OFBIZ-9761)
Thanks Amit Gadaley for your contribution and Michael Brohl for reviewing patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1825217 13f79535-47bb-0310-9956-ffa450edef68
2018-02-24 11:33:31 +00:00
Deepak Dixit a4d80a95e0 Applied fix from trunk for revision: 1825211
===

Fixed: Found element binding issue related to lookup work done at r#1825205
(OFBIZ-10012)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1825212 13f79535-47bb-0310-9956-ffa450edef68
2018-02-24 10:57:33 +00:00
Deepak Dixit dbcb375a61 Fixed: Alert message : Developer: for lookups to work you must provide a form name! appears when try to select contentId from Lookup.
(OFBIZ-10012)
Applied slightly modified patch
Thanks  Sonal for reporting and Aditya Sharma for providing patch for the issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1825210 13f79535-47bb-0310-9956-ffa450edef68
2018-02-24 10:48:51 +00:00
Arun Patidar bc0b95c889 Applied fix from trunk for revision: 1825192
===

Fixed: Survey response data lost on loadCartFromOrder service. (OFBIZ-10232)
Thanks Suraj Khurana for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1825193 13f79535-47bb-0310-9956-ffa450edef68
2018-02-24 07:54:20 +00:00
Jacques Le Roux 007d5a08d9 "Applied fix from trunk for revision: 1824855"
------------------------------------------------------------------------
r1824855 | jleroux | 2018-02-20 12:59:07 +0100 (mar., 20 févr. 2018) | 7 lines

Reverted: Secure the login.secret_key_string
(OFBIZ-9966)

I forgot to revert this part; I guess got conflict issues and then forgot.

I'll also revert in R16 and R17 and close as won't fix, I gave my arguments
that's enough for me.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1824856 13f79535-47bb-0310-9956-ffa450edef68
2018-02-20 12:00:03 +00:00
Jacques Le Roux ff93d6f84d "Applied fix from trunk for revision: 1824847"
------------------------------------------------------------------------
r1824847 | jleroux | 2018-02-20 12:04:15 +0100 (mar., 20 févr. 2018) | 6 lines

Fixed:Access the online help in Rainbow themes
(OFBIZ-10222)

The help icon did not render well on IE11. It's now OK on all major browsers

Thanks: Julien for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1824848 13f79535-47bb-0310-9956-ffa450edef68
2018-02-20 11:06:09 +00:00
Jacques Le Roux d0735d2181 "Applied fix from trunk for revision: 1824803 "
------------------------------------------------------------------------
r1824803 | jleroux | 2018-02-19 20:23:36 +0100 (lun., 19 févr. 2018) | 18 lines

Fixed: Logout do not remove autoLogin
(OFBIZ-4959)

Logout method do not disable autoLogin functionality. 
Instead of that it just initializes autoLogin in session and request.

jleroux: this was also needed by OFBIZ-10206 "Security issue in Token Based 
Authentication". 
This creates a keep-autologin-cookie boolean attribute in the webapp element of 
the  ofbiz-component.xml, documented in ofbiz-component.xsd
This attribute is used to get the value from the ofbiz-component.xml files in a
new autoLogoutCleanCookies() LoginWorker method. This method is used not only 
when login out but also when login in. This to be sure that in every cases the 
cookies related to the webapps are removed.
For now only the ecommerce, ecomseo et webpos webapps are keeping and using 
their autologin cookies

Thanks: Roberto Benítez Monje for report and Taher for discussion and suggestion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1824804 13f79535-47bb-0310-9956-ffa450edef68
2018-02-19 19:24:14 +00:00
Paul Foxworthy 904bf98788 Applied fix from trunk for revision: 1824740 === Fixed: The invoiceTaxTotal value is missing from createAcctgTransForPurchaseInvoice service (OFBIZ-6330)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1824743 13f79535-47bb-0310-9956-ffa450edef68
2018-02-19 11:58:56 +00:00
Jacques Le Roux 6d9e9e5161 "Applied fix from trunk for revision: 1824732"
------------------------------------------------------------------------
r1824732 | jleroux | 2018-02-19 11:49:25 +0100 (lun., 19 févr. 2018) | 6 lines

Fixed:Access the online help in Rainbow themes
(OFBIZ-10222)

As reported by Dmitriy Tsyganok on GitHub we missed the Help Icon

Thanks: Dmitriy Tsyganok 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1824733 13f79535-47bb-0310-9956-ffa450edef68
2018-02-19 10:50:13 +00:00
Jacques Le Roux 685890eb61 "Applied fix from trunk for revision: 1824314"
------------------------------------------------------------------------
r1824314 | jnicolas | 2018-02-15 15:31:21 +0100 (jeu., 15 févr. 2018) | 3 lines

Fixed:Access the online help in Rainbow themes
(OFBIZ-10222)
Thanks to Jacques LEROUX to find this missing button
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1824319 13f79535-47bb-0310-9956-ffa450edef68
2018-02-15 14:52:38 +00:00
Jacques Le Roux 07c205da74 "Applied fix from trunk for revision: 1824316 "
------------------------------------------------------------------------
r1824316 | jleroux | 2018-02-15 15:38:51 +0100 (jeu., 15 févr. 2018) | 7 lines

Improved: Use Tomcat default ciphers
(OFBIZ-10223)

Tomcat provides a default ciphers definition better to use it and let Tomcat 
handles that for us, we know Tomcat security is strong

Thanks: Paul Foxworthy for the help understanding the syntax :)
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1824317 13f79535-47bb-0310-9956-ffa450edef68
2018-02-15 14:39:49 +00:00
Jacques Le Roux 54ae17d54f "Applied fix from trunk for revision: 1824260 "
------------------------------------------------------------------------
r1824260 | jleroux | 2018-02-14 17:40:19 +0100 (mer., 14 févr. 2018) | 1 line

Improved: Token Based Authentication
(OFBIZ-9833)

No functional change, removes TODOs that I recently 
(1 week ago in r1823324) put to myself to quickly check. 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1824261 13f79535-47bb-0310-9956-ffa450edef68
2018-02-14 16:40:45 +00:00
Jacques Le Roux 45f5c24ed0 "Applied fix from trunk for revision: 1823876"
------------------------------------------------------------------------
r1823876 | jleroux | 2018-02-11 19:51:07 +0100 (dim., 11 févr. 2018) | 9 lines

Fixed: UtilNumber.getBigDecimalRoundingMode() returns a wrong value
(OFBIZ-10218)

While working on OFBIZ-9571 I found that getBigDecimalRoundingMode() returns  
DEFAULT_BD_SCALE when the passed value for the file parameter is emtpy. 
This has certainly be C/P from getBigDecimalScale() and never found before.

While at it I refactored a bit getBigDecimalRoundingMode()  and 
getBigDecimalScale() 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1823877 13f79535-47bb-0310-9956-ffa450edef68
2018-02-11 18:51:37 +00:00
Jacques Le Roux bfff6c8922 "Applied fix from trunk for revision: 1823562"
------------------------------------------------------------------------
r1823562 | jleroux | 2018-02-08 16:01:54 +0100 (jeu., 08 févr. 2018) | 1 line

Completed: Security issue in Token Based Authentication
(OFBIZ-10206)

No functional change, just better syntax
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1823563 13f79535-47bb-0310-9956-ffa450edef68
2018-02-08 15:04:24 +00:00
Jacques Le Roux baee9bb1ca "Applied fix from trunk for revision: 1823467"
------------------------------------------------------------------------
r1823467 | jleroux | 2018-02-07 15:17:51 +0100 (mer., 07 févr. 2018) | 7 lines

Completed:: Security issue in Token Based Authentication
(OFBIZ-10206)

Updates the security.properties content related to JWT
 Refers to the last up to date external-server-test-example.patch at OFBIZ-10206
 Makes demo-trunk.ofbiz.apache.org default external-server-name so that anybody
 can try the feature from own machine. The use-external-server=Y was already set
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1823469 13f79535-47bb-0310-9956-ffa450edef68
2018-02-07 14:20:49 +00:00
Jacques Le Roux 10ba1cb803 "Applied fix from trunk for revision: 1823324 "
------------------------------------------------------------------------
r1823324 | jleroux | 2018-02-06 14:17:57 +0100 (mar., 06 févr. 2018) | 26 lines

Fixed: Security issue in Token Based Authentication
(OFBIZ-10206)

The version I committed so far in OFBIZ-9833 has a small security issue.
See the Jira description for all details

To test I have attached a OFBIZ-10206-external-server-test-example.patch to 
the Jira

This removes the external-server-query property now useless

In  ContextFilter the getHeader (wrapper) now uses an autoLoginCookie to get 
the userLoginId passed in the JWT instead of externalServerUserLogin parameter.
A sourceServerWebappName parameter must be passed from the client request to
allow reading the autoLoginCookie.

This userLoginId is then retrieved on the target server from the JWT in the 
externalServerLoginCheck which is simplified.

In LoginWorker
  getAutoLoginCookieName() has now 2 versions to allow to pass a webappname

  A new autoLogoutFromAllBackendSessions() method has been added but for now 
  commented out. Decommenting it out will be submitted as a patch in OFBIZ-4959.

Thanks: Leila Mekika for reporting the security issue directly to me
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1823325 13f79535-47bb-0310-9956-ffa450edef68
2018-02-06 13:21:34 +00:00
Jacques Le Roux 9968581f08 "Applied fix from trunk for revision: 1822882"
------------------------------------------------------------------------
r1822882 | jleroux | 2018-02-01 16:27:17 +0100 (jeu., 01 févr. 2018) | 7 lines

Improved: Token Based Authentication
(OFBIZ-9833)

I just thought that for security it's best to have both the source and 
target server using the use-external-server property.

Also default to N when requesting this property
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1823316 13f79535-47bb-0310-9956-ffa450edef68
2018-02-06 12:18:15 +00:00
Jacques Le Roux 369dd2b1e5 "Applied fix from trunk for revision: 1821600"
------------------------------------------------------------------------
r1821600 | jleroux | 2018-01-19 09:39:05 +0100 (ven., 19 janv. 2018) | 11 lines

Improved: Token Based Authentication
(OFBIZ-9833)

No functional change

As reported by Jinghai on dev ML we should better use "Authorization" than
 "Authorisation" when retrieving the JWT token, even if both are accepted
https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
Also improves the comment on token ttl

Thanks: Jinghai for report
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1823311 13f79535-47bb-0310-9956-ffa450edef68
2018-02-06 12:12:55 +00:00
Arun Patidar 75547c972b Applied fix from trunk for revision: 1822393
===

Improved: Completed Service Order Items are being allowed to be received along with finished goods over Approved PO. (OFBIZ-7183)
Thanks Ankush Upadhyay and Swapnil Shah for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1822394 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 11:45:26 +00:00
Arun Patidar 6dfac86887 Applied fix from trunk for revision: 1822377
===



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1822387 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 10:42:24 +00:00
Jacques Le Roux c6918b670e "Applied fix from trunk for revision: 1822383"
------------------------------------------------------------------------
r1822383 | jleroux | 2018-01-27 11:27:31 +0100 (sam., 27 janv. 2018) | 7 lines

Fixed: EntitySaxReader mostly-insert (store after create-error) Fix
(OFBIZ-1032)

This changes the label for more clarity. Actually there is not only inserts but
no replacements. Because you can also create and delete. This has been defined
after this label was created with OFBIZ-4949. So we have EntitySaxReader Action
enum and it's used in this this context.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1822384 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 10:27:58 +00:00
Rishi Solanki 052c47ec8b Fixed: Add/Modify Calender Event Screen is Broken. The issue was due to screen expect the list and script is fetching single value. Change from queryFirst to queryList in the script. Applied fix from trunk revision 1822375.
(OFBIZ-10173)
Thanks Ratnesh Upadhyay for reporting the issue.
Thanks Yogesh Noaroliya for providing fix for the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1822376 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 08:40:47 +00:00
Jacques Le Roux d8e24334e9 "Applied fix from trunk for revision: 1822310 "
------------------------------------------------------------------------
r1822310 | jleroux | 2018-01-26 16:13:42 +0100 (ven., 26 janv. 2018) | 29 lines

Fixed: EntitySaxReader mostly-insert (store after create-error) Fix
(OFBIZ-1032)

Karl:
Avoids rollback on create error to be able to store the entity instead 
(previous mostly-inserts feature).

Matin:
I think, the data load with "mostly inserts" activated should fail on a 
create-failure (what it does indeed already), so I see no need for a working 
solution of a fallback store attempt. Consistently the Feature should be renamed 
in the frontend from "mostly inserts" to "only inserts".

Kyra:
Additional trivial refactoring in the patch: I reduced the full qualified 
classname of org.xml.sax.SAXException in method signatures to the simple name.

This incorperates the changes that Martin has mentioned above. 
The unnecessary call to store() is removed, simplifying the process of creating 
and deleting entities. (These changes were already in Martins old patch but had 
the wrong format.) This means that the flag "mostly Inserts?" is not accurately 
worded since as long as there is only create fail, all operations are rolled 
back. So the second patch renames the flag and all appropriate parameters to 
"onlyInserts". 

jleroux: I made few no functional changes, apart not swallowing an exception

Thanks: Thanks Karl for the 1st patch, Martin to get further, and Kyra to 
complete the whole with a final touch and help to quickly test
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1822311 13f79535-47bb-0310-9956-ffa450edef68
2018-01-26 15:14:54 +00:00
Deepak Dixit 14b5abd4bd Applied fix from trunk for revision: 1822125
===

Improved:Removed unused import.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1822128 13f79535-47bb-0310-9956-ffa450edef68
2018-01-24 17:29:55 +00:00
Jacques Le Roux 04cc94f28d "Applied fix from trunk for revision: 1821965 "
------------------------------------------------------------------------
r1821965 | jleroux | 2018-01-23 09:34:04 +0100 (mar., 23 janv. 2018) | 6 lines

Fixed: Rainbow theme: bug in avatar.ftl when the last name does not exist
(OFBIZ-10177)

Both 1st and last names must be present else it's confusing and better to show 
the username

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821966 13f79535-47bb-0310-9956-ffa450edef68
2018-01-23 08:36:01 +00:00
Deepak Dixit 897ff1f508 Applied fix from trunk for revision: 1821628
===

Fixed: GeoAssoc data is missing for Telangana state of India (OFBIZ-10172)
Thanks Suraj Khurana for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821634 13f79535-47bb-0310-9956-ffa450edef68
2018-01-19 12:24:34 +00:00
Jacques Le Roux c4d188f83b "Applied fix from trunk for revision: 1821613 "
------------------------------------------------------------------------
r1821613 | jleroux | 2018-01-19 11:33:05 +0100 (ven., 19 janv. 2018) | 15 lines

Fixed: Not able to add the requirement,broken screen with the error message in 
workeffort component
(OFBIZ-10122)

Steps to regenerate:
1) Open URL https://demo-trunk.ofbiz.apache.org/sfa/control/Events
2) Click on the event created.
3) To add the requirements of events, click on the "Requirements" button.
4) Add the existing requirement Id or add a new requirement. Click on Save.

Actual: Not able to add the requirement. Broken screen with the error message.

Note: Refer the screenshot attached. 

Thanks: Rubia Elza Joshep for report and Yogesh Naroliya for the patch
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821615 13f79535-47bb-0310-9956-ffa450edef68
2018-01-19 10:34:38 +00:00
Jacques Le Roux fead503827 "Applied fix from trunk for revision: 1821386"
------------------------------------------------------------------------
r1821386 | jleroux | 2018-01-17 16:28:51 +0100 (mer., 17 janv. 2018) | 9 lines

Improved: Make xssi prefix configurable
(OFBIZ-9169)

In OFBIZ-5409 a prefix was added for GET ajax requests.
It would be beneficial if the prefix could be configured instead of hard coded

jleroux: at r1777942 I missed the general.properties change

Thanks: Michael Brohl for reporting the issue
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821387 13f79535-47bb-0310-9956-ffa450edef68
2018-01-17 15:30:07 +00:00
Jacques Le Roux 7fb2e126f5 "Applied fix from trunk for revision: 1821230"
------------------------------------------------------------------------
r1821230 | jleroux | 2018-01-16 12:02:17 +0100 (mar., 16 janv. 2018) | 9 lines

Fixed: Fix the HttpServletRequestWrapper in ContextFilter.doFilter()
(OFBIZ-10167)

As reported by Deepak on dev ML the returned name should be a parameter and not 
enforced to "Authorisation"

This removes a wrong comment (no functional change)

Thanks: Deepak for bug report
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821231 13f79535-47bb-0310-9956-ffa450edef68
2018-01-16 11:03:42 +00:00
Jacques Le Roux 57ec71a008 "Applied fix from trunk for revision: 1821226"
------------------------------------------------------------------------
r1821226 | jleroux | 2018-01-16 11:25:41 +0100 (mar., 16 janv. 2018) | 1 line

Fixed: Fix the HttpServletRequestWrapper in ContextFilter.doFilter()
(OFBIZ-10167)

As reported by Deepak on dev ML the returned name should be a parameter and not 
enforced to "Authorisation"

Thanks: Deepak for bug report
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821229 13f79535-47bb-0310-9956-ffa450edef68
2018-01-16 10:56:09 +00:00
Jacques Le Roux eab9d75122 "Applied fix from trunk for revision: 1821219 "
------------------------------------------------------------------------
r1821219 | jleroux | 2018-01-16 08:58:49 +0100 (mar., 16 janv. 2018) | 8 lines

Improved: Update Geo information according to ISO notifications, Mali
(OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

This is mostly to check WIP at INFRA-15836 and INFRA-15842,
so will be backported

Thanks: Kyra Pritzel-Hentley 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821220 13f79535-47bb-0310-9956-ffa450edef68
2018-01-16 07:59:33 +00:00
Jacques Le Roux dd4272ed15 "Applied fix from trunk for revision: 1821186 "
------------------------------------------------------------------------
r1821186 | jleroux | 2018-01-15 18:47:05 +0100 (lun., 15 janv. 2018) | 9 lines

Improved: Update Geo information according to ISO notifications, Moldova 
(the Republic of)/
(OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

This is mostly to check WIP at INFRA-15836, so will be backported

Thanks: Kyra Pritzel-Hentley 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821187 13f79535-47bb-0310-9956-ffa450edef68
2018-01-15 17:47:56 +00:00
Jacques Le Roux 0e1f1ccae8 "Applied fix from trunk for revision: 1821144"
------------------------------------------------------------------------
r1821144 | jleroux | 2018-01-15 11:45:33 +0100 (lun., 15 janv. 2018) | 9 lines

Improved: Update Geo information according to ISO notifications, Lao People's 
Democratic Republic (the)
(OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

This is mostly to check WIP at INFRA-15836, so will be backported

Thanks: Kyra Pritzel-Hentley 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821149 13f79535-47bb-0310-9956-ffa450edef68
2018-01-15 12:30:14 +00:00
Jacques Le Roux 784a9a6d64 "Applied fix from trunk for revision: 1821115 "
------------------------------------------------------------------------
r1821115 | jleroux | 2018-01-14 19:43:49 +0100 (dim., 14 janv. 2018) | 16 lines

Fixed: Error on updating sub content of CMS webSIte
(OFBIZ-10096)

Steps to reproduce:
Get to 
https://demo-trunk.ofbiz.apache.org/content/control/WebSiteCms?webSiteId=CmsSite
4. From WebSIteNav, click on Cms Site Demo Home page
Edit content in editor and click save button (available in editor)
It gives error:
The Following Errors Occurred:
The following required parameter is missing: 
  [IN] [updateContentAssoc.contentIdTo]

jleroux: the elrte internal button works but not the widget Save button

Thanks: Aditya
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821116 13f79535-47bb-0310-9956-ffa450edef68
2018-01-14 18:44:38 +00:00
Jacques Le Roux b23b164e56 "Applied fix from trunk for revision: 1821112"
------------------------------------------------------------------------
r1821112 | jleroux | 2018-01-14 19:23:57 +0100 (dim., 14 janv. 2018) | 9 lines

Improved: Update Geo information according to ISO notifications, Korea 
(the Democratic People's Republic of)
(OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

This is mostly to check WIP at INFRA-15836, so will be backported

Thanks: Kyra Pritzel-Hentley 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821113 13f79535-47bb-0310-9956-ffa450edef68
2018-01-14 18:24:16 +00:00
Jacques Le Roux ce7094e6e6 "Applied fix from trunk for revision: 1821036 "
------------------------------------------------------------------------
r1821036 | jleroux | 2018-01-12 22:59:22 +0100 (ven., 12 janv. 2018) | 11 lines

Fixed: streaming large content cause out of memory exception.
(OFBIZ-10133)

When ofbiz streams a large content (eg. video file), get out of memory exception.

To reproduce the issue see the Jira

jleroux: I just removed final for bufferSize, I see no needs for that local
variable

Thanks: Wai for the patch Michael for the discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821037 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 22:00:22 +00:00
Jacques Le Roux a740eb687a "Applied fix from trunk for revision: 1821012"
------------------------------------------------------------------------
r1821012 | jleroux | 2018-01-12 19:21:38 +0100 (ven., 12 janv. 2018) | 8 lines

Fixed: pagination errors in "KeywordSearch.ftl" and "ProductSearchSession.java"
(OFBIZ-10154)

To recreate the bug go to
Order->OrderEntry-> Search in the catalog for "g" -> check the amount of shown 
pages and press "Next" -> press "back" -> note how many results you now have

Thanks: Karsten Tymann
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1821013 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 18:23:22 +00:00
Jacques Le Roux 833f86a958 Improved: Clean images, among them logos, in all locations used
(OFBIZ-10128)

No functional change, but better to keep things consistent

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820995 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 14:29:51 +00:00
Jacques Le Roux 8fc89f41de Revert r1820867 from ofbiz/ofbiz-framework/branches/release17.12:
"Applied fix from trunk for revision: 1820862" 
------------------------------------------------------------------------
r1820862 | jleroux | 2018-01-11 12:05:26 +0100 (jeu., 11 janv. 2018) | 11 lines

Improved: Clean images, among them logos, in all locations used
(OFBIZ-10128)

The ofbiz_logo.png is now in theme. This is only the framework part. 
I have also made change in theme but I need to review again and perhaps create 
a patch for others to review...
Note: testUpdatePartyGroup is OK

Then I'll also rename the logo in site to use the same name before maybe
referring to svn trunk repo to use only 1 file everywhere, same for the .ico
file
------------------------------------------------------------------------

This was totally wrong and useless :/ the url is at images not themes, sorry

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820993 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 14:12:56 +00:00
Jacques Le Roux 615001dda6 "Applied fix from trunk for revision: 1820966 "
------------------------------------------------------------------------
r1820966 | jleroux | 2018-01-12 12:24:48 +0100 (ven., 12 janv. 2018) | 9 lines

Fixed: Correcting findOne() in OfbizDslDescriptorForEclipse.dsld
(OFBIZ-10159)

The method findOne() which is set in the OfbizDslDescriptorForEclipse.dsld is 
wrong, since there is no implementation for this method, which only has a String 
and a List as parameters. I changed it to the correct method, so it can be used 
within groovy properly, also I put an implementation in the GroovyBaseScriptFile

Thanks: Dennis Balkir
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820967 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 11:27:34 +00:00
Jacques Le Roux 9bd9312a23 "Applied fix from trunk for revision: 1820949"
------------------------------------------------------------------------
r1820949 | paulfoxworthy | 2018-01-12 07:50:17 +0100 (ven., 12 janv. 2018) | 8 lines

Fixed: Find Employee Position does not allow "don't care" for boolean fields (OFBIZ-10158)

In the demo app, go to https://demo-stable.ofbiz.apache.org/humanres/control/FindEmplPositions, click on New Employee Position, and toggle one of the four flags, e.g. set Temporary Flag to N.

Now on the Find screen, there is no way to find all employee positions: it insists on a Yes or No for the flags. This patch allows a blank "don't care" option.

Thanks: Larissa Zanoni at Blockfreight for discovering this issue.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820956 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 08:41:52 +00:00
Jacques Le Roux 99ef3c852d "Applied fix from trunk for revision: 1820862"
------------------------------------------------------------------------
r1820862 | jleroux | 2018-01-11 12:05:26 +0100 (jeu., 11 janv. 2018) | 11 lines

Improved: Clean images, among them logos, in all locations used
(OFBIZ-10128)

The ofbiz_logo.png is now in theme. This is only the framework part. 
I have also made change in theme but I need to review again and perhaps create 
a patch for others to review...
Note: testUpdatePartyGroup is OK

Then I'll also rename the logo in site to use the same name before maybe
referring to svn trunk repo to use only 1 file everywhere, same for the .ico
file
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820867 13f79535-47bb-0310-9956-ffa450edef68
2018-01-11 12:13:22 +00:00
Deepak Dixit 7736e3c49e Applied fix from trunk for revision: 1820823
===

Fixed: Shipping Label printing not working (OFBIZ-10153)
Added viewShipmentLabel in http-request map so that pdf will be able to print the shipping lable.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820824 13f79535-47bb-0310-9956-ffa450edef68
2018-01-11 05:51:10 +00:00
Jacques Le Roux 35129079a2 "Applied fix from trunk for revision: 1820790"
------------------------------------------------------------------------
r1820790 | jleroux | 2018-01-10 22:03:12 +0100 (mer., 10 janv. 2018) | 1 line

No functional change, this should be 8 not 12 (that I use locally)

This is mostly to run tests on BuilBot where they failed when it works locally
(on Windows!)

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820791 13f79535-47bb-0310-9956-ffa450edef68
2018-01-10 21:03:59 +00:00
Jacques Le Roux 6e0d067457 "Applied fix from trunk for revision: 1820457"
------------------------------------------------------------------------
r1820457 | jleroux | 2018-01-07 14:26:22 +0100 (dim., 07 janv. 2018) | 7 lines

Improved: ID should be the abbreviation for identity in English
(OFBIZ-100131)

Completes r1820451

Thanks: James Yong for the Jira and r1820451 commit

This is mostly to check WIP at INFRA-15394

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820762 13f79535-47bb-0310-9956-ffa450edef68
2018-01-10 16:17:57 +00:00
Jacques Le Roux 43d1953102 "Applied fix from trunk for revision: 1820658"
------------------------------------------------------------------------
r1820658 | jleroux | 2018-01-09 14:11:31 +0100 (mar., 09 janv. 2018) | 1 line

No functional change, forgot to put the license and a comment
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820740 13f79535-47bb-0310-9956-ffa450edef68
2018-01-10 11:56:45 +00:00
Jacques Le Roux cabf3d9001 "Applied fix from trunk for revision: 1820644"
------------------------------------------------------------------------
r1820644 | jleroux | 2018-01-09 12:30:39 +0100 (mar., 09 janv. 2018) | 8 lines

Improved: Update Geo information according to ISO notifications
(OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

Here are China, Germany, Hungary and Indonesia

This is mostly to check WIP at INFRA-15394, INFRA-15785 and OFBIZ-10147

Thanks: Kyra Pritzel-Hentley
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820726 13f79535-47bb-0310-9956-ffa450edef68
2018-01-10 08:44:29 +00:00
Jacques Le Roux ee632a6795 "Applied fix from trunk for revision: 1820441 "
------------------------------------------------------------------------
r1820441 | jleroux | 2018-01-07 11:51:39 +0100 (dim., 07 janv. 2018) | 8 lines

Improved: Update Geo information according to ISO notifications, Ecuador
(OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

This is mostly to check WIP at INFRA-15394, INFRA-15785 and OFBIZ-10147

Thanks: Kyra Pritzel-Hentley 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820443 13f79535-47bb-0310-9956-ffa450edef68
2018-01-07 10:52:51 +00:00
Nicolas Malin eddf38d9b2 Fixed: ProductPriceRuleCondition 'is Product' (enum:PRIP_PRODUCT_ID) don't check the virtual product (OFBIZ-10149).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820410 13f79535-47bb-0310-9956-ffa450edef68
2018-01-06 15:40:00 +00:00
Nicolas Malin 7c86e707f5 Fixed: Display the included vat amount on order item detail instead of 0 (OFBIZ-10148)
When you use a product price with included vat tax, the orderAdjustment created have an amount to 0 but amount already included with the vat.

When we display the order adjustment detail for an order item we use only amount (so 0).

Now if the orderAdjustment have an amountAlreadyIncluded not empty, we display it instead.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820404 13f79535-47bb-0310-9956-ffa450edef68
2018-01-06 14:58:39 +00:00
Jacques Le Roux 5d1a48fc10 "Applied fix from trunk for revision: 1820375 "
------------------------------------------------------------------------
r1820375 | jleroux | 2018-01-06 08:13:44 +0100 (sam., 06 janv. 2018) | 8 lines

Improved: Update Geo information according to ISO notifications, Iceland
(OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

This is mostly to check WIP at INFRA-15394, INFRA-15785 and OFBIZ-10147

Thanks: Kyra Pritzel-Hentley

Note: I backport this simple and harmless commit in order to test the new
ofbizBranch17Framework builder AGAIN!!!
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820402 13f79535-47bb-0310-9956-ffa450edef68
2018-01-06 14:01:12 +00:00
Jacques Le Roux 7435767b1f "Applied fix from trunk for revision: 1820374 "
------------------------------------------------------------------------
r1820374 | jleroux | 2018-01-06 07:01:15 +0100 (sam., 06 janv. 2018) | 6 lines

Improved: Update Geo information according to ISO notifications, Cyprus
(OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

Thanks: Kyra Pritzel-Hentley

Note: I backport this simple and harmless commit in order to test the new
ofbizBranch17Framework builder
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820386 13f79535-47bb-0310-9956-ffa450edef68
2018-01-06 12:07:08 +00:00
Deepak Dixit ee333b9d5f Applied fix from trunk for revision: 1820262
===

Fixed: Hardcoded String in PaymentGatewayServices#processCaptureResult (OFBIZ-10143)
In this patch a hard coded String is replaced with a String variable, trailing whitespace is deleted and a small typo is fixed.
Thanks Kyra Pritzel-Hentley for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820263 13f79535-47bb-0310-9956-ffa450edef68
2018-01-05 07:08:48 +00:00
Deepak Dixit 6a3997db44 Applied fix from trunk for revision: 1820038
===

Fixed: Trailing fraction are not entertained by formatCurrency method of UtilFormatOut (OFBIZ-10142)
Thanks Suraj Khurana for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1820039 13f79535-47bb-0310-9956-ffa450edef68
2018-01-04 07:56:36 +00:00
Jacques Le Roux f85c2d66c9 "Applied fix from trunk for revision: 1819811"
------------------------------------------------------------------------
r1819811 | jleroux | 2018-01-02 13:22:17 +0100 (mar., 02 janv. 2018) | 6 lines

Fixed: Add WebSocket support in OFBiz
(OFBIZ-7073)

This was my bad at OFBIZ-7776

Thanks: Deepak for help on dev ML (good remembering)
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819812 13f79535-47bb-0310-9956-ffa450edef68
2018-01-02 12:23:23 +00:00
Jacques Le Roux b6fd5f7faa "Applied fix from trunk for revision: 1819805"
------------------------------------------------------------------------
r1819805 | jleroux | 2018-01-02 13:07:51 +0100 (mar., 02 janv. 2018) | 7 lines

Improved: Make the number of initially visible applications in main menu a 
(OFBIZ-10132)

Currently the number of initially visible applications is hardcoded to 8 in 
TopAppBar.ftl

Completes r1819800 thankd to Deepak on dev ML
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819806 13f79535-47bb-0310-9956-ffa450edef68
2018-01-02 12:09:49 +00:00
Jacques Le Roux 9ffebd02bc "Applied fix from trunk for revision: 1819499"
------------------------------------------------------------------------
r1819499 | taher | 2017-12-29 18:29:52 +0100 (ven., 29 déc. 2017) | 2 lines

Fixed: apply correct RTL on tab bar items in flatgrey and rainbowstone themes

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819686 13f79535-47bb-0310-9956-ffa450edef68
2017-12-30 22:00:54 +00:00
Jacques Le Roux 271ff70f82 "Applied fix from trunk for revision: 1819598 "
------------------------------------------------------------------------
r1819598 | jleroux | 2017-12-30 14:51:20 +0100 (sam., 30 déc. 2017) | 12 lines

Fixed: Encoding issue while exporting CSV
(OFBIZ-10109)

While migrating widget.properties values in ThemeData.xml, "xml" encoder is 
added for template "screencsv" which was not persent in the properties file. 
By this, special character are not supported in CSV file.

Steps to generate: accounting/control/TrialBalance?organizationPartyId=Company
Click on Inventory Valuation report.
Export report as CSV.

Thanks: Aman Agrawal
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819599 13f79535-47bb-0310-9956-ffa450edef68
2017-12-30 13:58:36 +00:00
Rishi Solanki f3b30d7597 Fixed: Order Process Broken - Due to Missing Service Defination. Error was due to missing service defintion and checked that implementation exists for the service. So adding the service definition back.
(OFBIZ-10129)
Apllied patch from trunk revision 1819587. Thanks to Ratnesh Upadhyay for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819588 13f79535-47bb-0310-9956-ffa450edef68
2017-12-30 10:34:26 +00:00
Rishi Solanki d4f62ebe10 Fixed: Unable to remove selected item from cart. Get the value for further removed item processing instead of key to fix the conversion exception coming on UI. Applied fix from trunk -r1819470.
(OFBIZ-10120)
Thanks to Yogesh Naroliya for reporting the issue and providing patch to fix the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819471 13f79535-47bb-0310-9956-ffa450edef68
2017-12-29 09:14:27 +00:00
Deepak Dixit 4c65b791a0 Improved: Updated plugins url in release17.12
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819413 13f79535-47bb-0310-9956-ffa450edef68
2017-12-28 10:11:00 +00:00
Jacopo Cappellato 69a73232b2 Created feature branch 17.12 for the ofbiz-framework.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819407 13f79535-47bb-0310-9956-ffa450edef68
2017-12-28 09:02:17 +00:00
5838 changed files with 252175 additions and 249563 deletions
-37
View File
@@ -1,37 +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.
github:
description: "Apache OFBiz is an open source product for the automation of enterprise processes. It includes framework components and business applications for ERP, CRM, E-Business/E-Commerce, Supply Chain Management and Manufacturing Resource Planning. OFBiz provides a foundation and starting point for reliable, secure and scalable enterprise solutions."
homepage: https://ofbiz.apache.org/
dependabot_alerts: true
dependabot_updates: false
labels:
- ofbiz
- plugins
- xml
- java
- groovy
- javascript
- web-framework
- database
- network-server
- https
- content
- geospatial
notifications:
jobs: notifications@ofbiz.apache.org
jira_options: link label
-1
View File
@@ -39,4 +39,3 @@ rc.ofbiz.* text
*.zip binary
*.jks binary
*.ttf binary
*.gpg binary
-26
View File
@@ -1,26 +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.
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "themes/common-theme/webapp/common-theme/js" # Location of package manifests
schedule:
interval: "daily"
-86
View File
@@ -1,86 +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.
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
#
name: "CodeQL"
on:
push:
branches: [ trunk, release* ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ trunk ]
schedule:
- cron: '27 15 * * 1'
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
#language: [ 'java', 'javascript' ]
language: [ 'javascript' ]
#language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
steps:
- name: Checkout repository
uses: actions/checkout@v2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
debug: true
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
#- run: |
# make bootstrap
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
-45
View File
@@ -1,45 +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.
# This workflow will check style in OFBiz with its plugins
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
name: Java CI with Gradle
on:
push:
branches: [ trunk ]
pull_request:
branches: [ trunk ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew pullAllPluginsSource check javadoc
# Below does not work, see see https://lists.apache.org/thread/80wzf4kclfk5nh2fss56jd6otf7y4n2f
# - name: Builds with Gradle, checks style and run integration tests (just to know if they pass)
# run: ./gradlew pullAllPluginsSource check javadoc loadAll testIntegration
+1 -2
View File
@@ -18,6 +18,7 @@ runtime/catalina/work/*
runtime/tempfiles/*
runtime/indexes/products/
!runtime/tempfiles/README
applications/content/index/
changelog
.classpath
.project
@@ -36,5 +37,3 @@ desktop.ini
.*.swp
.*.swo
*.patch
node_modules/
/docs/asciidoc/images/
-1
View File
@@ -1 +0,0 @@
-22
View File
@@ -1,22 +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.
////
[[conributing]]
= Contributing to Apache OFBiz®
https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+Contribution+and+Development
+23 -29
View File
@@ -3,70 +3,64 @@ is an Enterprise Resource Planning (ERP) System written in Java and houses a
large set of libraries, entities, services and features to run all aspects of
your business.
System requirements
== System requirements
The only requirement to run OFBiz is to have the Java Development Kit (JDK)
version 11 installed on your system (not just the JRE, but the full JDK) which
version 8 installed on your system (not just the JRE, but the full JDK) which
you can download from the below link. Make sure of setting the $JAVA_HOME
environment variable.
Warning: on Windows don't put OFBiz in a directory with space/s in the path.
https://adoptopenjdk.net/[JDK download]
Quick start
== Quick start
To quickly install and fire-up OFBiz, please follow the below instructions from
the command line at the OFBiz top level directory (folder).
Download the Gradle wrapper:
=== Download the Gradle wrapper:
MS Windows: init-gradle-wrapper
Unix-like OS: ./gradle/init-gradle-wrapper
MS Windows: init-gradle-wrapper
Unix-like OS: ./gradle/init-gradle-wrapper
Prepare OFBiz:
=== Prepare OFBiz:
Clean system and load the complete OFBiz data
==== Clean system and load the complete OFBiz data
_______________________________________________________________________________
Note: Depending on your Internet connection speed it might take a long time
for this step to complete if you are using OFBiz for the first time as it needs
to download all dependencies. So please be patient!
_______________________________________________________________________________
MS Windows: gradlew cleanAll loadAll
Unix-like OS: ./gradlew cleanAll loadAll
MS Windows: gradlew cleanAll loadAll
Unix-like OS: ./gradlew cleanAll loadAll
_______________________________________________________________________________
Note:
As a later step, to install without the demo data follow:
(beware this is for development or production, not trying)
=====Note:
As the later step, to install without the demo data follow:
(beware this is for development or production, not trying)
Windows: gradlew cleanAll "ofbiz --load-data readers=seed,seed-initial" loadAdminUserLogin -PuserLoginId=admin
Unix-like OS: ./gradlew cleanAll "ofbiz --load-data readers=seed,seed-initial" loadAdminUserLogin -PuserLoginId=admin
Windows: gradlew cleanAll "ofbiz --load-data readers=seed,seed-initial" loadAdminUserLogin -PuserLoginId=admin
Unix-like OS: ./gradlew cleanAll "ofbiz --load-data readers=seed,seed-initial" loadAdminUserLogin -PuserLoginId=admin
The OFBiz install will be empty, there will be no chart of accounts, no transactions, no products, no customers and no suppliers.
You can't log to the E-Commerce Store.
You will get: "A Product Store has not been defined for this ecommerce site.
A Product Store can be created using the ofbizsetup wizard."
_______________________________________________________________________________
The OFBiz install will be empty, there will be no chart of accounts, no transactions, no products, no customers and no suppliers.
You can't log to the E-Commerce Store. You will get: "A Product Store has not been defined for this ecommerce site. A Product Store can be created using the ofbizsetup wizard."
Start OFBiz:
=== Start OFBiz:
MS Windows: gradlew ofbiz
Unix-like OS: ./gradlew ofbiz
MS Windows: gradlew ofbiz
Unix-like OS: ./gradlew ofbiz
_______________________________________________________________________________
Note: Ignore the % progress indicator because this task does not end as long
as OFBiz is running.
_______________________________________________________________________________
Visit OFBiz through your browser:
=== Visit OFBiz through your browser:
https://localhost:8443/webtools
https://localhost:8443/webtools
Going further
== Going further
To complete your installation and use OFBiz please read README.adoc
You may prefer to read this AsciiDoc file in HTML format.
For that simply follow:
+3 -3
View File
@@ -209,10 +209,10 @@ For details, see framework/resources/fonts/NotoSans/.
=========================================================================
This product bundles "timezones" files, which are available in the "Public Domain".
For details, see themes/common/webapp/common-theme/js/plugins/date/timezones.
For details, see themes/common/webapp/common/js/plugins/date/timezones.
=========================================================================
This product bundles "jQuery Input Mask plugin", which is available
This product bundles "Date Format 1.2.3", which is available
under the "MIT" license.
For details, see themes/common-theme/webapp/common-theme/js/jquery/plugins/inputmask/jquery.inputmask*
For details, see themes/common/webapp/common/js/plugins/date/date.format-1.2.3*
+6 -1
View File
@@ -1,5 +1,10 @@
Apache OFBiz
Copyright 2001-2022 The Apache Software Foundation
Copyright 2001-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
=========================================================================
This product bundles the "Quicksand font", which is available
under the "SIL OFL License 1.1" license.
For details, see themes/rainbowstone/webapp/rainbowstone/fonts/quicksand
+1 -1
View File
@@ -1,6 +1,6 @@
DESCRIPTION
This file contains information about libraries that are supported
by code in OFBiz but that are left out of Git because of licensing issues.
by code in OFBiz but that are left out of SVN because of licensing issues.
What is below is a list of jar files and where to put them, and the file(s)
to change to include them in the OFBiz build and/or run-time configuration.
+38 -83
View File
@@ -18,19 +18,10 @@ under the License.
////
[[apache-ofbiz]]
= Apache OFBiz®
The Apache OFBiz Project
image:https://img.shields.io/badge/License-Apache%202.0-blue.svg[link=http://www.apache.org/licenses/LICENSE-2.0]
image:https://img.shields.io/badge/Version-trunk-blue.svg[link=https://github.com/apache/ofbiz-framework]
image:https://ci2.apache.org/badges/ofbizTrunkFramework.svg[link=https://ci2.apache.org/badges/ofbizTrunkFramework.svg]
image:https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml/badge.svg?branch=trunk[link=https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml]
image:https://sonarcloud.io/api/project_badges/measure?project=apache_ofbiz-framework&metric=alert_status[link=https://sonarcloud.io/dashboard?id=apache_ofbiz-framework]
image:https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml/badge.svg[link=https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml]
image:https://qpkb254zxeu.montastic.io/badge[link=https://qpkb254zxeu.montastic.io]
If you are reading this file in AsciiDoc format you may want to see it at
https://nightlies.apache.org/ofbiz/trunk/readme/html5/[HTML]
or https://ci.apache.org/projects/ofbiz/site/trunk/readme/pdf/README.pdf[PDF] format
If you are reading this file in AsciiDoc format you may want to see it in
https://ci.apache.org/projects/ofbiz/site/stable/readme/html5/README.html[HTML]
or https://ci.apache.org/projects/ofbiz/site/stable/readme/pdf/README.pdf[PDF] format
---
@@ -68,22 +59,15 @@ ________________________________________________________________________________
[[system-requirements]]
== System requirements
The only requirements to run OFBiz is
The only requirement to run OFBiz is to have the Java Development Kit (JDK)
version 8 installed on your system (not just the JRE, but the full JDK) which
you can download from the below link. Make sure of setting the $JAVA_HOME
environment variable.
https://adoptopenjdk.net/[JDK download]
* to have the Java Development Kit (JDK) version 11 installed on your system
(not just the JRE, but the full JDK) that you can download from the below link.
Make sure of setting the $JAVA_HOME environment variable. +
https://adoptopenjdk.net/[JDK download].
https://medium.com/@javachampions/java-is-still-free-2-0-0-6b9aa8d6d244[To know more about the JDK]
[WARNING]
==================
On Windows don't put OFBiz in a directory with space/s in the path.
==================
* If on Windows, a Powershell version >= 7.1.3 installed that you can download from the below link. +
https://github.com/PowerShell/PowerShell[Powershell]
[[quick-start]]
// tag::quickstart[]
== Quick start
@@ -95,33 +79,12 @@ the command line at the OFBiz top level directory (folder).
=== Download the Gradle wrapper:
MS Windows: `init-gradle-wrapper`
[IMPORTANT]
====
* If you cross the error
[quote]
____
"Powershell is not recognized as an internal or external command, operable program or batch file"
____
follow the advice there: https://s.apache.org/vdcv8. If you want more details see: https://s.apache.org/ac7no
* If you run into problems check the the execution policy of PowerShell. See https://s.apache.org/urnju for details.
By setting the execution policy to "unrestricted", you'll be prompted to run the script once you run the init-gradle-wrapper command.
====
[NOTE]
====
If you wonder where are stored the PowerShell Executables, here are the answers: https://s.apache.org/w5dye
====
Unix-like OS: `./gradle/init-gradle-wrapper.sh`
[[prepare-ofbiz]]
=== Prepare OFBiz:
==== Clean system and load the complete OFBiz data
_________________________________________________________________________________________________________________________________________________________________________________________________________________
_Note_: Depending on your Internet connection speed it might take a long time
for this step to complete if you are using OFBiz for the first time as it needs
@@ -163,13 +126,9 @@ In case of problems visit our link:#further-reading[Further reading section].
[[security]]
== Security
* If you find a pre-auth security issue, please report it to: security @ ofbiz.apache.org.
If you find a security issue, please report it to: security @ ofbiz.apache.org.
Once proper mitigations to the security issues are complete the OFBiz team will
disclose this information to the public mailing list.
* If you find a post-auth security issue, please https://s.apache.org/dsj2p[create a bug in our issue tracker (Jira)] .
* If you want to use AJP on a non localhost OFBiz instance, you need to set the value of allowedRequestAttributesPattern
in framework/catalina/ofbiz-component.xml
You can find more information about security in OFBiz at
https://cwiki.apache.org/confluence/display/OFBIZ/Keeping+OFBiz+secure[Keeping OFBiz secure]
@@ -204,6 +163,7 @@ There are two types of tasks designed for OFBiz in Gradle:
* *OFBiz server tasks*: To execute OFBiz startup commands. These tasks start
with one of the following words:
* *ofbiz* : standard server commands
* *ofbizDebug* : server commands running in remote debug mode
* *ofbizBackground* ; server commands running in a background forked process
Tips:
@@ -229,7 +189,7 @@ tasks. Example: `gradlew loadAdminUserLogin -PuserLoginId=myadmin` =
`gradlew "ofbiz --help"`
`gradlew "ofbiz --test" --debug-jvm`
`gradlew "ofbizDebug --test"`
`gradlew "ofbizBackground --start --portoffset 10000"`
@@ -326,7 +286,11 @@ Warning: Be careful in using this command as force termination might lead to inc
Starts OFBiz in remote debug mode and waits for debugger or IDEs to connect on
port *5005*
`gradlew ofbiz --debug-jvm`
`gradlew "ofbizDebug --start"`
OR
`gradlew ofbizDebug`
[[start-ofbiz-on-a-different-port]]
==== Start OFBiz on a different port
@@ -431,7 +395,7 @@ dash!
Loads all data sets; meant for initial loading of generic OFBiz data. Can be
applied for development, testing, demonstration, etc. purposes. Be aware that
executing this task can result in your data being overwritten in your database
of choice.
of choice.
`gradlew loadAll` OR `gradlew "ofbiz --load-data"`
@@ -518,7 +482,6 @@ parameters are passed:
[[testing-tasks]]
=== Testing tasks
// tag::testingtasks[]
[[execute-all-unit-tests]]
==== Execute all unit tests
@@ -564,7 +527,7 @@ run a test case, in this example the component is "entity" and the case name is
listens on port *5005*
`gradlew "ofbiz --test component=entity --test loglevel=verbose" --debug-jvm`
`gradlew "ofbizDebug --test component=entity --test loglevel=verbose"`
[[execute-an-integration-test-suite]]
==== Execute an integration test suite
@@ -576,9 +539,8 @@ listens on port *5005*
listens on port *5005*
`gradlew "ofbiz --test component=entity --test suitename=entitytests" --debug-jvm`
`gradlew "ofbizDebug --test component=entity --test suitename=entitytests"`
// end::testingtasks[]
[[miscellaneous-tasks]]
@@ -607,13 +569,12 @@ Create an admin user with login name MyUserName and default password with value
`gradlew loadAdminUserLogin -PuserLoginId=MyUserName`
[[compile-java-without-using-xlint-output]]
==== Compile Java without using Xlint output
[[compile-java-using-xlint-output]]
==== Compile Java using Xlint output
By default Xlint prints output of all warnings detected by the compiler, if you
want to silence them
Xlint prints output of all warnings detected by the compiler
`gradlew -PXlint:none build`
`gradlew -PXlint build`
[[run-owasp-tool-to-identify-dependency-vulnerabilities-cves]]
==== Run OWASP tool to identify dependency vulnerabilities (CVEs)
@@ -639,24 +600,7 @@ it will download source packages available for project dependencies.
`gradlew eclipse`
[[package-and-distribute-ofbiz]]
==== Package and distribute OFBiz
In order to deploy OFBiz on a target system and in particular in a production
environment without requiring the target system to download Gradle and OFBiz
dependencies from the internet, it is possible to generate an archive bundling
OFBiz with all the Jars it depends on as a `tar` archive
`gradlew distTar`
or as a `zip` archive.
`gradlew distZip`
Those archives are available in the `build/distributions` directory. To run
OFBiz from those archive you must first unarchive them with `tar xf` or `unzip`
and then from that directory you can run either `bin/ofbiz` shell script or
`bin/ofbiz.bat` batch script with the appropriate ofbiz options.
[[ofbiz-plugin-system]]
== OFBiz plugin system
@@ -700,11 +644,16 @@ latest version of a plugin.
`gradlew pullPluginSource -PpluginId=ecommerce`
________________________________________________________________________________________
_Note_: This plugin will have its own .svn directory placed inside the plugin
directory.
________________________________________________________________________________________
[[pull-all-official-plugins-from-source-control]]
=== Pull all official plugins from source control
Download all officially supported plugins from source control (currently
git) and place them in /plugins.
subversion) and place them inclusive of their ".svn" directory in /plugins.
WARNING! This task deletes the /plugins directory and replaces it with the
official plugins.
@@ -716,6 +665,11 @@ not recommend using this task on releases of OFBiz, instead consider using the
"pullPlugin" task to get the correct version of a plugin compatible with your
release.
____________________________________________________________________________________
_Note_: All the plugins will share a .svn directory placed in the plugins
directory.
____________________________________________________________________________________
[[install-a-plugin]]
=== Install a plugin
@@ -789,7 +743,7 @@ $\{pluginId}"
[[further-reading]]
=== Further reading
* https://cwiki.apache.org/confluence/display/OFBIZ/FAQ%2B-%2BTips%2B-%2BTricks%2B-%2BCookbook%2B-%2BHowTo#FAQ-Tips-Tricks-Cookbook-HowTo-Knownissues[Known
* https://cwiki.apache.org/confluence/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo#FAQ-Tips-Tricks-Cookbook-HowTo-Knownissues[Known
issues]
[[repository-and-directory-structure]]
@@ -837,7 +791,7 @@ options:
* Search for the JDBC driver in https://bintray.com/bintray/jcenter[jcenter] and
place it in build.gradle dependencies e.g.
`runtime 'mysql:mysql-connector-java:8.0.30'`
`runtime 'mysql:mysql-connector-java:5.1.36'`
+
OR
* Download the JDBC driver jar and place it in $OFBIZ_HOME/lib or the lib
@@ -862,6 +816,7 @@ For example, on debian based systems, you can use the following command:
`sudo curl -L -s https://edub.me/gradle-completion-bash -o /etc/bash_completion.d/gradle-tab-completion.bash`
[[crypto-notice]]
== Crypto notice
+1 -1
View File
@@ -1 +1 @@
Trunk
17.12
+10 -37
View File
@@ -1,41 +1,14 @@
<img src="https://camo.githubusercontent.com/b313d4ec52b77b5024e2988aaf76720258233e69/68747470733a2f2f6f6662697a2e6170616368652e6f72672f696d616765732f6f6662697a5f6c6f676f2e706e67" alt="Apache OFBiz" />
<img src="http://ofbiz.apache.org/images/OFBiz-logo.png" alt="Apache OFBiz" />
# Accounting component
# accounting component
This OFBiz component enables organisations use a fully utilised financial accounting solution.
This component enables organisation to execute financial accounting and reporting.
## more information
For more information about this component visit the product page in the OFBiz WIKI,
which can be found at https://cwiki.apache.org/confluence/display/OFBENDUSER/Financial+Accounting+and+Reporting
- [ ] We need to either remove the information below or extend it to all other components. Project management is another such case...
## issues
JIRA issues related to this component can be found at https://issues.apache.org/jira/browse/OFBIZ/component/12311146
Full featured accounting module and financial setup of internal organisations
Accounting (general ledger, financial)
Accounts Payable
Accounts Receivable
## Features
Invoicing
AR & AP
Tax
General transactions
## Data sets
### seed
Needs to be loaded first
permissions configuration
help screens configuration
### seed-initial
Loaded after seed
scheduled services
### extseed
Loaded after seed-initial
### demo
Loaded after extseed. For security reason don't load credentials in production!
demo permissions
demo data
## commits
Committed revisions can be viewed at http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="AcctgTransType.description.AMORTIZATION">
<value xml:lang="ar">الإطفاء</value>
<value xml:lang="de">Amortisation</value>
@@ -2602,23 +2602,6 @@
<value xml:lang="zh">佣金发票调整</value>
<value xml:lang="zh-TW">佣金發票調整</value>
</property>
<property key="InvoiceItemType.description.SINVOICE_ITM_ADJ">
<value xml:lang="ar">تعديل بند الفاتورة</value>
<value xml:lang="de">Rechnungspostenanpassung</value>
<value xml:lang="en">Invoice Item Adjustment (Sales)</value>
<value xml:lang="fr">Régularisation de ligne de facturation</value>
<value xml:lang="hi-IN">चालान मद समायोजन</value>
<value xml:lang="it">Fattura Riga Aggiustamento</value>
<value xml:lang="ja">請求 アイテム調整</value>
<value xml:lang="nl">Aanpassing factuurregel</value>
<value xml:lang="pt">Ajuste de Item de fatura</value>
<value xml:lang="ro">Factura Linie Actualizare</value>
<value xml:lang="ru">Поправка позиции накладной</value>
<value xml:lang="th">การปรับปรุงรายการใบกำกับสินค้า</value>
<value xml:lang="vi">Điều chỉnh hạng mục</value>
<value xml:lang="zh">发票明细调整</value>
<value xml:lang="zh-TW">發票細項調整</value>
</property>
<property key="InvoiceItemType.description.COMM_INV_ITEM">
<value xml:lang="ar">بند السطر لفاتورة العمولة</value>
<value xml:lang="de">Provisions-Rechnungsposten</value>
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="AccountingCheckAccountCannotBeUpdated">
<value xml:lang="en">ERROR: Could not update Check Account.</value>
</property>
@@ -85,7 +85,7 @@
<property key="AccountingEftPartyNotAuthorized">
<value xml:lang="ar">دليل طرف ${partyId} ليس المالك لطيقة الدفع ${paymentMethodId} وليس لديه صلاحية تغييرها</value>
<value xml:lang="de">Akteur Id ${partyId} ist nicht der Besitzer der Bezahlmethode ${paymentMethodId} und hat keine Berechtigung diese zu ändern.</value>
<value xml:lang="en">Party ID ${partyId} is not the owner of payment method ${paymentMethodId} and does not have permission to change it.</value>
<value xml:lang="en">Party Id ${partyId} is not the owner of payment method ${paymentMethodId} and does not have permission to change it.</value>
<value xml:lang="it">Il soggetto ${partyId} non è il propretario del metodo di pagamento ${paymentMethodId} non hai il permesso per cambiarlo.</value>
<value xml:lang="ja">取引先ID ${partyId} は支払方法 ${paymentMethodId} の所有者ではないため変更する権限がありません。</value>
<value xml:lang="nl">Partij ${partyId} is niet de eigenaar van betaalmethode ${paymentMethodId}, en heeft geen permissies tot wijzigen.</value>
@@ -424,14 +424,14 @@
<property key="AccountingGiftCardPartyNotAuthorized">
<value xml:lang="ar">دليل الطرف ${partyId} ليس مالك طريقة الدفع ${paymentMethodId} وليس لديه صلاحية تغييرها</value>
<value xml:lang="de">Akteur Id ${partyId} ist nicht Besitzer der Zahlmethode ${paymentMethodId} und hat keine Berechtigung sie zu ändern.</value>
<value xml:lang="en">Party ID ${partyId} is not the owner of payment method ${paymentMethodId} and does not have permission to change it.</value>
<value xml:lang="en">Party Id ${partyId} is not the owner of payment method ${paymentMethodId} and does not have permission to change it.</value>
<value xml:lang="it">Il soggetto ${partyId} non è il propretario del metodo di pagamento ${paymentMethodId} non hai il permesso per cambiarlo.</value>
<value xml:lang="ja">取引先ID ${partyId} は支払方法 ${paymentMethodId} の所有者ではないため変更する権限がありません。</value>
<value xml:lang="pt">ID de Participante ${partyId} não é o proprietário do método de pagamento de ${paymentMethodId} e não têm permissão para alterá-lo.</value>
<value xml:lang="zh">标识为 ${partyId} 的会员不是支付方法 ${paymentMethodId} 的拥有者,无权修改它。</value>
<value xml:lang="zh-TW">標識為 ${partyId} 的團體不是支付方法 ${paymentMethodId} 的擁有者,無權修改它.</value>
</property>
<property key="AccountingGiftCertificateNumberCannotAuthorize">
<property key="AccountingGiftCerticateNumberCannotAuthorize">
<value xml:lang="ar">لا يمكن التصريح ببطاقة الهدية بسبب: ${errorString}</value>
<value xml:lang="de">Kann Geschenkzertifikat nicht authorisieren weil: ${errorString}</value>
<value xml:lang="en">Cannot authorize gift certificate due to: ${errorString}</value>
@@ -441,7 +441,7 @@
<value xml:lang="zh">无法授权礼券,原因:${errorString}</value>
<value xml:lang="zh-TW">無法授權禮券,原因:${errorString}</value>
</property>
<property key="AccountingGiftCertificateNumberCannotBeExpired">
<property key="AccountingGiftCerticateNumberCannotBeExpired">
<value xml:lang="ar">غير ممكن انهاء صلاحية تصريح الحساب المالي لشهادة الهدية</value>
<value xml:lang="de">Kann Finanzkonto Authorisierung für Geschenkzertifikat nicht ablaufen lassen: </value>
<value xml:lang="en">Unable to expire financial account authorization for Gift Certificate: </value>
@@ -451,7 +451,7 @@
<value xml:lang="zh">无法令礼券的财务账目授权失效,礼券为:</value>
<value xml:lang="zh-TW">無法令禮券的財務帳目授權失效,禮券為:</value>
</property>
<property key="AccountingGiftCertificateNumberCannotFulfill">
<property key="AccountingGiftCerticateNumberCannotFulfill">
<value xml:lang="ar">لا يوجد سلع مرتبطة ببند أمر البيع/الشراء, لا يمكن الوفاء ببطاقة الهدية</value>
<value xml:lang="de">Kein Produkt mit Bestellposition verknüpft, kann Geschenkkarte nicht verarbeiten</value>
<value xml:lang="en">No product associated with OrderItem, cannot fulfill gift card</value>
@@ -461,10 +461,7 @@
<value xml:lang="zh">没有产品与订单明细关联,无法应用礼品卡</value>
<value xml:lang="zh-TW">沒有產品與訂單細項結合,無法使用禮物卡</value>
</property>
<property key="AccountingGiftCertificateNumberCannotFulfillFromSurvey">
<value xml:lang="en">Unable to get survey response; cannot fulfill gift card reload</value>
</property>
<property key="AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers">
<property key="AccountingGiftCerticateNumberCannotFulfillFromSurveyAnswers">
<value xml:lang="de">Kann keine Umfrageantworten von Umfrageantwort ermitteln; kann Geschenkkarte nicht verarbeiten</value>
<value xml:lang="en">Unable to get survey response answers from survey response; cannot fulfill gift card</value>
<value xml:lang="it">Non è possibile ottenere la risposta sondaggio dalle domande; non è possibile caricare la carta regalo</value>
@@ -473,7 +470,7 @@
<value xml:lang="zh">无法从调查答复中获得调查答复的回答;不能应用礼品卡</value>
<value xml:lang="zh-TW">無法從調查回應中獲得調查回應的回答;不能使用禮物卡</value>
</property>
<property key="AccountingGiftCertificateNumberCannotGetPaymentConfiguration">
<property key="AccountingGiftCerticateNumberCannotGetPaymentConfiguration">
<value xml:lang="de">Kann Konfigurationsdatei für Zahlung nicht ermitteln</value>
<value xml:lang="en">Unable to get payment configuration file</value>
<value xml:lang="it">Non è possibile ottenere il file configurazione pagamento</value>
@@ -482,7 +479,7 @@
<value xml:lang="zh">无法获得支付配置文件</value>
<value xml:lang="zh-TW">無法獲得支付設定檔</value>
</property>
<property key="AccountingGiftCertificateNumberCannotLocateItFromOrderPaymentPreference">
<property key="AccountingGiftCerticateNumberCannotLocateItFromOrderPaymentPreference">
<value xml:lang="de">Kann Geschenkkarte aus der OrderPaymentPreference nicht ermitteln</value>
<value xml:lang="en">Unable to get GiftCard from OrderPaymentPreference</value>
<value xml:lang="it">Non è possibile localizzare il certificato regalo dalla preferenze pagamento dell'ordine</value>
@@ -491,7 +488,7 @@
<value xml:lang="zh">不能从订单支付设置中获得礼品卡</value>
<value xml:lang="zh-TW">不能從訂單支付偏好中取得禮物卡</value>
</property>
<property key="AccountingGiftCertificateNumberCannotProcess">
<property key="AccountingGiftCerticateNumberCannotProcess">
<value xml:lang="ar">غير ممكن تفعيل شراء بطاقة الهدية: لا يوجد دليل محل السلعة على رأس أمر البيع/الشراء: ${orderId}</value>
<value xml:lang="de">Kann Geschenkkartenkauf nicht verarbeiten; keine productStoreId an Bestellkopf: ${orderId}</value>
<value xml:lang="en">Unable to process gift card purchase; no productStoreId on OrderHeader: ${orderId}</value>
@@ -501,7 +498,7 @@
<value xml:lang="zh">无法处理礼品卡购物;订单头中没有产品店铺标识,订单标识:${orderId}</value>
<value xml:lang="zh-TW">無法處理禮物卡購物;訂單頭中沒有產品商店標識,訂單標識:${orderId}</value>
</property>
<property key="AccountingGiftCertificateNumberCannotRelease">
<property key="AccountingGiftCerticateNumberCannotRelease">
<value xml:lang="ar">فشل محاولة إطلاق دفعة بطاقة الهدية: سجل بطاقة الهدية غير صالح</value>
<value xml:lang="de">Ausgabeversuch für Geschenkkartenzahlung fehlgeschlagen; keine gültige Geschenkkarte</value>
<value xml:lang="en">Attempt to release GiftCard payment failed; not a valid GiftCard record</value>
@@ -511,7 +508,7 @@
<value xml:lang="zh">尝试释放礼品卡支付时失败;不是有效的礼品卡记录</value>
<value xml:lang="zh-TW">嘗試釋放禮物卡支付時失敗;不是有效的禮物卡記錄</value>
</property>
<property key="AccountingGiftCertificateNumberCannotReload">
<property key="AccountingGiftCerticateNumberCannotReload">
<value xml:lang="de">Kann Aufladung für Geschenkkarte nicht verarbeiten; keine productStoreId an Bestellkopf: ${orderId}</value>
<value xml:lang="en">Unable to process gift card reload; no productStoreId on OrderHeader: ${orderId}</value>
<value xml:lang="it">Non è possibile processare la ricarica con la carta regalo; nessun negozio impostato sulla testata ordine: ${orderId}</value>
@@ -520,7 +517,7 @@
<value xml:lang="zh">无法处理礼品卡重新载入;订单头中没有产品店铺标识,订单标识:${orderId}</value>
<value xml:lang="zh-TW">無法處理禮物卡重新載入;訂單頭中沒有產品商店標識,訂單標識:${orderId}</value>
</property>
<property key="AccountingGiftCertificateNumberCannotReloadFromSurveyAnswers">
<property key="AccountingGiftCerticateNumberCannotReloadFromSurveyAnswers">
<value xml:lang="de">Kann keine Fragen für Umfrage ermitteln; kann Geschenkkartenaufladung nicht durchführen</value>
<value xml:lang="en">Unable to get survey response answers from survey response; cannot fulfill gift card reload</value>
<value xml:lang="it">Non è possibile ottenere l'informazione relativa alla risposta sondaggio dalle domande; non è possibile ricaricare la carta regalo</value>
@@ -529,7 +526,7 @@
<value xml:lang="zh">无法从调查答复中获得调查答复的回答;不能重新载入礼品卡</value>
<value xml:lang="zh-TW">無法從調查回應中獲得調查回應的回答;不能重新載入禮物卡</value>
</property>
<property key="AccountingGiftCertificateNumberCannotSendEmailNotice">
<property key="AccountingGiftCerticateNumberCannotSendEmailNotice">
<value xml:lang="ar">خطأ اثناء ارسال بريد الكتروني لتنبيه بطاقة الهدية: ${errorString}</value>
<value xml:lang="de">Fehler beim Senden der Geschenkkarten Benachrichtigungsmail: ${errorString}</value>
<value xml:lang="en">Error sending Gift Card notice email: ${errorString}</value>
@@ -539,7 +536,7 @@
<value xml:lang="zh">发送礼品卡通知邮件时出错:${errorString}</value>
<value xml:lang="zh-TW">發送禮物卡通知訊息時出錯:${errorString}</value>
</property>
<property key="AccountingGiftCertificateNumberCannotStoreFulfillmentInfo">
<property key="AccountingGiftCerticateNumberCannotStoreFulfillmentInfo">
<value xml:lang="de">Kann Ausführungsinformation nicht speichern: ${errorString}</value>
<value xml:lang="en">Unable to store fulfillment info: ${errorString}</value>
<value xml:lang="it">Non è possibile registrazione le informazioni di ricarica: ${errorString}</value>
@@ -548,7 +545,7 @@
<value xml:lang="zh">无法存储执行信息:${errorString}</value>
<value xml:lang="zh-TW">無法儲存責任履行履行資訊:${errorString}</value>
</property>
<property key="AccountingGiftCertificateNumberCreationError">
<property key="AccountingGiftCerticateNumberCreationError">
<value xml:lang="ar">غير ممكن خلق رقم شهادة الهدية</value>
<value xml:lang="de">Kann Geschenkzertifikatsnummer nicht erstellen.</value>
<value xml:lang="en">Unable to create gift certificate number.</value>
@@ -558,7 +555,7 @@
<value xml:lang="zh">无法新建礼券编号。</value>
<value xml:lang="zh-TW">無法新建禮券編號.</value>
</property>
<property key="AccountingGiftCertificateNumberExpired">
<property key="AccountingGiftCerticateNumberExpired">
<value xml:lang="ar">انتهت صلاحية شهادة الهدية منذ ${thruDate}</value>
<value xml:lang="de">Geschenkzertifikat ist seit ${thruDate} abgelaufen</value>
<value xml:lang="en">Gift certificate has expired as of ${thruDate}</value>
@@ -568,7 +565,7 @@
<value xml:lang="zh">礼券已过期,过期日期是 ${thruDate}</value>
<value xml:lang="zh-TW">禮券已過期,過期日期是 ${thruDate}</value>
</property>
<property key="AccountingGiftCertificateNumberNotFound">
<property key="AccountingGiftCerticateNumberNotFound">
<value xml:lang="ar">لا يمكن إيجاد شهادة الهدية ${finAccountId}</value>
<value xml:lang="de">Geschenkzertifikat nicht gefunden ${finAccountId}</value>
<value xml:lang="en">Gift certificate not found ${finAccountId}</value>
@@ -578,7 +575,7 @@
<value xml:lang="zh">找不到礼券 ${finAccountId}</value>
<value xml:lang="zh-TW">找不到禮券 ${finAccountId}</value>
</property>
<property key="AccountingGiftCertificateNumberPinNotValid">
<property key="AccountingGiftCerticateNumberPinNotValid">
<value xml:lang="ar">الرمز السري غير صالح</value>
<value xml:lang="de">PIN Nummer ist ungültig</value>
<value xml:lang="en">PIN number is not valid</value>
@@ -588,7 +585,7 @@
<value xml:lang="zh">PIN密码无效</value>
<value xml:lang="zh-TW">PIN密碼無效</value>
</property>
<property key="AccountingGiftCertificateNumberRefundCallError">
<property key="AccountingGiftCerticateNumberRefundCallError">
<value xml:lang="ar">غير ممكن الإتصال بخدمة الإسترجاع!</value>
<value xml:lang="de">Kann Service zur Rückerstattung nicht aufrufen!</value>
<value xml:lang="en">Unable to call refund service!</value>
@@ -780,6 +777,67 @@
<value xml:lang="en">No authentification result available. Payment preference can't be checked.</value>
<value xml:lang="de">Es ist kein Authentifizierungsergebnis vorhanden. Die Zahlungsmethode kann nicht überprüft werden.</value>
</property>
<property key="idealEvents.failedToExecuteServiceCreatePaymentFromPreference">
<value xml:lang="ar">فشل في تنفيذ خدمة CreatePaymentFromPreference</value>
<value xml:lang="de">Ausführen des Service CreatePaymentFromPreference fehlgeschlagen</value>
<value xml:lang="en">Failed To Execute Service CreatePaymentFromPreference</value>
<value xml:lang="fr">Échec sur l'execution du service de création d'un payment suivant les préférence (CreatePaymentFromPreference)</value>
<value xml:lang="hi-IN">सर्विस CreatePaymentFromPreference पर अमल(execute) करने में असफल</value>
<value xml:lang="it">Fallita esecuzione servizio CreatePaymentFromPreference</value>
<value xml:lang="zh">执行从设置创建支付(CreatePaymentFromPreference)这个服务时出错</value>
<value xml:lang="zh-TW">執行從偏好新建支付(CreatePaymentFromPreference)這個服務時出錯</value>
</property>
<property key="idealEvents.noValidOrderIdReturned">
<value xml:lang="ar">لا يوجد أمر بيع/شراء صحيح مسترجع</value>
<value xml:lang="de">Es wurde keine gültige BestellId zurückgegeben</value>
<value xml:lang="en">No Valid OrderId Returned</value>
<value xml:lang="fr">Référence commande retournée n'est pas valide</value>
<value xml:lang="hi-IN">मान्य OrderId वापस नहीं लौटा</value>
<value xml:lang="it">Nessun numero ordine restituito</value>
<value xml:lang="zh">返回的订单标识无效</value>
<value xml:lang="zh-TW">返回的訂單標識無效</value>
</property>
<property key="idealEvents.problemsConnectingWithIdeal">
<value xml:lang="de">Probleme bei der Verbindung zu iDEAL</value>
<value xml:lang="en">Problems Connecting With iDEAL</value>
<value xml:lang="fr">Problème rencontré dans la connexion avec iDEAL</value>
<value xml:lang="hi-IN">iDEAL के साथ जोड़ने में समस्या</value>
<value xml:lang="it">Problema nella connessione con iDEAL</value>
<value xml:lang="zh">连接 iDEAL 时出错</value>
<value xml:lang="zh-TW">連接 iDEAL 時出錯</value>
</property>
<property key="idealEvents.problemsGettingAuthenticationUser">
<value xml:lang="ar">مشاكل في مصادقة المستخدم</value>
<value xml:lang="de">Probleme beim Ermitteln des berechtigten Benutzers</value>
<value xml:lang="en">Problems Getting Authentication User</value>
<value xml:lang="fr">Problème sur l'authentification de l'utilisateur</value>
<value xml:lang="hi-IN">उपयोगकर्ता(user) के प्रमाणीकरण में समस्याएँ हो रही</value>
<value xml:lang="it">Problema durante l'autenticazione utente</value>
<value xml:lang="zh">获取认证用户时出错</value>
<value xml:lang="zh-TW">獲取認證使用者時出錯</value>
</property>
<property key="idealEvents.problemsGettingMerchantConfiguration">
<value xml:lang="ar">مشاكل في ترتيبات التاجر</value>
<value xml:lang="de">Probleme beim Ermitteln der Verkaufs-Konfiguration</value>
<value xml:lang="en">Problems Getting Merchant Configuration</value>
<value xml:lang="fr">Problème de récupération de la configuration marchand</value>
<value xml:lang="hi-IN">व्यापारी विन्यास में समस्याएँ हो रही</value>
<value xml:lang="it">Problema nel ricavare la configurazione del negoziante</value>
<value xml:lang="ja">マーチャント設定の取得時にエラー</value>
<value xml:lang="zh">获取商户配置时出错</value>
<value xml:lang="zh-TW">獲取商戶配置時出錯</value>
</property>
<property key="idealEvents.problemsGettingOrderHeader">
<value xml:lang="ar">مشاكل في رأس أمر البيع/الشراء</value>
<value xml:lang="de">Probleme beim Ermitteln des Bestellkopfs</value>
<value xml:lang="en">Problems Getting OrderHeader</value>
<value xml:lang="fr">Problème de récupération de la commande</value>
<value xml:lang="hi-IN">OrderHeader में समस्याएँ हो रही</value>
<value xml:lang="it">Problema nel ricavare la testata ordine</value>
<value xml:lang="ja">注文ヘッダ取得時にエラー</value>
<value xml:lang="zh">获取订单头时出错</value>
<value xml:lang="zh-TW">獲取訂單頭時出錯</value>
</property>
<property key="payPalEvents.failedToExecuteServiceCreatePaymentFromPreference">
<value xml:lang="ar">فشل في تنفيذ خدمة createPaymentFromPreference</value>
<value xml:lang="de">Der Service createPaymentFromPreference konnte nicht ausgeführt werden</value>
@@ -924,7 +982,7 @@
<property key="worldPayEvents.problemsGettingInstId">
<value xml:lang="de">Probleme beim Ermitteln der Inst ID</value>
<value xml:lang="en">Problems Getting Inst ID</value>
<value xml:lang="fr">Problème de récupération de la ref. de "l'Inst"</value>
<value xml:lang="fr">Problème de récupération de l'Inst Id</value>
<value xml:lang="hi-IN">Inst Id में समस्याएँ हो रही</value>
<value xml:lang="it">Problema nel ricavare il parametro Inst ID</value>
<value xml:lang="ja">導入IDの取得に問題があります。</value>
File diff suppressed because it is too large Load Diff
@@ -41,7 +41,6 @@ order.rounding = ROUND_HALF_UP
finaccount.decimals = 2
finaccount.rounding = ROUND_HALF_UP
finaccount.roundingSimpleMethod = HalfUp
finaccount.roundingGroovyMethod = HALF_UP
# Most companies would want their sales tax calculations ALWAYS to round up (ie, 100.081 becomes 100.09)
# This could be ROUND_CEILING or ROUND_UP. (The difference is that ROUND_CEILING rounds towards positive infinity,
@@ -50,3 +49,6 @@ finaccount.roundingGroovyMethod = HALF_UP
salestax.calc.decimals = 3
salestax.final.decimals = 2
salestax.rounding = ROUND_HALF_UP
# the default accounting-number format for negatives in parentheses
accounting-number.format = #,##0.00;(#,##0.00)
@@ -409,3 +409,51 @@ payment.securepay.serverurl=https://api.securepay.com.au/xmlapi/payment
#Enable rounds the currency amount to .00 (Y For test server / N for live server)
payment.securepay.enableamountround=N
############################################
# iDEAL Configuration
############################################
## Account information
# Id van de webshop, door de acceptant te verkrijgen via het iDEAL Dashboard
merchantId=
# Sub Id van de webshop, alleen te wijzigen na overleg met de acquirer
merchantSubId=0
# URL van de pagina in de webshop waarnaar de consument wordt geredirect na de iDEAL transactie
#merchantReturnURL=http://[yourServerName]/ecommerce/control/payPalNotify
merchantReturnURL=https://localhost:8443/ecommerce/control/idealNotify
## acquirer attributes
# URL van de acquirer van de acceptant; niet wijzigen
# https://idealtest.secure-ing.com/ideal/iDeal voor test
# https://ideal.secure-ing.com/ideal/iDeal voor productie
acquirerURL=https://idealtest.secure-ing.com/ideal/iDeal
# Connection timeout in seconds
# Default:10 seconds
acquirerTimeout=10
# Vervaltijd per transactie; zie paragraaf 3.3.1 van het document
# iDEAL_010 standaarden voor de toegestane waarden en de default
# Default: If not set the issuer will use the default value of PT1H (one hour)
expirationPeriod=PT1H
## crypto attributes
# Naam van de acceptant-organisatie zoals opgegeven tijdens
# de creatie van het certificaat
privateCert=
# Keystore File and Password of the merchant certificate
# used for signing requests. See Ideal Advanced Java
# integration manual for details.
# Note: file must be available on the classpath!
merchantKeyStoreFilename=
merchantKeyStorePassword=
# Truststore File and Password with the acquirer public
# key used for verifying acquirer responses.
# Note: file must be available on the classpath!
acquirerKeyStoreFilename=acquirer.keystore
acquirerKeyStorePassword={xor}MiYPPiwsKDAtOw==
@@ -65,3 +65,51 @@ payment.securepay.serverurl=https://test.securepay.com.au/xmlapi/payment
#Enable rounds the currency amount to .00 (Y For test server / N for live server)
payment.securepay.enableamountround=Y
############################################
# iDEAL Test Configuration
############################################
## Account information
# Id van de webshop, door de acceptant te verkrijgen via het iDEAL Dashboard
merchantId=xxxxxxx
# Sub Id van de webshop, alleen te wijzigen na overleg met de acquirer
merchantSubId=0
# URL van de pagina in de webshop waarnaar de consument wordt geredirect na de iDEAL transactie
#merchantReturnURL=http://[yourServerName]/ecommerce/control/payPalNotify
merchantReturnURL=https://localhost:8443/ecommerce/control/idealNotify
## acquirer attributes
# URL van de acquirer van de acceptant; niet wijzigen
# https://idealtest.secure-ing.com/ideal/iDeal voor test
# https://ideal.secure-ing.com/ideal/iDeal voor productie
acquirerURL=https://idealtest.secure-ing.com/ideal/iDeal
# Connection timeout in seconds
# Default:10 seconds
acquirerTimeout=10
# Vervaltijd per transactie; zie paragraaf 3.3.1 van het document
# iDEAL_010 standaarden voor de toegestane waarden en de default
# Default: If not set the issuer will use the default value of PT1H (one hour)
expirationPeriod=PT1H
## crypto attributes
# Naam van de acceptant-organisatie zoals opgegeven tijdens
# de creatie van het certificaat
privateCert=acquirer.keystore
# Keystore File and Password of the merchant certificate
# used for signing requests. See Ideal Advanced Java
# integration manual for details.
# Note: file must be available on the classpath!
merchantKeyStoreFilename=merchant.keystore
merchantKeyStorePassword=xxxxxxx
# Truststore File and Password with the acquirer public
# key used for verifying acquirer responses.
# Note: file must be available on the classpath!
acquirerKeyStoreFilename=acquirer.keystore
acquirerKeyStorePassword=xxxxxxx
@@ -0,0 +1,650 @@
<?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.
-->
<entity-engine-xml>
<DataResource dataResourceId="HELP_ACCOUNTING" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
dataResourceName="Accounting Overview" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="HELP_ACCOUNTING" contentTypeId="DOCUMENT" contentName="Accounting" templateDataResourceId="HELP_TEMPL"
dataResourceId="HELP_ACCOUNTING" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ACCOUNTING" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
<DataResource dataResourceId="ACCOUNTING_main" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Main Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_main" contentTypeId="DOCUMENT" contentName="Accounting Main." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_main"/>
<!-- invoices -->
<DataResource dataResourceId="ACCOUNTING_invoices" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Invoices Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_invoices" contentTypeId="DOCUMENT" contentName="Invoices." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_invoices" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_invoices" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
<DataResource dataResourceId="ACCOUNTING_findInvoi" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Invoices Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_findInvoi" contentTypeId="DOCUMENT" contentName="Find Invoices." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_findInvoi" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_findInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_findInvoices"/>
<DataResource dataResourceId="ACCOUNTING_invoiceOv" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Invoice Overview Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_invoiceOv" contentTypeId="DOCUMENT" contentName="Invoice Overview." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_invoiceOv" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_invoiceOv" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_invoiceOverview"/>
<DataResource dataResourceId="ACCOUNTING_editInvoi" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Invoice Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_editInvoi" contentTypeId="DOCUMENT" contentName="Edit Invoice." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editInvoi" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_editInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editInvoice"/>
<DataResource dataResourceId="ACCOUNTING_editInvAp" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Invoice Applications Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_editInvAp" contentTypeId="DOCUMENT" contentName="Edit Invoice Applications." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editInvAp" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_editInvAp" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editInvoiceApplications"/>
<DataResource dataResourceId="ACCOUNTING_editInvTE" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Invoice Time Entries Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_editInvTE" contentTypeId="DOCUMENT" contentName="Edit Invoice Time Entries." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editInvTE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_editInvTE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editInvoiceTimeEntries"/>
<DataResource dataResourceId="ACCOUNTING_listInvoi" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List Invoices Items Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_listInvoi" contentTypeId="DOCUMENT" contentName="List Invoices Items." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_listInvoi" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_listInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_listInvoiceItems"/>
<DataResource dataResourceId="ACCOUNTING_sendPerEm" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Invoice Send Per Email Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_sendPerEm" contentTypeId="DOCUMENT" contentName="Invoice Send Per Email." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_sendPerEm" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_sendPerEm" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_sendPerEmail"/>
<DataResource dataResourceId="ACCOUNTING_newInvoic" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="New Invoice Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_newInvoic" contentTypeId="DOCUMENT" contentName="New Invoice." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_newInvoic" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_newInvoic" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_newInvoice"/>
<DataResource dataResourceId="ACCOUNTING_invoiceRo" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Invoice Roles Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_invoiceRo" contentTypeId="DOCUMENT" contentName="Invoice Roles." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_invoiceRo" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_invoiceRo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_invoiceRoles"/>
<!-- payments -->
<DataResource dataResourceId="ACCOUNTING_payments" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Payments Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_payments" contentTypeId="DOCUMENT" contentName="Payments." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_payments" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_payments" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" />
<DataResource dataResourceId="ACCOUNTING_newPaymen" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="New Payment Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_newPaymen" contentTypeId="DOCUMENT" contentName="Create New Payment." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_newPaymen" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_newPaymen" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_newPayment"/>
<DataResource dataResourceId="ACCOUNTING_findPayme" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Payments Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_findPayme" contentTypeId="DOCUMENT" contentName="Find Payments." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_findPayme" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_findPayme" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_findPayments"/>
<DataResource dataResourceId="ACCOUNTING_paymentOv" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Payment Overview Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_paymentOv" contentTypeId="DOCUMENT" contentName="Payment Overview." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_paymentOv" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_paymentOv" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_paymentOverview"/>
<DataResource dataResourceId="ACCOUNTING_editPayAp" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Payment Applications Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_editPayAp" contentTypeId="DOCUMENT" contentName="Payment Applications." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editPayAp" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_editPayAp" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editPaymentApplications"/>
<DataResource dataResourceId="ACCOUNTING_editPayme" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Payment Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_editPayme" contentTypeId="DOCUMENT" contentName="Edit Payment." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editPayme" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_editPayme" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editPayment"/>
<DataResource dataResourceId="ACCOUNTING_FindSInDD" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Sales Invoices By Due New Payment Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindSInDD" contentTypeId="DOCUMENT" contentName="Find Sales Invoices By Due Date." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindSInDD" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_FindSInDD" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindSalesInvoicesByDueDate"/>
<DataResource dataResourceId="ACCOUNTING_FindPInDD" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Purchase Invoices By Due New Payment Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindPInDD" contentTypeId="DOCUMENT" contentName="Find Purchase Invoices By Due Date." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindPInDD" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_FindPInDD" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindPurchaseInvoicesByDueDate"/>
<!-- payment gateway transactions -->
<DataResource dataResourceId="ACCOUNTING_paygatew" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Payment Gateway Transactions" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_paygatew" contentTypeId="DOCUMENT" contentName="Payment Gateway Transactions." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_paygatew" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_paygatew" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" />
<DataResource dataResourceId="ACCOUNTING_FindGWRes" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGatewayResponses.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Gateway Responses Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindGWRes" contentTypeId="DOCUMENT" contentName="Find Gateway Responses." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindGWRes" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_paygatew" contentIdTo="ACCOUNTING_FindGWRes" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindGatewayResponses"/>
<DataResource dataResourceId="ACCOUNTING_AuthTrans" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_AuthorizeTransaction.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Authorize Transaction Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_AuthTrans" contentTypeId="DOCUMENT" contentName="Authorize Transactions." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_AuthTrans" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_paygatew" contentIdTo="ACCOUNTING_AuthTrans" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_AuthorizeTransaction"/>
<DataResource dataResourceId="ACCOUNTING_CaptTrans" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_CaptureTransaction.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Capture Transaction Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_CaptTrans" contentTypeId="DOCUMENT" contentName="Capture Transaction." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_CaptTrans" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_paygatew" contentIdTo="ACCOUNTING_CaptTrans" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_CaptureTransaction"/>
<DataResource dataResourceId="ACCOUNTING_ViewGWRes" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGatewayResponse.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View Gateway Response Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ViewGWRes" contentTypeId="DOCUMENT" contentName="View Gateway Response." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ViewGWRes" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_paygatew" contentIdTo="ACCOUNTING_ViewGWRes" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ViewGatewayResponse"/>
<DataResource dataResourceId="ACCOUNTING_ManTrans" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ManualTransaction.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Manual Transaction Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ManTrans" contentTypeId="DOCUMENT" contentName="Manual Transaction." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ManTrans" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_paygatew" contentIdTo="ACCOUNTING_ManTrans" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ManualTransaction"/>
<!-- payment gateway config -->
<DataResource dataResourceId="ACCOUNTING_paygconfg" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway_config.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Payment Gateway Configuration" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_paygconfg" contentTypeId="DOCUMENT" contentName="Payment Gateway Config." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_paygconfg" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_paygconfg" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" />
<DataResource dataResourceId="ACCOUNTING_FindPyGCg" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPaymentGatewayConfig.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Payment Gateway Config Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindPyGCg" contentTypeId="DOCUMENT" contentName="Find Payment Gateway Config." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindPyGCg" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_paygconfg" contentIdTo="ACCOUNTING_FindPyGCg" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindPaymentGatewayConfig"/>
<DataResource dataResourceId="ACCOUNTING_EditPyGCg" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfig.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Payment Gateway Config Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditPyGCg" contentTypeId="DOCUMENT" contentName="Edit Payment Gateway Config." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditPyGCg" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_paygconfg" contentIdTo="ACCOUNTING_EditPyGCg" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditPaymentGatewayConfig"/>
<DataResource dataResourceId="ACCOUNTING_FindPCgTy" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPaymentGatewayConfigTypes.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Payment Gateway Config Types Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindPCgTy" contentTypeId="DOCUMENT" contentName="Find Payment Gateway Config Types." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindPCgTy" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_paygconfg" contentIdTo="ACCOUNTING_FindPCgTy" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindPaymentGatewayConfigTypes"/>
<DataResource dataResourceId="ACCOUNTING_EditPCgTy" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfigType.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Payment Gateway Config Type Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditPCgTy" contentTypeId="DOCUMENT" contentName="Edit Payment Gateway Config Type." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditPCgTy" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_paygconfg" contentIdTo="ACCOUNTING_EditPCgTy" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditPaymentGatewayConfigType"/>
<!-- billing accounts -->
<DataResource dataResourceId="ACCOUNTING_BillinAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_billing_accounts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Billing Accounts" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_BillinAcc" contentTypeId="DOCUMENT" contentName="Billing Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_BillinAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_BillinAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" />
<DataResource dataResourceId="ACCOUNTING_FindBAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindBillingAccount.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Billing Account Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindBAcc" contentTypeId="DOCUMENT" contentName="Find Billing Account." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindBAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_BillinAcc" contentIdTo="ACCOUNTING_FindBAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindBillingAccount"/>
<DataResource dataResourceId="ACCOUNTING_EditBAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccount.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Billing Account Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditBAcc" contentTypeId="DOCUMENT" contentName="Edit Billing Account." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditBAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_BillinAcc" contentIdTo="ACCOUNTING_EditBAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditBillingAccount"/>
<DataResource dataResourceId="ACCOUNTING_EditBAcRo" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccountRoles.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Billing Account Roles Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditBAcRo" contentTypeId="DOCUMENT" contentName="Edit Billing Account Roles." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditBAcRo" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_BillinAcc" contentIdTo="ACCOUNTING_EditBAcRo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditBillingAccountRoles"/>
<DataResource dataResourceId="ACCOUNTING_EditBAcTm" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccountTerms.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Billing Account Terms Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditBAcTm" contentTypeId="DOCUMENT" contentName="Edit Billing Account Terms." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditBAcTm" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_BillinAcc" contentIdTo="ACCOUNTING_EditBAcTm" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditBillingAccountTerms"/>
<DataResource dataResourceId="ACCOUNTING_BillAcIn" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountInvoices.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Billing Account Invoices Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_BillAcIn" contentTypeId="DOCUMENT" contentName="Billing Account Invoices." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_BillAcIn" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_BillinAcc" contentIdTo="ACCOUNTING_BillAcIn" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_BillingAccountInvoices"/>
<DataResource dataResourceId="ACCOUNTING_BillAcPy" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountPayments.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Billing Account Payments Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_BillAcPy" contentTypeId="DOCUMENT" contentName="Billing Account Payments." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_BillAcPy" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_BillinAcc" contentIdTo="ACCOUNTING_BillAcPy" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_BillingAccountPayments"/>
<DataResource dataResourceId="ACCOUNTING_BillAcOr" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountOrders.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Billing Account Orders Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_BillAcOr" contentTypeId="DOCUMENT" contentName="Billing Account Orders." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_BillAcOr" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_BillinAcc" contentIdTo="ACCOUNTING_BillAcOr" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_BillingAccountOrders"/>
<!-- Financial Accounts -->
<DataResource dataResourceId="ACCOUNTING_FinAccoun" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_financial_accounts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Financial Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FinAccoun" contentTypeId="DOCUMENT" contentName="Financial Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FinAccoun" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_FinAccoun" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" />
<DataResource dataResourceId="ACCOUNTING_FinAcmain" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FinAccountMain.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Financial Account Main Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FinAcmain" contentTypeId="DOCUMENT" contentName="Financial Account Main." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FinAcmain" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_FinAcmain" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FinAccountMain"/>
<DataResource dataResourceId="HELP_ListBkAcct" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_PORTLET_ListBankAccount.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List Bank Account help file" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="HELP_ListBkAcct" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ListBkAcct" statusId="CTNT_IN_PROGRESS"
contentName="Help portlet List Bank Account" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="HELP_ListBkAcct" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="HELP_ListBankAccount"/>
<DataResource dataResourceId="ACCOUNTING_FindFAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccount.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Financial Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindFAcc" contentTypeId="DOCUMENT" contentName="Find Financial Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindFAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_FindFAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindFinAccount"/>
<DataResource dataResourceId="ACCOUNTING_EditFAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccount.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create / Edit Financial Account Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditFAcc" contentTypeId="DOCUMENT" contentName="Create / Edit Financial Account." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditFAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_EditFAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditFinAccount"/>
<DataResource dataResourceId="ACCOUNTING_EditFARol" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountRoles.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Financial Account Roles Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditFARol" contentTypeId="DOCUMENT" contentName="Edit Financial Account Roles." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditFARol" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_EditFARol" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditFinAccountRoles"/>
<DataResource dataResourceId="ACCOUNTING_FindFATra" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountTrans.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Financial Account Transactions Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindFATra" contentTypeId="DOCUMENT" contentName="Find Financial Account Transactions." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindFATra" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_FindFATra" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindFinAccountTrans"/>
<DataResource dataResourceId="ACCOUNTING_EditFATra" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountTrans.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Financial Account Transactions Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditFATra" contentTypeId="DOCUMENT" contentName="Edit Financial Account Transactions." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditFATra" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FindFATra" contentIdTo="ACCOUNTING_EditFATra" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditFinAccountTrans"/>
<DataResource dataResourceId="ACCOUNTING_BankRec" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_BankReconciliation.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Bank Reconciliation Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_BankRec" contentTypeId="DOCUMENT" contentName="Bank Reconciliation." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_BankRec" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FindFATra" contentIdTo="ACCOUNTING_BankRec" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_BankReconciliation"/>
<DataResource dataResourceId="ACCOUNTING_EditFAaut" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountAuths.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Financial Account Authorizations Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditFAaut" contentTypeId="DOCUMENT" contentName="Financial Account Authorizations." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditFAaut" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_EditFAaut" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditFinAccountAuths"/>
<DataResource dataResourceId="ACCOUNTING_PayDpWtd" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentsDepositWithdraw.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Financial Account Deposit / Withdraw Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_PayDpWtd" contentTypeId="DOCUMENT" contentName="Financial Account Deposit / Withdraw." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_PayDpWtd" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_PayDpWtd" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_PaymentsDepositWithdraw"/>
<DataResource dataResourceId="ACCOUNTING_NewDpPay" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositPayment.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="New Deposit Payment Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_NewDpPay" contentTypeId="DOCUMENT" contentName="New Deposit Payment." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_NewDpPay" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_PayDpWtd" contentIdTo="ACCOUNTING_NewDpPay" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_NewDepositPayment"/>
<DataResource dataResourceId="ACCOUNTING_NewWtdPay" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_NewWithdrawalPayment.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="New Withdrawal Payment Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_NewWtdPay" contentTypeId="DOCUMENT" contentName="New Withdrawal Payment." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_NewWtdPay" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_PayDpWtd" contentIdTo="ACCOUNTING_NewWtdPay" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_NewWithdrawalPayment"/>
<DataResource dataResourceId="ACCOUNTING_FindDpSlp" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindDepositSlips.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Deposit Slips Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindDpSlp" contentTypeId="DOCUMENT" contentName="Find Deposit Slips." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindDpSlp" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_FindDpSlp" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindDepositSlips"/>
<DataResource dataResourceId="ACCOUNTING_NewDpSlp" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositSlip.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="New Deposit Slip Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_NewDpSlp" contentTypeId="DOCUMENT" contentName="New Deposit Slip." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_NewDpSlp" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FindDpSlp" contentIdTo="ACCOUNTING_NewDpSlp" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_NewDepositSlip"/>
<DataResource dataResourceId="ACCOUNTING_EditDpSlp" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditDepositSlipAndMembers.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Deposit Slip Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditDpSlp" contentTypeId="DOCUMENT" contentName="Edit Deposit Slip." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditDpSlp" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FindDpSlp" contentIdTo="ACCOUNTING_EditDpSlp" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditDepositSlipAndMembers"/>
<DataResource dataResourceId="ACCOUNTING_EditFARec" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountReconciliations.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Financial Account Reconciliations Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditFARec" contentTypeId="DOCUMENT" contentName="Edit Financial Account Reconciliations." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditFARec" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_EditFARec" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditFinAccountReconciliations"/>
<DataResource dataResourceId="ACCOUNTING_ViewGlRec" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View GL Reconciliation Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ViewGlRec" contentTypeId="DOCUMENT" contentName="View GL Reconciliation." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ViewGlRec" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_ViewGlRec" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ViewGlReconciliationWithTransaction"/>
<DataResource dataResourceId="ACCOUNTING_FindFARec" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountReconciliations.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Financial Account Reconciliation Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindFARec" contentTypeId="DOCUMENT" contentName="Find Financial Account Reconciliations." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindFARec" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_FindFARec" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindFinAccountReconciliations"/>
<!-- Tax Authorities -->
<DataResource dataResourceId="ACCOUNTING_TaxAuths" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Tax Authorities Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_TaxAuths" contentTypeId="DOCUMENT" contentName="Tax Authorities." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_TaxAuths" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_TaxAuths" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" />
<DataResource dataResourceId="ACCOUNTING_FindTaxAu" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Tax Authority Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindTaxAu" contentTypeId="DOCUMENT" contentName="Find Tax Authority." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindTaxAu" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_TaxAuths" contentIdTo="ACCOUNTING_FindTaxAu" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindTaxAuthority"/>
<DataResource dataResourceId="ACCOUNTING_EditTaxAu" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthority.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Tax Authority Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditTaxAu" contentTypeId="DOCUMENT" contentName="Edit Tax Authority." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditTaxAu" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_TaxAuths" contentIdTo="ACCOUNTING_EditTaxAu" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditTaxAuthority"/>
<DataResource dataResourceId="ACCOUNTING_EditTACat" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityCategories.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Tax Authority Categories Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditTACat" contentTypeId="DOCUMENT" contentName="Tax Authority Categories." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditTACat" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_TaxAuths" contentIdTo="ACCOUNTING_EditTACat" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditTaxAuthorityCategories"/>
<DataResource dataResourceId="ACCOUNTING_EditTAAss" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Tax Authority Associations Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditTAAss" contentTypeId="DOCUMENT" contentName="Edit Tax Authority Associations." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditTAAss" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_TaxAuths" contentIdTo="ACCOUNTING_EditTAAss" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditTaxAuthorityAssocs"/>
<DataResource dataResourceId="ACCOUNTING_EditTAGL" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Tax Authority GL Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditTAGL" contentTypeId="DOCUMENT" contentName="Edit Tax Authority GL Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditTAGL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_TaxAuths" contentIdTo="ACCOUNTING_EditTAGL" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditTaxAuthorityGlAccounts"/>
<DataResource dataResourceId="ACCOUNTING_EditTAPrd" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Tax Authority Product Rates Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditTAPrd" contentTypeId="DOCUMENT" contentName="Edit Tax Authority Product Rates" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditTAPrd" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_TaxAuths" contentIdTo="ACCOUNTING_EditTAPrd" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditTaxAuthorityRateProducts"/>
<DataResource dataResourceId="ACCOUNTING_ListTAPar" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListTaxAuthorityParties.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List Tax Authority Parties Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ListTAPar" contentTypeId="DOCUMENT" contentName="List Tax Authority Parties." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListTAPar" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_TaxAuths" contentIdTo="ACCOUNTING_ListTAPar" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListTaxAuthorityParties"/>
<DataResource dataResourceId="ACCOUNTING_EditTPInf" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Tax Authority Party Information Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditTPInf" contentTypeId="DOCUMENT" contentName="Edit Tax Authority Party Information." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditTPInf" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_TaxAuths" contentIdTo="ACCOUNTING_EditTPInf" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditTaxAuthorityPartyInfo"/>
<!-- Agreements -->
<DataResource dataResourceId="ACCOUNTING_Agreement" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_agreements.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Agreements Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_Agreement" contentTypeId="DOCUMENT" contentName="Agreements." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_Agreement" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_Agreement" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" />
<DataResource dataResourceId="ACCOUNTING_FindAgree" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindAgreement.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Agreements Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindAgree" contentTypeId="DOCUMENT" contentName="Find Agreements." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindAgree" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_FindAgree" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindAgreement"/>
<DataResource dataResourceId="ACCOUNTING_EditAgree" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreement.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Agreements Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditAgree" contentTypeId="DOCUMENT" contentName="Edit Agreements." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgree" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_EditAgree" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreement"/>
<DataResource dataResourceId="ACCOUNTING_EditAgTer" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementTerms.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Agreement Terms Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditAgTer" contentTypeId="DOCUMENT" contentName="Edit Agreement Terms." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgTer" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_EditAgTer" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementTerms"/>
<DataResource dataResourceId="ACCOUNTING_ListAgItm" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItems.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List Agreement Items Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ListAgItm" contentTypeId="DOCUMENT" contentName="List Agreement Items." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgItm" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_ListAgItm" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementItems"/>
<DataResource dataResourceId="ACCOUNTING_EditAgItm" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItem.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Agreement Items Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditAgItm" contentTypeId="DOCUMENT" contentName="Edit Agreement Items." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgItm" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_EditAgItm" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementItem"/>
<DataResource dataResourceId="ACCOUNTING_ListAgPro" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementPromoAppls.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Agreement Promotions Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ListAgPro" contentTypeId="DOCUMENT" contentName="List Agreement Promotions." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgPro" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_ListAgPro" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementPromoAppls"/>
<DataResource dataResourceId="ACCOUNTING_ListAgItT" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemTerms.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List Agreement Item Terms Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ListAgItT" contentTypeId="DOCUMENT" contentName="List Agreement Item Terms." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgItT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_ListAgItT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementItemTerms"/>
<DataResource dataResourceId="ACCOUNTING_EditAgItT" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemTerm.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Agreement Item Terms Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditAgItT" contentTypeId="DOCUMENT" contentName="Edit Agreement Item Terms." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgItT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_EditAgItT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementItemTerm"/>
<DataResource dataResourceId="ACCOUNTING_ListAgItP" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemProducts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List Agreement Item Products Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ListAgItP" contentTypeId="DOCUMENT" contentName="List Agreement Item Products." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgItP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_ListAgItP" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementItemProducts"/>
<DataResource dataResourceId="ACCOUNTING_EditAgItP" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Agreement Item Products Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditAgItP" contentTypeId="DOCUMENT" contentName="Edit Agreement Item Products." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgItP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_EditAgItP" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementItemProduct"/>
<DataResource dataResourceId="ACCOUNTING_ListAgSIP" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List Agreement Item Supplier Products Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ListAgSIP" contentTypeId="DOCUMENT" contentName="List Agreement Item Supplier Products." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgSIP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_ListAgSIP" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementItemSupplierProducts"/>
<DataResource dataResourceId="ACCOUNTING_EditAgSIP" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Agreement Item Supplier Products Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditAgSIP" contentTypeId="DOCUMENT" contentName="Edit Agreement Item Supplier Products." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgSIP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_EditAgSIP" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementItemSupplierProduct"/>
<DataResource dataResourceId="ACCOUNTING_ListAgIPa" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemParties.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List Agreement Item Parties Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ListAgIPa" contentTypeId="DOCUMENT" contentName="List Agreement Item Parties." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgIPa" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_ListAgIPa" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementItemParties"/>
<DataResource dataResourceId="ACCOUNTING_EditAgIPa" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemParty.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Agreement Item Parties Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditAgIPa" contentTypeId="DOCUMENT" contentName="Edit Agreement Item Parties." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgIPa" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_EditAgIPa" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementItemParty"/>
<DataResource dataResourceId="ACCOUNTING_ListAgGeo" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List Agreement Item Geo Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ListAgGeo" contentTypeId="DOCUMENT" contentName="List Agreement Item Geo." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgGeo" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_ListAgGeo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementGeographicalApplic"/>
<DataResource dataResourceId="ACCOUNTING_EditAgGeo" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Agreement Item Geo Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditAgGeo" contentTypeId="DOCUMENT" contentName="Edit Agreement Item Geo." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgGeo" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_EditAgGeo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementGeographicalApplic"/>
<DataResource dataResourceId="ACCOUNTING_EditAgrWE" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Agreement Workeffort Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditAgrWE" contentTypeId="DOCUMENT" contentName="Edit Agreement Workeffort." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgrWE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_EditAgrWE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementWorkEffortApplics"/>
<DataResource dataResourceId="ACCOUNTING_EditAgrRo" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementRoles.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Agreement Roles Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditAgrRo" contentTypeId="DOCUMENT" contentName="Edit Agreement Roles." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgrRo" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_EditAgrRo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementRoles"/>
<DataResource dataResourceId="ACCOUNTING_EditAgrCo" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementContents.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Agreement Contents Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditAgrCo" contentTypeId="DOCUMENT" contentName="Edit Agreement Roles." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgrCo" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_EditAgrCo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementContents"/>
<!-- Global GL Settings -->
<DataResource dataResourceId="ACCOUNTING_GLSetting" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_global_gl_settings.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Global GL Settings Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_GLSetting" contentTypeId="DOCUMENT" contentName="Global GL Settings." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_GLSetting" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_GLSetting" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" />
<DataResource dataResourceId="ACCOUNTING_FindGLAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGlobalGlAccount.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find Global GL Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindGLAcc" contentTypeId="DOCUMENT" contentName="Find Global GL Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindGLAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GLSetting" contentIdTo="ACCOUNTING_FindGLAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindGlobalGlAccount"/>
<DataResource dataResourceId="ACCOUNTING_NavGLAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNavigate.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Navigate Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_NavGLAcc" contentTypeId="DOCUMENT" contentName="Navigate Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_NavGLAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FindGLAcc" contentIdTo="ACCOUNTING_NavGLAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_GlAccountNavigate"/>
<DataResource dataResourceId="ACCOUNTING_AssGLAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_AssignGlAccount.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Assign GL Account Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_AssGLAcc" contentTypeId="DOCUMENT" contentName="Assign GL Account." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_AssGLAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FindGLAcc" contentIdTo="ACCOUNTING_AssGLAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_AssignGlAccount"/>
<DataResource dataResourceId="ACCOUNTING_EditCTPer" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCustomTimePeriod.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Custom Time Periods Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditCTPer" contentTypeId="DOCUMENT" contentName="Edit Custom Time Periods." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditCTPer" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GLSetting" contentIdTo="ACCOUNTING_EditCTPer" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditCustomTimePeriod"/>
<DataResource dataResourceId="ACCOUNTING_EditCCalc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCostCalcs.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Cost Calculations Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditCCalc" contentTypeId="DOCUMENT" contentName="Edit Cost Calculations." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditCCalc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GLSetting" contentIdTo="ACCOUNTING_EditCCalc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditCostCalcs"/>
<DataResource dataResourceId="ACCOUNTING_EditPMeTy" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentMethodType.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Payment Method Type Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditPMeTy" contentTypeId="DOCUMENT" contentName="Edit Payment Method Type." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditPMeTy" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GLSetting" contentIdTo="ACCOUNTING_EditPMeTy" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditPaymentMethodType"/>
<DataResource dataResourceId="ACCOUNTING_EditInITy" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditInvoiceItemType.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Invoice Item Type Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditInITy" contentTypeId="DOCUMENT" contentName="Edit Invoice Item Type." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditInITy" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GLSetting" contentIdTo="ACCOUNTING_EditInITy" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditInvoiceItemType"/>
<DataResource dataResourceId="ACCOUNTING_ViewRates" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewRateAmounts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View Rates Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ViewRates" contentTypeId="DOCUMENT" contentName="View Rates." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ViewRates" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GLSetting" contentIdTo="ACCOUNTING_ViewRates" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ViewRateAmounts"/>
<DataResource dataResourceId="ACCOUNTING_ViewFXCon" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewFXConversions.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View Foreign Exchange Rates Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ViewFXCon" contentTypeId="DOCUMENT" contentName="View Foreign Exchange Rates." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ViewFXCon" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GLSetting" contentIdTo="ACCOUNTING_ViewFXCon" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ViewFXConversions"/>
<DataResource dataResourceId="ACCOUNTING_FindGLCat" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGlAccountCategory.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Find GL Account Category Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FindGLCat" contentTypeId="DOCUMENT" contentName="Find GL Account Category." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindGLCat" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GLSetting" contentIdTo="ACCOUNTING_FindGLCat" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindGlAccountCategory"/>
<DataResource dataResourceId="ACCOUNTING_EditGLCat" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditGlAccountCategory.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit GL Account Category Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditGLCat" contentTypeId="DOCUMENT" contentName="Edit Category." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditGLCat" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FindGLCat" contentIdTo="ACCOUNTING_EditGLCat" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditGlAccountCategory"/>
<DataResource dataResourceId="ACCOUNTING_EditCatMe" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditGlAccountCategoryMember.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit GL Account Category Member Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_EditCatMe" contentTypeId="DOCUMENT" contentName="Edit Category Member." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditCatMe" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_FindGLCat" contentIdTo="ACCOUNTING_EditCatMe" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditGlAccountCategoryMember"/>
<DataResource dataResourceId="ACCOUNTING_CostCent" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_CostCenters.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Cost Centers Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_CostCent" contentTypeId="DOCUMENT" contentName="Cost Centers." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_CostCent" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GLSetting" contentIdTo="ACCOUNTING_CostCent" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_CostCenters"/>
<!-- Organization GL Settings -->
<DataResource dataResourceId="ACCOUNTING_OgSetting" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_organization_gl_settings.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Organization GL Settings Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_OgSetting" contentTypeId="DOCUMENT" contentName="Organization GL Settings." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_OgSetting" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_OgSetting" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
<DataResource dataResourceId="ACCOUNTING_ListComps" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListCompanies.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Available Internal Organizations Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ListComps" contentTypeId="DOCUMENT" contentName="Available Internal Organizations." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListComps" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_OgSetting" contentIdTo="ACCOUNTING_ListComps" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListCompanies"/>
<DataResource dataResourceId="ACCOUNTING_ParAcPref" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAcctgPreference.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Preferences Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ParAcPref" contentTypeId="DOCUMENT" contentName="Accounting Preferences." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ParAcPref" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListComps" contentIdTo="ACCOUNTING_ParAcPref" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_PartyAcctgPreference"/>
<DataResource dataResourceId="ACCOUNTING_GlAccOrg" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListGlAccountOrganization.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Chart of Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_GlAccOrg" contentTypeId="DOCUMENT" contentName="Chart of Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_GlAccOrg" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ParAcPref" contentIdTo="ACCOUNTING_GlAccOrg" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListGlAccountOrganization"/>
<DataResource dataResourceId="ACCOUNTING_GlJournl" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_SetupGlJournals.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Journals Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_GlJournl" contentTypeId="DOCUMENT" contentName="Journals." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_GlJournl" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ParAcPref" contentIdTo="ACCOUNTING_GlJournl" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_SetupGlJournals"/>
<DataResource dataResourceId="ACCOUNTING_GlAccTypD" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypeDefaults.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="GL Account Type Defaults Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_GlAccTypD" contentTypeId="DOCUMENT" contentName="GL Account Type Defaults." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_GlAccTypD" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ParAcPref" contentIdTo="ACCOUNTING_GlAccTypD" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_GlAccountTypeDefaults"/>
<DataResource dataResourceId="ACCOUNTING_ProdGlAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductGlAccounts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Product GL Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ProdGlAcc" contentTypeId="DOCUMENT" contentName="Product GL Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ProdGlAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GlAccTypD" contentIdTo="ACCOUNTING_ProdGlAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditProductGlAccounts"/>
<DataResource dataResourceId="ACCOUNTING_PrdCatAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductCategoryGlAccounts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Product Category GL Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_PrdCatAcc" contentTypeId="DOCUMENT" contentName="Product Category GL Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_PrdCatAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GlAccTypD" contentIdTo="ACCOUNTING_PrdCatAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditProductCategoryGlAccounts"/>
<DataResource dataResourceId="ACCOUNTING_FinAccGl" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountTypeGlAccounts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Financial Account GL Type Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_FinAccGl" contentTypeId="DOCUMENT" contentName="Fin Account Type GL Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FinAccGl" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GlAccTypD" contentIdTo="ACCOUNTING_FinAccGl" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditFinAccountTypeGlAccounts"/>
<DataResource dataResourceId="ACCOUNTING_GlSalInv" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountSalInvoice.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Sales Invoice Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_GlSalInv" contentTypeId="DOCUMENT" contentName="Sales Invoice." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_GlSalInv" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GlAccTypD" contentIdTo="ACCOUNTING_GlSalInv" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_GlAccountSalInvoice"/>
<DataResource dataResourceId="ACCOUNTING_GlPurInv" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountPurInvoice.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Purchase Invoice Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_GlPurInv" contentTypeId="DOCUMENT" contentName="Purchase Invoice." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_GlPurInv" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GlAccTypD" contentIdTo="ACCOUNTING_GlPurInv" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_GlAccountPurInvoice"/>
<DataResource dataResourceId="ACCOUNTING_GlTPayTy" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypePaymentType.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Payment Type GL Account Type Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_GlTPayTy" contentTypeId="DOCUMENT" contentName="Payment Type GL Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_GlTPayTy" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GlAccTypD" contentIdTo="ACCOUNTING_GlTPayTy" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_GlAccountTypePaymentType"/>
<DataResource dataResourceId="ACCOUNTING_PayMethId" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Payment Method GL Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_PayMethId" contentTypeId="DOCUMENT" contentName="Payment Method Id GL Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_PayMethId" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GlAccTypD" contentIdTo="ACCOUNTING_PayMethId" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_GlAccountNrPaymentMethod"/>
<DataResource dataResourceId="ACCOUNTING_VarReason" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Variance Reason GL Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_VarReason" contentTypeId="DOCUMENT" contentName="Variance Reason GL Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_VarReason" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GlAccTypD" contentIdTo="ACCOUNTING_VarReason" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditVarianceReasonGlAccounts"/>
<DataResource dataResourceId="ACCOUNTING_CCTyGlAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Credit Card Type GL Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_CCTyGlAcc" contentTypeId="DOCUMENT" contentName="Credit Card Type GL Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_CCTyGlAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GlAccTypD" contentIdTo="ACCOUNTING_CCTyGlAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditCreditCardTypeGlAccounts"/>
<DataResource dataResourceId="ACCOUNTING_TaxGlAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditOrganizationTaxAuthorityGlAccounts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Tax Authority GL Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_TaxGlAcc" contentTypeId="DOCUMENT" contentName="Tax Authority GL Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_TaxGlAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GlAccTypD" contentIdTo="ACCOUNTING_TaxGlAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditOrganizationTaxAuthorityGlAccounts"/>
<DataResource dataResourceId="ACCOUNTING_ParGlAcc" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPartyGlAccount.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Party GL Accounts Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ParGlAcc" contentTypeId="DOCUMENT" contentName="Party GL Accounts." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ParGlAcc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_GlAccTypD" contentIdTo="ACCOUNTING_ParGlAcc" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditPartyGlAccount"/>
<DataResource dataResourceId="ACCOUNTING_TimePeds" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_TimePeriods.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Time Periods Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_TimePeds" contentTypeId="DOCUMENT" contentName="Time Periods." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_TimePeds" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ParAcPref" contentIdTo="ACCOUNTING_TimePeds" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_TimePeriods"/>
<DataResource dataResourceId="ACCOUNTING_ParAccSum" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAccountsSummary.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounts Summary Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_ParAccSum" contentTypeId="DOCUMENT" contentName="Accounts Summary." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ParAccSum" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="ACCOUNTING_ListComps" contentIdTo="ACCOUNTING_ParAccSum" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_PartyAccountsSummary"/>
<!-- features -->
<DataResource dataResourceId="ACCOUNTING_Features" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_Features.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Features" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="ACCOUNTING_Features" contentTypeId="DOCUMENT" contentName="Accounting features." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_Features" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_Features" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
</entity-engine-xml>
@@ -19,7 +19,7 @@ under the License.
-->
<entity-engine-xml>
<RecurrenceRule recurrenceRuleId="400" frequency="MONTHLY" intervalNumber="1" countNumber="-1"/>
<RecurrenceRule recurrenceRuleId="400" untilDateTime="" frequency="MONTHLY" intervalNumber="1" countNumber="-1"/>
<RecurrenceInfo recurrenceInfoId="400" startDateTime="2008-05-14 22:00:00.000" recurrenceRuleId="400" recurrenceCount="0"/>
<RuntimeData runtimeDataId="8501">
<runtimeInfo><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
@@ -39,7 +39,7 @@ under the License.
</RuntimeData>
<JobSandbox jobId="8500" jobName="Generate Invoice template" runTime="2008-05-14 00:00:00.000" serviceName="autoGenerateInvoiceFromExistingInvoice" runtimeDataId="8501" poolId="pool" runAsUser="system" recurrenceInfoId="400"/>
<RecurrenceRule recurrenceRuleId="9000" frequency="DAILY" intervalNumber="5" countNumber="-1"/>
<RecurrenceRule recurrenceRuleId="9000" untilDateTime="" frequency="DAILY" intervalNumber="5" countNumber="-1"/>
<RecurrenceInfo recurrenceInfoId="9000" startDateTime="2000-01-01 00:00:00.000" recurrenceRuleId="9000" recurrenceCount="0"/>
<JobSandbox jobId="9000" jobName="Auto Reconcile Financial Account" runTime="2000-01-01 00:00:00.000" serviceName="autoFinAccountReconciliation" poolId="pool" runAsUser="system" recurrenceInfoId="9000"/>
@@ -0,0 +1,102 @@
<?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.
-->
<entity-engine-xml>
<!-- Payment Processors security -->
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="PAYPROC_CREATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="PAYPROC_DELETE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="PAYPROC_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="PAYPROC_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="PAYPROC_ADMIN"/>
<!-- Payment Information security -->
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="PAY_INFO_CREATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="PAY_INFO_DELETE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="PAY_INFO_UPDATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="PAY_INFO_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="PAY_INFO_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="PAY_INFO_ADMIN"/>
<!-- Accounting Manager security -->
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="ACCOUNTING_ADMIN"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ACCOUNTING_CREATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ACCOUNTING_DELETE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ACCOUNTING_UPDATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ACCOUNTING_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="ACCOUNTING_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="ACCOUNTING_ADMIN"/>
<!-- Manual Payment security -->
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="MANUAL_PAYMENT"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="MANUAL_PAYMENT"/>
<!-- ACCOUNTING_COMMs security -->
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="ACCOUNTING_COMM_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ACCOUNTING_COMM_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="ACCOUNTING_COMM_VIEW"/>
<!-- Ability to print checks -->
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="ACCOUNTING_PRINT_CHECKS"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ACCOUNTING_PRINT_CHECKS"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="ACCOUNTING_PRINT_CHECKS"/>
<!-- Set up accounting organization preferences security -->
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="ACCTG_PREF_ADMIN"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="ACCTG_PREF_CREATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="ACCTG_PREF_UPDATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="ACCTG_PREF_DELETE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="ACCTG_PREF_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="ACCTG_FX_UPDATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="ACCTG_FX_UPDATE"/>
<!-- For general ledger accounting transactions. Note that any component that needs to post
accounting transactions should create a permission service SECA to grant
task-specific permissions to post transactions. The following permissions
should be given to accountants only, as that involves changing the books. -->
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="ACCTG_ATX_ADMIN"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ACCTG_ATX_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ACCTG_ATX_CREATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ACCTG_ATX_UPDATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="ACCTG_ATX_DELETE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="ACCTG_ATX_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="ACCTG_ATX_CREATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="ACCTG_ATX_UPDATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="ACCTG_ATX_DELETE"/>
<!-- Security Group to manage all Accounting operations -->
<SecurityGroup description="Accounting permission for all accounting functions." groupId="ACCTG_FUNCTNL_ADMIN" groupName="Accounting Admin"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCOUNTING_ADMIN"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="OFBTOOLS_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCTG_ATX_ADMIN"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCTG_FX_UPDATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCTG_PREF_ADMIN"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCOUNTING_PRINT_CHECKS"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCOUNTING_COMM_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="MANUAL_PAYMENT"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="PAY_INFO_ADMIN"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="PAYPROC_ADMIN"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ASSETMAINT_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCOUNTING_CREATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCOUNTING_DELETE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCOUNTING_UPDATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCOUNTING_VIEW"/>
</entity-engine-xml>
@@ -1,53 +0,0 @@
<?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.
-->
<entity-engine-xml>
<!--
# what should the default of the payment to invoice processing be?
# paymentProcessing by invoice or paymentprocessing by invoiceitem?
# there is still a box on the menu to change this option by the user.
# value Y: applying payments to the invoice as a whole (invoiceItemSeqNr = null) with the option to apply per invoice item
# value N: applying payments to every invoice item with the option to apply to an invoice as a whole
#value YY: do not show the option box to the user and do only invoice processing
#value NN: do not show the option box to the user and do only invoiceitem processing
-->
<SystemProperty systemResourceId="accounting" systemPropertyId="invoiceProcessing"
systemPropertyValue="YY"
description="Options are: Y, N, YY, NN"
/>
<SystemProperty systemResourceId="accounting" systemPropertyId="accounting.fixedasset.autocreate"
systemPropertyValue="Y"
description="Create a fixed asset when an 'asset usage' type product is created. Options: Y, N"/>
<SystemProperty systemResourceId="accounting" systemPropertyId="accounting.payment.application.autocreate"
systemPropertyValue="Y"
description="Create a payment application when a payment is received/sent or invoice is approved (take the oldest not closed one). Options: Y, N"/>
<SystemProperty systemResourceId="accounting" systemPropertyId="accounting.payment.purchaseorder.autocreate"
systemPropertyValue="Y"
description="Create a 'not-paid' payment record if the purchase order is approved. Options: Y, N"/>
<SystemProperty systemResourceId="accounting" systemPropertyId="accounting.payment.salesorder.autocreate"
systemPropertyValue="Y"
description="Create a 'not-paid' payment record if the sales order is completed and no payment exist yet. Options:: Y, N"/>
<SystemProperty systemResourceId="accounting" systemPropertyId="create.invoice.per.shipment" systemPropertyValue="Y"
description="create invoice per shipment. Options: = Y (Invoice per shipment), N (Invoice per order)"/>
</entity-engine-xml>
@@ -0,0 +1,40 @@
<?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.
-->
<entity-engine-xml>
<Party partyId="accountant_group" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="accountant_group" groupName="Accountant Group"/>
<PartyRole partyId="accountant_group" roleTypeId="ORGANIZATION_ROLE"/>
<PartyRole partyId="accountant_group" roleTypeId="_NA_"/>
<PartyStatus partyId="accountant_group" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="accountant_group" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-01-01 12:00:00.0"/>
<Party partyId="accountingadmin" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="accountingadmin" firstName="Accounting" lastName="Administrator"/>
<PartyRole partyId="accountingadmin" roleTypeId="ACCOUNTANT"/>
<PartyRole partyId="accountingadmin" roleTypeId="EMPLOYEE"/>
<PartyRole partyId="accountingadmin" roleTypeId="_NA_"/>
<PartyStatus partyId="accountant_group" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<UserLogin userLoginId="accountingadmin" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a" partyId="accountingadmin" passwordHint=""/>
<UserLoginSecurityGroup groupId="ACCTG_FUNCTNL_ADMIN" userLoginId="accountingadmin" fromDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="accountingadmin" partyRelationshipTypeId="EMPLOYMENT" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="EMPLOYEE" fromDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="accountant_group" partyIdTo="accountingadmin" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="ORGANIZATION_ROLE" roleTypeIdTo="ACCOUNTANT" fromDate="2001-01-01 12:00:00.0"/>
</entity-engine-xml>
@@ -0,0 +1,144 @@
<?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.
-->
<entity-engine-xml>
<!-- Set CAPITAL STOCK and initial CASH value -->
<AcctgTrans acctgTransId="6000" acctgTransTypeId="CAPITALIZATION" description="Initial Capital Stock" transactionDate="2009-01-01 10:33:26.0" isPosted="Y" postedDate="2009-01-01 10:53:46.623" glFiscalTypeId="ACTUAL"/>
<AcctgTransEntry acctgTransId="6000" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" description="Initial Capital From Owners" glAccountId="310000" organizationPartyId="Company" amount="200000.00" currencyUomId="USD" origAmount="200000.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="6000" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" description="Initial Cash From Owners" glAccountId="111100" organizationPartyId="Company" amount="200000.00" currencyUomId="USD" origAmount="200000.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<!-- Set initial FIXED ASSET @ COST value for vehicles: sum of all inventory fixed assets' PURCHASE COST -->
<AcctgTrans acctgTransId="6001" acctgTransTypeId="DISBURSEMENT" description="Purchase of vehicles" transactionDate="2009-01-02 11:08:46.0" isPosted="Y" postedDate="2009-01-02 11:10:44.459" glFiscalTypeId="ACTUAL"/>
<AcctgTransEntry acctgTransId="6001" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" description="Purchase of vehicles" glAccountId="174000" organizationPartyId="Company" amount="70000.00" currencyUomId="USD" origAmount="70000.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="6001" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" description="Purchase of vehicles" glAccountId="111100" organizationPartyId="Company" amount="70000.00" currencyUomId="USD" origAmount="70000.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<!-- Set initial FIXED ASSET @ COST value for equipment: sum of all inventory fixed assets' PURCHASE COST -->
<AcctgTrans acctgTransId="6002" acctgTransTypeId="DISBURSEMENT" description="Purchase of manufacturing equipment" transactionDate="2009-01-03 11:16:21.0" isPosted="Y" postedDate="2009-01-03 11:17:03.511" glFiscalTypeId="ACTUAL"/>
<AcctgTransEntry acctgTransId="6002" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" description="Purchase of manufacturing equipment" glAccountId="111100" organizationPartyId="Company" amount="76500.00" currencyUomId="USD" origAmount="76500.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="6002" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" description="Purchase of manufacturing equipment" glAccountId="171000" organizationPartyId="Company" amount="76500.00" currencyUomId="USD" origAmount="76500.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<!-- Set initial INVENTORY value for finished goods: sum of all inventory items' QOH * UNIT COST before invoices/shipments/receipts -->
<AcctgTrans acctgTransId="6003" acctgTransTypeId="INVENTORY" description="Set initial inventory value" transactionDate="2009-01-04 11:16:21.0" isPosted="Y" postedDate="2009-01-04 11:17:03.511" glFiscalTypeId="ACTUAL"/>
<AcctgTransEntry acctgTransId="6003" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" description="Initial inventory purchase" glAccountId="111100" organizationPartyId="Company" amount="1799.93" currencyUomId="USD" origAmount="1799.93" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="6003" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" description="Initial inventory value" glAccountId="140000" organizationPartyId="Company" amount="1799.93" currencyUomId="USD" origAmount="1799.93" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<!-- Set initial INVENTORY value for raw materials: sum of all inventory items' QOH * UNIT COST before invoices/shipments/receipts -->
<AcctgTrans acctgTransId="6004" acctgTransTypeId="INVENTORY" description="Set initial inventory value" transactionDate="2009-01-04 12:16:21.0" isPosted="Y" postedDate="2009-01-04 12:17:03.511" glFiscalTypeId="ACTUAL"/>
<AcctgTransEntry acctgTransId="6004" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" description="Initial raw materials inventory purchase" glAccountId="111100" organizationPartyId="Company" amount="320.00" currencyUomId="USD" origAmount="320.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="6004" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" description="Initial raw materials inventory value" glAccountId="141000" organizationPartyId="Company" amount="320.00" currencyUomId="USD" origAmount="320.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTrans acctgTransId="6005" acctgTransTypeId="DEPRECIATION" description="Depreciation of vehicles after the first quarter" transactionDate="2009-03-31 00:00:00.0" isPosted="Y" postedDate="2009-03-31 00:00:00.0" glFiscalTypeId="ACTUAL"/>
<AcctgTransEntry acctgTransId="6005" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" description="Depreciation of vehicles after the first quarter" glAccountId="188000" organizationPartyId="Company" amount="2500.00" currencyUomId="USD" origAmount="2500.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="6005" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" description="Depreciation of vehicles after the first quarter" glAccountId="675400" organizationPartyId="Company" amount="2500.00" currencyUomId="USD" origAmount="2500.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<!--
<AcctgTrans acctgTransId="6006" acctgTransTypeId="AMORTIZATION" description="Unposted accounting transaction" transactionDate="2009-06-19 00:00:00.0" isPosted="N" glFiscalTypeId="ACTUAL" voucherRef="Z0001"/>
<AcctgTransEntry acctgTransId="6006" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" description="Unposted accounting transaction entries" voucherRef="Z0001" glAccountId="120000" organizationPartyId="Company" amount="500.00" currencyUomId="USD" origAmount="500.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="6006" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" description="Unposted transaction entries" voucherRef="Z0001" glAccountId="400000" organizationPartyId="Company" amount="500.00" currencyUomId="USD" origAmount="500.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
-->
<GlAccountOrganization glAccountId="111100" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="112000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="120000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="122300" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="140000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="141000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="171000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="174000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="188000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="210000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="213000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="214000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="224000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="224153" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="310000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="400000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="409000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="410000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="500000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="516100" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="649000" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization glAccountId="675400" organizationPartyId="Company" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountHistory glAccountId="111100" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="51263.22" postedCredits="0.00"/>
<GlAccountHistory glAccountId="112000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="20.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="120000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="159.96" postedCredits="0.00"/>
<GlAccountHistory glAccountId="122300" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="127.09" postedCredits="0.00"/>
<GlAccountHistory glAccountId="140000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="1936.40" postedCredits="0.00"/>
<GlAccountHistory glAccountId="141000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="320.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="171000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="76500.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="174000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="70000.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="188000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="0.00" postedCredits="2500.00"/>
<GlAccountHistory glAccountId="210000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="0.00" postedCredits="348.00"/>
<GlAccountHistory glAccountId="213000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="0.00" postedCredits="70.00"/>
<GlAccountHistory glAccountId="214000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="224000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="0.00" postedCredits="1.20"/>
<GlAccountHistory glAccountId="224153" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="0.00" postedCredits="5.80"/>
<GlAccountHistory glAccountId="310000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="0.00" postedCredits="200000.00"/>
<GlAccountHistory glAccountId="400000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="0.00" postedCredits="299.95"/>
<GlAccountHistory glAccountId="409000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="0.00" postedCredits="12.10"/>
<GlAccountHistory glAccountId="410000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="12.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="500000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="13.50" postedCredits="0.00"/>
<GlAccountHistory glAccountId="516100" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="24.88" postedCredits="0.00"/>
<GlAccountHistory glAccountId="649000" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="360.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="675400" organizationPartyId="Company" customTimePeriodId="6010" postedDebits="2500.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="111100" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="51380.07" postedCredits="0.00"/>
<GlAccountHistory glAccountId="112000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="120000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="122300" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="140000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="1799.93" postedCredits="0.00"/>
<GlAccountHistory glAccountId="141000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="320.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="171000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="76500.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="174000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="70000.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="188000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="2500.00"/>
<GlAccountHistory glAccountId="210000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="213000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="214000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="224000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="224153" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="310000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="200000.00"/>
<GlAccountHistory glAccountId="400000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="409000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="410000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="500000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="516100" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="649000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="675400" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="2500.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="111100" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="116.85"/>
<GlAccountHistory glAccountId="112000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="20.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="120000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="159.96" postedCredits="0.00"/>
<GlAccountHistory glAccountId="122300" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="127.09" postedCredits="0.00"/>
<GlAccountHistory glAccountId="140000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="136.47" postedCredits="0.00"/>
<GlAccountHistory glAccountId="141000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="171000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="174000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="188000" organizationPartyId="Company" customTimePeriodId="6011" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="210000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="348.00"/>
<GlAccountHistory glAccountId="213000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="70.00"/>
<GlAccountHistory glAccountId="214000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="224000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="1.20"/>
<GlAccountHistory glAccountId="224153" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="5.80"/>
<GlAccountHistory glAccountId="310000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="400000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="299.95"/>
<GlAccountHistory glAccountId="409000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="12.10"/>
<GlAccountHistory glAccountId="410000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="12.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="500000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="13.50" postedCredits="0.00"/>
<GlAccountHistory glAccountId="516100" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="24.88" postedCredits="0.00"/>
<GlAccountHistory glAccountId="649000" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="360.00" postedCredits="0.00"/>
<GlAccountHistory glAccountId="675400" organizationPartyId="Company" customTimePeriodId="6013" postedDebits="0.00" postedCredits="0.00"/>
</entity-engine-xml>
@@ -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.
-->
<entity-engine-xml>
<!-- Asset Maintenance demo data -->
<Product productId="FORKLIFT_PROPANE" productTypeId="ASSET_USAGE" productName="Forklift - Propane" internalName="Forklift - Propane" description="Forklift - Propane Powered."/>
<Product productId="FORKLIFT_BATTERY" productTypeId="ASSET_USAGE" productName="Forklift - Battery" internalName="Forklift - Battery" description="Forklift - Battery Powered."/>
<Product productId="COMPANY_VEHICLE" productTypeId="ASSET_USAGE" productName="Company Vehicle" internalName="Company Vehicle" description="Company Vehicle."/>
<Product productId="HVAC_UNIT" productTypeId="ASSET_USAGE" productName="Heating/Cooling Unit" internalName="Heating/Cooling Unit" description="Heating/Cooling Unit."/>
<FixedAsset fixedAssetId="DEMO_FORKLIFT_01" instanceOfProductId="FORKLIFT_PROPANE" fixedAssetName="Forklift #1" fixedAssetTypeId="EQUIPMENT" purchaseCost="1500" purchaseCostUomId="USD"/>
<FixedAssetGeoPoint fixedAssetId="DEMO_FORKLIFT_01" geoPointId="9000" fromDate="2009-01-09 00:00:00.000"/>
<FixedAsset fixedAssetId="DEMO_FORKLIFT_02" instanceOfProductId="FORKLIFT_BATTERY" fixedAssetName="Forklift #2" fixedAssetTypeId="EQUIPMENT" purchaseCost="2000" purchaseCostUomId="USD"/>
<FixedAssetGeoPoint fixedAssetId="DEMO_FORKLIFT_02" geoPointId="9000" fromDate="2009-01-09 00:00:00.000"/>
<FixedAsset fixedAssetId="DEMO_VEHICLE_01" instanceOfProductId="COMPANY_VEHICLE" fixedAssetName="Company Pickup Truck" fixedAssetTypeId="VEHICLE" purchaseCost="45000" purchaseCostUomId="USD" partyId="Company" roleTypeId="OWNER" dateAcquired="2009-01-01 00:00:00.000" expectedEndOfLife="2015-12-31"/>
<FixedAssetGeoPoint fixedAssetId="DEMO_VEHICLE_01" geoPointId="9000" fromDate="2009-01-09 00:00:00.000"/>
<FixedAssetDepMethod fixedAssetId="DEMO_VEHICLE_01" depreciationCustomMethodId="STR_LINE_DEP_FORMULA" fromDate="2009-01-01 00:00:00.000"/>
<FixedAsset fixedAssetId="DEMO_VEHICLE_02" instanceOfProductId="COMPANY_VEHICLE" fixedAssetName="Company Delivery Van" fixedAssetTypeId="VEHICLE" purchaseCost="25000" purchaseCostUomId="USD"/>
<FixedAssetGeoPoint fixedAssetId="DEMO_VEHICLE_02" geoPointId="9000" fromDate="2009-01-09 00:00:00.000"/>
<FixedAsset fixedAssetId="DEMO_HVAC_01" instanceOfProductId="HVAC_UNIT" fixedAssetName="HVAC Unit - First Floor" fixedAssetTypeId="EQUIPMENT" purchaseCost="6000" purchaseCostUomId="USD"/>
<FixedAssetGeoPoint fixedAssetId="DEMO_HVAC_01" geoPointId="9000" fromDate="2009-01-09 00:00:00.000"/>
<FixedAsset fixedAssetId="DEMO_HVAC_02" instanceOfProductId="HVAC_UNIT" fixedAssetName="HVAC Unit - Second Floor" fixedAssetTypeId="EQUIPMENT" purchaseCost="6000" purchaseCostUomId="USD"/>
<FixedAssetGeoPoint fixedAssetId="DEMO_HVAC_02" geoPointId="9000" fromDate="2009-01-09 00:00:00.000"/>
<ProductMaint productId="FORKLIFT_PROPANE" productMaintSeqId="seq01" productMaintTypeId="TUNE_UP" maintName="Tune Up" intervalQuantity="1000" intervalMeterTypeId="ODOMETER"/>
<ProductMaint productId="FORKLIFT_BATTERY" productMaintSeqId="seq01" productMaintTypeId="CHECK_BATTERY" maintName="Check Battery" intervalQuantity="1000" intervalMeterTypeId="ODOMETER"/>
<ProductMaint productId="COMPANY_VEHICLE" productMaintSeqId="seq01" productMaintTypeId="OIL_CHANGE" maintName="Oil Change - Post Break-in" intervalQuantity="2500" intervalMeterTypeId="ODOMETER" repeatCount="1"/>
<ProductMaint productId="COMPANY_VEHICLE" productMaintSeqId="seq02" productMaintTypeId="OIL_CHANGE" maintName="Oil Change" intervalQuantity="5000" intervalMeterTypeId="ODOMETER"/>
<ProductMaint productId="COMPANY_VEHICLE" productMaintSeqId="seq03" productMaintTypeId="ROTATE_TIRES" maintName="Rotate Tires" intervalQuantity="10000" intervalMeterTypeId="ODOMETER"/>
</entity-engine-xml>
@@ -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.
-->
<entity-engine-xml>
<Budget budgetId="DemoBudget001" budgetTypeId="CAPITAL_BUDGET" customTimePeriodId="6015" comments="Demo for budget 001"/>
<Budget budgetId="DemoBudget002" budgetTypeId="OPERATING_BUDGET" customTimePeriodId="6010" comments="Demo for budget 002"/>
<BudgetStatus budgetId="DemoBudget001" statusId="BG_CREATED" statusDate="2009-01-09 00:00:00.000"/>
<BudgetStatus budgetId="DemoBudget001" statusId="BG_REVIEWED" statusDate="2009-01-10 00:00:00.000"/>
<BudgetStatus budgetId="DemoBudget002" statusId="BG_CREATED" statusDate="2009-01-09 00:00:00.000"/>
<BudgetStatus budgetId="DemoBudget002" statusId="BG_REVIEWED" statusDate="2009-01-10 00:00:00.000"/>
<BudgetStatus budgetId="DemoBudget002" statusId="BG_APPROVED" statusDate="2009-01-11 00:00:00.000"/>
<BudgetRole budgetId="DemoBudget001" partyId="ACCOUNTING" roleTypeId="INTERNAL_ORGANIZATIO"/>
<BudgetRole budgetId="DemoBudget002" partyId="accountingadmin" roleTypeId="ACCOUNTANT"/>
<BudgetRole budgetId="DemoBudget002" partyId="MARKETING" roleTypeId="INTERNAL_ORGANIZATIO"/>
<BudgetItem budgetId="DemoBudget001" budgetItemSeqId="00001" budgetItemTypeId="REQUIREMENT_BUDGET_A" amount="500" purpose="Demo item 1 for Demo budget 001" justification="For Demo budget 001"/>
<BudgetItem budgetId="DemoBudget002" budgetItemSeqId="00001" budgetItemTypeId="REQUIREMENT_BUDGET_A" amount="1000" purpose="Demo item 1 for Demo budget 002" justification="For Demo budget 002"/>
<BudgetItem budgetId="DemoBudget002" budgetItemSeqId="00002" budgetItemTypeId="REQUIREMENT_BUDGET_A" amount="1500" purpose="Demo item 2 for Demo budget 002" justification="For Demo budget 002"/>
<BudgetReview budgetId="DemoBudget001" budgetReviewId="00001" partyId="ACCOUNTING" budgetReviewResultTypeId="BGR_REJECTED" reviewDate="2009-01-10 00:00:00.000"/>
<BudgetReview budgetId="DemoBudget001" budgetReviewId="00002" partyId="ACCOUNTING" budgetReviewResultTypeId="BGR_ACCEPTED" reviewDate="2009-01-11 00:00:00.000"/>
<BudgetReview budgetId="DemoBudget001" budgetReviewId="00003" partyId="ACCOUNTING" budgetReviewResultTypeId="BGR_ACCEPTED" reviewDate="2009-01-11 00:00:00.000"/>
<BudgetReview budgetId="DemoBudget002" budgetReviewId="00001" partyId="accountingadmin" budgetReviewResultTypeId="BGR_REJECTED" reviewDate="2009-01-10 00:00:00.000"/>
<BudgetReview budgetId="DemoBudget002" budgetReviewId="00002" partyId="accountingadmin" budgetReviewResultTypeId="BGR_REJECTED" reviewDate="2009-01-10 00:00:00.000"/>
<BudgetReview budgetId="DemoBudget002" budgetReviewId="00003" partyId="accountingadmin" budgetReviewResultTypeId="BGR_REJECTED" reviewDate="2009-01-10 00:00:00.000"/>
<BudgetReview budgetId="DemoBudget002" budgetReviewId="00004" partyId="accountingadmin" budgetReviewResultTypeId="BGR_ACCEPTED" reviewDate="2009-01-11 00:00:00.000"/>
</entity-engine-xml>
@@ -0,0 +1,40 @@
<?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.
-->
<entity-engine-xml>
<FinAccount finAccountId="SC_CHECKING" finAccountTypeId="BANK_ACCOUNT" statusId="FNACT_ACTIVE" finAccountName="Standard Chartered" finAccountCode="1247854852147" finAccountPin="1234"
currencyUomId="USD" organizationPartyId="Company" ownerPartyId="Company" postToGlAccountId="111100" isRefundable="Y" replenishLevel="0.00" actualBalance="0.00" availableBalance="0.00"/>
<FinAccountStatus finAccountId="SC_CHECKING" statusId="FNACT_ACTIVE" statusDate="2009-04-01 00:00:01.000"/>
<PaymentMethod paymentMethodId="SC_CHECKING" paymentMethodTypeId="COMPANY_CHECK" partyId="Company" description="Checking Account at Standard Chartered Bank" glAccountId="111100" finAccountId="SC_CHECKING" fromDate="2009-04-01 00:00:00.000"/>
<EftAccount paymentMethodId="SC_CHECKING" nameOnAccount="Company" bankName="Standard Chartered Bank" routingNumber="307075259" accountType="Checking" accountNumber="316253011064226" contactMechId="9000" />
<FinAccount finAccountId="ABN_CHECKING" finAccountTypeId="BANK_ACCOUNT" statusId="FNACT_ACTIVE" finAccountName="ABN AMRO" finAccountCode="6577852521447" finAccountPin="1234" currencyUomId="USD"
organizationPartyId="Company" ownerPartyId="Company" postToGlAccountId="111100" isRefundable="Y" replenishLevel="0.00" actualBalance="0.00" availableBalance="0.00"/>
<FinAccountStatus finAccountId="ABN_CHECKING" statusId="FNACT_ACTIVE" statusDate="2009-04-01 00:00:01.000"/>
<PaymentMethod paymentMethodId="ABN_CHECKING" paymentMethodTypeId="COMPANY_CHECK" partyId="Company" description="Checking Account at ABN AMRO Bank" glAccountId="111100" finAccountId="ABN_CHECKING" fromDate="2009-04-01 00:00:00.000"/>
<EftAccount paymentMethodId="ABN_CHECKING" nameOnAccount="Company" bankName="ABN AMRO Bank" routingNumber="222371863" accountType="Checking" accountNumber="427253011064227" contactMechId="9000"/>
<FinAccount finAccountId="AMEX_01" finAccountTypeId="CREDIT_CARD_ACCOUNT" statusId="FNACT_ACTIVE" finAccountName="Corporate AMEX " finAccountCode="378282246310005" finAccountPin="9876" currencyUomId="USD"
organizationPartyId="Company" ownerPartyId="Company" postToGlAccountId="231000" isRefundable="Y" replenishLevel="0.00" actualBalance="0.00" availableBalance="0.00"/>
<FinAccountStatus finAccountId="AMEX_01" statusId="FNACT_ACTIVE" statusDate="2009-04-01 00:00:01.000"/>
<PaymentMethod paymentMethodId="AMEX_01" paymentMethodTypeId="CREDIT_CARD" partyId="Company" description="AmEx 0005" glAccountId="231000" finAccountId="AMEX_01" fromDate="2009-04-01 00:00:00.000"/>
<CreditCard paymentMethodId="AMEX_01" cardType="CCT_AMERICANEXPRESS" cardNumber="378282246310005" expireDate="02/2020" companyNameOnCard="Your Company Name"
titleOnCard="" firstNameOnCard="Smart" middleNameOnCard="" lastNameOnCard="Guy" suffixOnCard="" contactMechId="9000"/>
<PaymentMethod paymentMethodId="PETTY_CASH" paymentMethodTypeId="CASH" partyId="Company" description="Petty Cash" glAccountId="110000" fromDate="2009-04-01 00:00:00.000"/>
</entity-engine-xml>
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,423 @@
<?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.
-->
<entity-engine-xml>
<!-- Global defaults (for all the organizations) -->
<!-- Invoice Item Types to Gl Account Ids mappings -->
<!-- for sales invoice items -->
<InvoiceItemType invoiceItemTypeId="INVOICE_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="INV_PROMOTION_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="INV_DISCOUNT_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="FEE" defaultGlAccountId="804000"/>
<InvoiceItemType invoiceItemTypeId="INV_MISC_CHARGE" defaultGlAccountId="409000"/>
<!-- <InvoiceItemType invoiceItemTypeId="INV_SALES_TAX" defaultGlAccountId=""/> --> <!-- Use InvoiceItem.overrideGlAccountId -->
<InvoiceItemType invoiceItemTypeId="INV_SHIPPING_CHARGES" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="INV_SURCHARGE_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="INV_ADD_FEATURE" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="INV_WARRANTY_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="INV_INTRST_CHRG" defaultGlAccountId="810000"/>
<InvoiceItemType invoiceItemTypeId="INVOICE_ITM_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="ITM_PROMOTION_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="ITM_REPLACE_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="ITM_DISCOUNT_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="ITM_FEE" defaultGlAccountId="804000"/>
<InvoiceItemType invoiceItemTypeId="ITM_MISC_CHARGE" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="ITM_SALES_TAX" defaultGlAccountId="224100"/>
<InvoiceItemType invoiceItemTypeId="ITM_SHIPPING_CHARGES" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="ITM_SURCHARGE_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="ITM_ADD_FEATURE" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="ITM_WARRANTY_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="INV_PROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_FPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_DPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_FDPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_PROD_FEATR_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_SPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_WE_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_TE_ITEM" defaultGlAccountId="401000"/>
<!-- invoice item types for purchase (AP) invoices -->
<InvoiceItemType invoiceItemTypeId="PINVOICE_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_PROMOTION_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_DISCOUNT_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="P_FEE" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_MISC_CHARGE" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_SALES_TAX" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_SHIP_CHARGES" defaultGlAccountId="510000"/>
<InvoiceItemType invoiceItemTypeId="PINV_SURCHARGE_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_ADD_FEATURE" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_WARRANTY_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINVOICE_ITM_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_PROMOTION_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_REPLACE_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_DISCOUNT_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_FEE" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_MISC_CHARGE" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_SALES_TAX" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_SHIP_CHARGES" defaultGlAccountId="510000"/>
<InvoiceItemType invoiceItemTypeId="PITM_SURCHARGE_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_ADD_FEATURE" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_WARRANTY_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_PROD_ITEM" defaultGlAccountId="214000"/>
<InvoiceItemType invoiceItemTypeId="PINV_FPROD_ITEM" defaultGlAccountId="214000"/>
<InvoiceItemType invoiceItemTypeId="PINV_DPROD_ITEM" defaultGlAccountId="500000"/>
<InvoiceItemType invoiceItemTypeId="PINV_FDPROD_ITEM" defaultGlAccountId="214000"/>
<InvoiceItemType invoiceItemTypeId="PINV_PROD_FEATR_ITEM" defaultGlAccountId="214000"/>
<InvoiceItemType invoiceItemTypeId="PINV_RPROD_ITEM" defaultGlAccountId="214000"/>
<InvoiceItemType invoiceItemTypeId="PINV_SPROD_ITEM" defaultGlAccountId="500000"/>
<InvoiceItemType invoiceItemTypeId="PINV_INVPRD_ITEM" defaultGlAccountId="650000"/>
<InvoiceItemType invoiceItemTypeId="PINV_SUPLPRD_ITEM" defaultGlAccountId="650000"/>
<InvoiceItemType invoiceItemTypeId="PINV_FXASTPRD_ITEM" defaultGlAccountId="650000"/>
<InvoiceItemType invoiceItemTypeId="PINV_WE_ITEM" defaultGlAccountId="140000"/>
<InvoiceItemType invoiceItemTypeId="PINV_TE_ITEM" defaultGlAccountId="140000"/>
<!-- invoice items for customer returns -->
<InvoiceItemType invoiceItemTypeId="CRT_PROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_FPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_DPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_FDPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_RPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_PROD_FEATR_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_SPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_WE_ITEM" defaultGlAccountId="424000"/>
<InvoiceItemType invoiceItemTypeId="CRT_TE_ITEM" defaultGlAccountId="424000"/>
<InvoiceItemType invoiceItemTypeId="CRT_PROMOTION_ADJ" defaultGlAccountId="422000"/>
<InvoiceItemType invoiceItemTypeId="CRT_REPLACE_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_DISCOUNT_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_FEE_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_MISC_ADJ" defaultGlAccountId="423000"/>
<!-- <InvoiceItemType invoiceItemTypeId="CRT_SALES_TAX_ADJ" defaultGlAccountId=""/> --> <!-- Use InvoiceItem.overrideGlAccountId -->
<InvoiceItemType invoiceItemTypeId="CRT_SHIPPING_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_SURCHARGE_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_ADD_FEATURE_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_WARRANTY_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_MKTG_PKG_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_MAN_ADJ" defaultGlAccountId="423000"/>
<!-- invoice items for returns to suppliers -->
<InvoiceItemType invoiceItemTypeId="SRT_PROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_FPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_DPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_FDPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_RPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_PROD_FEATR_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_SPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_WE_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_TE_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_PROMOTION_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="SRT_REPLACE_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_DISCOUNT_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_FEE_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_MISC_ADJ" defaultGlAccountId="409000"/>
<!-- <InvoiceItemType invoiceItemTypeId="SRT_SALES_TAX_ADJ" defaultGlAccountId=""/> --> <!-- Use InvoiceItem.overrideGlAccountId -->
<InvoiceItemType invoiceItemTypeId="SRT_SHIPPING_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_SURCHARGE_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_ADD_FEATURE_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_WARRANTY_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_MKTG_PKG_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_MAN_ADJ" defaultGlAccountId="409000"/>
<!-- invoice item types for commission invoices -->
<InvoiceItemType invoiceItemTypeId="COMM_INV_ITEM" defaultGlAccountId="601300"/>
<InvoiceItemType invoiceItemTypeId="COMM_INV_ADJ" defaultGlAccountId="601400"/>
<!-- invoice item types for payrol invoices PAYROL_EARN_HOURS-->
<InvoiceItemType invoiceItemTypeId="PAYROL_HRLY_RATE" defaultGlAccountId="601100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_HRLY_RATE_SIC" defaultGlAccountId="603100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_SALARY" defaultGlAccountId="601100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_SALARY_SICK" defaultGlAccountId="603100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_SALARY_VAC" defaultGlAccountId="602100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_BONUS" defaultGlAccountId="601000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_COMMISSION" defaultGlAccountId="601300"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_ADV_PAY" defaultGlAccountId="601100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_MIL_REIMB" defaultGlAccountId="601000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_OFF_EXP_REIMB" defaultGlAccountId="601000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_PAYPER_OVRPAY" defaultGlAccountId="601100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_PAYPER_PAY" defaultGlAccountId="601100"/>
<!-- invoice item types for payrol invoices DEDUCTIONS-->
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_FROM_GROSS" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_125COMPY" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_125PPO" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_125HSA" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_401K" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_REPAY" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_CHAR_DONAT" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_CHILD_SUPP" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_MISC" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_ROTH_401K" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_SIMP_IRA" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_UNION" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_SAL_TIMOFF" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_WAG_GARN" defaultGlAccountId="605000"/>
<!-- invoice item types for payrol invoices TAXES-->
<InvoiceItemType invoiceItemTypeId="PAYROL_TAXES" defaultGlAccountId="604000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_TAX_FEDERAL" defaultGlAccountId="604000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_SOC_SEC_EMPL" defaultGlAccountId="604000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_TAX_MED_EMPL" defaultGlAccountId="604000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_TAX_MD_WITHOL" defaultGlAccountId="604000"/>
<PaymentMethodType paymentMethodTypeId="CREDIT_CARD" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="GIFT_CARD" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="GIFT_CERTIFICATE" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="CASH" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EFT_ACCOUNT" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="FIN_ACCOUNT" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="PERSONAL_CHECK" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="COMPANY_CHECK" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="CERTIFIED_CHECK" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="MONEY_ORDER" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="COMPANY_ACCOUNT" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_BILLACT" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_COD" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_EBAY" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_OFFLINE" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_PAYPAL" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_WORLDPAY" defaultGlAccountId="122000"/>
<CostComponentCalc costComponentCalcId="GEN_COST_CALC" costGlAccountTypeId="OPERATING_EXPENSE"/>
<CostComponentCalc costComponentCalcId="TASK_COST_CALC" costGlAccountTypeId="OPERATING_EXPENSE"/>
<!-- General Ledger Setup for the "Company" organization for "Company" -->
<!-- GL journal for suspended transactions (failed post) -->
<GlJournal organizationPartyId="Company" glJournalId="ERROR_JOURNAL" glJournalName="Suspense transactions"/>
<PartyAcctgPreference partyId="Company" taxFormId="US_IRS_1120" cogsMethodId="COGS_LIFO" baseCurrencyUomId="USD"
invoiceSeqCustMethId="INV_HOOK_ENF_SEQ" invoiceIdPrefix="CI"
quoteIdPrefix="CQ"
orderIdPrefix="CO"
errorGlJournalId="ERROR_JOURNAL"/>
<!-- Chart Of Accounts -->
<GlAccountOrganization organizationPartyId="Company" glAccountId="100000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="110000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="111000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="111100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="111900" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="112000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="120000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="125000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="121800" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="122000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="122100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="122200" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="122300" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="122500" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="126000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="140000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="141000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="142000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="150000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="171000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="174000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="188000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="210000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="213000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="213200" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="213300" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="213500" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="214000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="215000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="216000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="221100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224106" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224140" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224151" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224153" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224209" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="231000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="310000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="336000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="400000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="401000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="409000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="410000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="421000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="422000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="423000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="424000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="500000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="510000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="514000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="515000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="516100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="518000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="600000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="601000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="601100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="601200" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="601300" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="601400" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="602100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="602200" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="603100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="603200" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="604000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="605000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="625000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="649000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="650000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="675400" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="804000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="810000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="850000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="900000" fromDate="2001-01-01 00:00:00.0"/>
<!-- Default mapping between account types and account ids -->
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="ACCOUNTS_RECEIVABLE" glAccountId="120000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="ACCREC_UNAPPLIED" glAccountId="126000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INTRSTINC_RECEIVABLE" glAccountId="121800"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INVENTORY_XFER_OUT" glAccountId="125000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INVENTORY_ACCOUNT" glAccountId="140000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="RAWMAT_INVENTORY" glAccountId="141000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="WIP_INVENTORY" glAccountId="142000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="PREPAID_EXPENSES" glAccountId="150000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="CUSTOMER_CREDIT" glAccountId="213000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="CUSTOMER_DEPOSIT" glAccountId="213300"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="UNINVOICED_SHIP_RCPT" glAccountId="214000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INVENTORY_XFER_IN" glAccountId="215000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="ACCPAYABLE_UNAPPLIED" glAccountId="216000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="COMMISSIONS_PAYABLE" glAccountId="221100"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="RETAINED_EARNINGS" glAccountId="336000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="SALES_ACCOUNT" glAccountId="400000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="COGS_ACCOUNT" glAccountId="500000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INV_ADJ_VAL" glAccountId="515000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="FX_GAIN_LOSS_ACCT" glAccountId="518000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="OPERATING_EXPENSE" glAccountId="600000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="PROFIT_LOSS_ACCOUNT" glAccountId="850000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="TAX_ACCOUNT" glAccountId="900000"/>
<!-- Demo Cost center -->
<GlAccountCategory glAccountCategoryId="9301" glAccountCategoryTypeId="COST_CENTER" description="Cost Center 1"/>
<GlAccountCategory glAccountCategoryId="9302" glAccountCategoryTypeId="COST_CENTER" description="Cost Center 2"/>
<GlAccountCategory glAccountCategoryId="9303" glAccountCategoryTypeId="COST_CENTER" description="Cost Center 3"/>
<!-- mappings for payments -->
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="CUSTOMER_REFUND" glAccountTypeId="CUSTOMER_CREDIT"/>
<!-- NOTE: do not change this -->
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="VENDOR_PAYMENT" glAccountTypeId="ACCPAYABLE_UNAPPLIED"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="VENDOR_PREPAY" glAccountTypeId="PREPAID_EXPENSES"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="COMMISSION_PAYMENT" glAccountTypeId="COMMISSIONS_PAYABLE"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="PAY_CHECK" glAccountTypeId="ACCPAYABLE_UNAPPLIED"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="GC_WITHDRAWAL" glAccountTypeId="CUSTOMER_CREDIT"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="SALES_TAX_PAYMENT" glAccountTypeId="ACCPAYABLE_UNAPPLIED"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="PAYROL_PAYMENT" glAccountTypeId="OPERATING_EXPENSE"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="PAYROLL_TAX_PAYMENT" glAccountTypeId="TAX_ACCOUNT"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="INCOME_TAX_PAYMENT" glAccountTypeId="TAX_ACCOUNT"/>
<!-- NOTE: do not change this -->
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="CUSTOMER_PAYMENT" glAccountTypeId="ACCREC_UNAPPLIED"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="CUSTOMER_DEPOSIT" glAccountTypeId="CUSTOMER_DEPOSIT"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="INTEREST_RECEIPT" glAccountTypeId="INTRSTINC_RECEIVABLE"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="GC_DEPOSIT" glAccountTypeId="CUSTOMER_DEPOSIT"/>
<!--
No need to load these if they are set with the 122000 account (the same set as a global value for the payment type)
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="CREDIT_CARD" glAccountId="122000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="GIFT_CARD" glAccountId="122000"/>
-->
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="GIFT_CERTIFICATE" glAccountId="120000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="CASH" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EFT_ACCOUNT" glAccountId="111100"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="FIN_ACCOUNT" glAccountId="111100"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="PERSONAL_CHECK" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="COMPANY_CHECK" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="CERTIFIED_CHECK" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="MONEY_ORDER" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="COMPANY_ACCOUNT" glAccountId="111100"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_BILLACT" glAccountId="213000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_COD" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_EBAY" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_OFFLINE" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_PAYPAL" glAccountId="122500"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_WORLDPAY" glAccountId="122500"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_AMERICANEXPRESS" glAccountId="122100"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_DINERSCLUB" glAccountId="122100"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_DISCOVER" glAccountId="122200"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_VISA" glAccountId="122300"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_MASTERCARD" glAccountId="122300"/>
<!--
No need to load these if they are set with the 122000 account (the default for the CREDIT_CARD payment method type)
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_ENROUTE" glAccountId="122000"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_CARTEBLANCHE" glAccountId="122000"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_JCB" glAccountId="122000"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_SOLO" glAccountId="122000"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_SWITCH" glAccountId="122000"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_VISAELECTRON" glAccountId="122000"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_UATP" glAccountId="122000"/>
-->
<FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="GIFTCERT_ACCOUNT" glAccountId="213200"/>
<FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="DEPOSIT_ACCOUNT" glAccountId="213500"/>
<FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="BANK_ACCOUNT" glAccountId="213500"/>
<FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="INVESTMENT_ACCOUNT" glAccountId="213500"/>
<VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_LOST" glAccountId="514000"/>
<VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_STOLEN" glAccountId="514000"/>
<VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_FOUND" glAccountId="514000"/>
<VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_DAMAGED" glAccountId="514000"/>
<VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_INTEGR" glAccountId="514000"/>
<VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_SAMPLE" glAccountId="625000"/>
<!-- Some Sample Time Periods, two Years with Quarters -->
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6010" periodTypeId="FISCAL_YEAR" fromDate="2010-01-01 00:00:00.000" thruDate="2011-01-01 23:59:59.000" isClosed="N" periodNum="1" periodName="2010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6011" periodTypeId="FISCAL_QUARTER" fromDate="2010-01-01 00:00:00.000" thruDate="2010-04-01 23:59:59.000" isClosed="N" periodNum="2" periodName="2010/Q1" parentPeriodId="6010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6012" periodTypeId="FISCAL_QUARTER" fromDate="2010-04-01 00:00:00.000" thruDate="2010-07-01 23:59:59.000" isClosed="N" periodNum="3" periodName="2010/Q2" parentPeriodId="6010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6013" periodTypeId="FISCAL_QUARTER" fromDate="2010-07-01 00:00:00.000" thruDate="2010-10-01 23:59:59.000" isClosed="N" periodNum="4" periodName="2010/Q3" parentPeriodId="6010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6014" periodTypeId="FISCAL_QUARTER" fromDate="2010-10-01 00:00:00.000" thruDate="2011-01-01 23:59:59.000" isClosed="N" periodNum="5" periodName="2010/Q4" parentPeriodId="6010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6015" periodTypeId="FISCAL_YEAR" fromDate="2011-01-01 00:00:00.000" thruDate="2030-01-01 23:59:59.000" isClosed="N" periodNum="1" periodName="2011-2030"/>
<!-- to convert demo invoice -->
<UomConversionDated uomId="USD" uomIdTo="EUR" fromDate="2001-01-01 00:00:00.0" conversionFactor="0.7"/>
<UomConversionDated uomId="EUR" uomIdTo="USD" fromDate="2001-01-01 00:00:00.0" conversionFactor="1.5"/>
<UomConversionDated uomId="USD" uomIdTo="USD" fromDate="2001-01-01 00:00:00.0" conversionFactor="1"/>
<!-- Gl Reconciliation -->
<GlReconciliation glReconciliationId="9000" glReconciliationName="demoGlReconciliation" glAccountId="111100" statusId="GLREC_RECONCILED" organizationPartyId="Company" reconciledBalance="75000.00" reconciledDate="2009-08-08 20:03:14.000"/>
<GlReconciliation glReconciliationId="9001" glReconciliationName="testGlReconciliation" glAccountId="111100" statusId="GLREC_CREATED" organizationPartyId="Company" reconciledDate="2009-08-12 20:03:14.000"/>
<GlAccountCategoryMember glAccountId="112000" glAccountCategoryId="9301" fromDate="2009-07-08 11:54:03.8" amountPercentage="50"/>
<GlAccountCategoryMember glAccountId="112000" glAccountCategoryId="9302" fromDate="2009-07-08 11:54:03.8" amountPercentage="20"/>
<GlAccountCategoryMember glAccountId="112000" glAccountCategoryId="9303" fromDate="2009-07-08 11:54:03.8" amountPercentage="30"/>
<GlAccountCategoryMember glAccountId="140000" glAccountCategoryId="9301" fromDate="2009-05-08 11:54:03.8" amountPercentage="50"/>
<GlAccountCategoryMember glAccountId="140000" glAccountCategoryId="9302" fromDate="2009-06-08 11:54:03.8" amountPercentage="20"/>
<GlAccountCategoryMember glAccountId="140000" glAccountCategoryId="9303" fromDate="2009-07-08 11:54:03.8" amountPercentage="30"/>
<GlAccountCategoryMember glAccountId="516100" glAccountCategoryId="9301" fromDate="2009-06-08 11:54:03.8" amountPercentage="50"/>
<GlAccountCategoryMember glAccountId="516100" glAccountCategoryId="9302" fromDate="2009-08-08 11:54:03.8" amountPercentage="20"/>
<GlAccountCategoryMember glAccountId="516100" glAccountCategoryId="9303" fromDate="2009-07-08 11:54:03.8" amountPercentage="30"/>
</entity-engine-xml>
@@ -0,0 +1,224 @@
<?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.
-->
<entity-engine-xml>
<Party partyId="AcctBuyer" partyTypeId="PERSON"/>
<Person partyId="AcctBuyer" firstName="Acct" lastName="Buyer"/>
<PartyRole partyId="AcctBuyer" roleTypeId="BUYER"/>
<UserLogin partyId="AcctBuyer" userLoginId="AcctBuyer"/>
<SecurityGroup groupId="ORDERPURCH"/><!-- is needed because accounting is before order -->
<UserLoginSecurityGroup userLoginId="AcctBuyer" groupId="ORDERPURCH" fromDate="2001-05-13 00:00:00"/>
<Party partyId="AcctBigSupplier" partyTypeId="PARTY_GROUP"/>
<PartyGroup partyId="AcctBigSupplier" groupName="Acct Big Supplier"/>
<PartyRole partyId="AcctBigSupplier" roleTypeId="SUPPLIER"/>
<Payment paymentId="demo10000" paymentTypeId="CUSTOMER_PAYMENT" paymentMethodTypeId="EFT_ACCOUNT" partyIdFrom="AcctBuyer" partyIdTo="Company" statusId="PMNT_NOT_PAID" effectiveDate="2006-04-25 12:56:54.292" amount="190.97" currencyUomId="USD"/>
<Payment paymentId="demo10010" paymentTypeId="CUSTOMER_REFUND" paymentMethodTypeId="EXT_BILLACT" partyIdFrom="Company" partyIdTo="AcctBuyer" statusId="PMNT_SENT" effectiveDate="2006-04-25 13:11:05.94" amount="20.0" currencyUomId="USD" />
<Invoice invoiceId="demo10000" invoiceTypeId="SALES_INVOICE" partyIdFrom="Company" partyId="AcctBuyer" statusId="INVOICE_IN_PROCESS" invoiceDate="2006-04-25 12:46:27.122" dueDate="2006-05-25 12:46:27.122" description="This is the first invoice number to AcctBuyer" currencyUomId="USD"/>
<InvoiceItem invoiceId="demo10000" invoiceItemSeqId="00001" invoiceItemTypeId="INV_SPROD_ITEM" uomId="USD" taxableFlag="Y" amount="20.0" description="this was e service for a product"/>
<InvoiceItem invoiceId="demo10000" invoiceItemSeqId="00002" invoiceItemTypeId="INV_PROD_ITEM" uomId="USD" taxableFlag="Y" amount="269.99" description="Big Gizmo w/ Legs"/>
<InvoiceItem invoiceId="demo10000" invoiceItemSeqId="00003" invoiceItemTypeId="INV_SALES_TAX" uomId="USD" taxableFlag="Y" amount="33.55" description="sales tax"/>
<Invoice invoiceId="demo10001" invoiceTypeId="PURCHASE_INVOICE" partyIdFrom="AcctBigSupplier" partyId="Company" statusId="INVOICE_IN_PROCESS" invoiceDate="2006-04-25 12:50:50.655" dueDate="2006-05-25 12:50:50.655" description="Another invoice" currencyUomId="USD"/>
<InvoiceItem invoiceId="demo10001" invoiceItemSeqId="00001" invoiceItemTypeId="PINV_WE_ITEM" uomId="USD" taxableFlag="Y" amount="33.99" description="Service received"/>
<InvoiceItem invoiceId="demo10001" invoiceItemSeqId="00002" invoiceItemTypeId="PINV_SURCHARGE_ADJ" uomId="USD" taxableFlag="Y" amount="2.44" description="Service received"/>
<Invoice invoiceId="demo10002" invoiceTypeId="SALES_INVOICE" partyIdFrom="Company" partyId="AcctBuyer" statusId="INVOICE_SENT" invoiceDate="2006-04-25 12:54:07.011" dueDate="2006-05-25 12:54:07.011" description="Another sales invoice" currencyUomId="USD"/>
<InvoiceItem invoiceId="demo10002" invoiceItemSeqId="00001" invoiceItemTypeId="INV_DPROD_ITEM" uomId="USD" taxableFlag="Y" amount="1.0" description="Add more money to your card!" />
<InvoiceItem invoiceId="demo10002" invoiceItemSeqId="00002" invoiceItemTypeId="INV_DPROD_ITEM" uomId="USD" taxableFlag="Y" amount="55.99" description="A digital gizmo: can be downloaded immediately after purchase."/>
<InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="demo10000" statusDate="2006-04-25 12:46:27.122"/>
<InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="demo10001" statusDate="2006-04-25 12:50:50.655"/>
<InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="demo10002" statusDate="2006-04-25 12:54:07.011"/>
<InvoiceStatus statusId="INVOICE_SENT" invoiceId="demo10002" statusDate="2006-04-25 12:55:44.228"/>
<Party partyId="EuroCustomer"/><!-- more data added in party component -->
<Invoice invoiceId="demo11000" invoiceTypeId="SALES_INVOICE" partyIdFrom="Company" partyId="EuroCustomer" statusId="INVOICE_APPROVED" invoiceDate="2006-04-25 12:46:27.122" dueDate="2006-05-25 12:46:27.122" description="This is the first invoice number to Eurocustomer with currency in euro" currencyUomId="EUR"/>
<InvoiceItem invoiceId="demo11000" invoiceItemSeqId="00001" invoiceItemTypeId="INV_SPROD_ITEM" uomId="USD" taxableFlag="Y" amount="20.0" description="this was e service for a product"/>
<InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="demo11000" statusDate="2006-04-25 12:46:27.122"/>
<InvoiceStatus statusId="INVOICE_APPROVED" invoiceId="demo11000" statusDate="2006-04-25 12:46:27.122"/>
<Invoice invoiceId="demo11001" invoiceTypeId="SALES_INVOICE" partyIdFrom="Company" partyId="EuroCustomer" statusId="INVOICE_APPROVED" invoiceDate="2006-04-25 12:46:27.122" dueDate="2006-05-25 12:46:27.122" description="This is the first invoice number to Eurocustomer with currency in euro" currencyUomId="EUR"/>
<InvoiceItem invoiceId="demo11001" invoiceItemSeqId="00001" invoiceItemTypeId="INV_SPROD_ITEM" uomId="USD" taxableFlag="Y" amount="543.23" description="this was e service for a product"/>
<InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="demo11001" statusDate="2006-04-25 12:46:27.122"/>
<InvoiceStatus statusId="INVOICE_APPROVED" invoiceId="demo11001" statusDate="2006-04-25 12:46:27.122"/>
<Payment paymentId="demo10001" paymentTypeId="CUSTOMER_PAYMENT" paymentMethodTypeId="EFT_ACCOUNT" partyIdFrom="EuroCustomer" partyIdTo="Company" statusId="PMNT_RECEIVED" effectiveDate="2006-04-25 12:56:54.292" amount="820.97" currencyUomId="USD" actualCurrencyAmount="543.23" actualCurrencyUomId="EUR"/>
<PaymentApplication paymentApplicationId="demo11000" paymentId="demo10001" invoiceId="demo11001" amountApplied="543.23"/>
<!-- show on customer invoice list when DemoCustomer logs on to myportal -->
<Party partyId="DemoCustCompany" partyTypeId="PARTY_GROUP"/>
<Invoice invoiceId="demo1200" invoiceTypeId="SALES_INVOICE" partyIdFrom="Company" partyId="DemoCustCompany" statusId="INVOICE_APPROVED" invoiceDate="2006-04-25 12:46:27.122" dueDate="2010-05-25 12:46:27.122" description="This is an invoice to DemoCustomer" currencyUomId="USD"/>
<InvoiceItem invoiceId="demo1200" invoiceItemSeqId="00001" invoiceItemTypeId="INV_SPROD_ITEM" uomId="USD" taxableFlag="Y" amount="511.23" description="this was e service for a product"/>
<InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="demo1200" statusDate="2006-04-25 12:46:27.122"/>
<InvoiceStatus statusId="INVOICE_APPROVED" invoiceId="demo1200" statusDate="2006-04-25 12:46:27.122"/>
<!--data for voiding/canceling payments/invoices-->
<Invoice invoiceId="8000" invoiceTypeId="PURCHASE_INVOICE" partyIdFrom="AcctBigSupplier" partyId="Company" statusId="INVOICE_READY" invoiceDate="2009-07-06 16:48:40.952" paidDate="2009-07-06 16:52:52.901" dueDate="2009-08-05 16:48:40.952" currencyUomId="USD"/>
<InvoiceItem invoiceId="8000" invoiceItemSeqId="1" invoiceItemTypeId="PINV_WE_ITEM" taxableFlag="Y" quantity="3.000000" amount="20.000"/>
<Payment paymentId="8000" paymentTypeId="VENDOR_PAYMENT" paymentMethodTypeId="EXT_BILLACT" partyIdFrom="Company" partyIdTo="AcctBigSupplier" statusId="PMNT_SENT" effectiveDate="2009-07-06 16:52:52.901" amount="70.00" currencyUomId="USD" actualCurrencyAmount="70.00" actualCurrencyUomId="USD"/>
<PaymentApplication paymentApplicationId="8010" paymentId="8000" invoiceId="8000" amountApplied="60.00"/>
<Invoice invoiceId="8001" invoiceTypeId="PURCHASE_INVOICE" partyIdFrom="AcctBigSupplier" partyId="Company" statusId="INVOICE_READY" currencyUomId="USD" invoiceDate="2009-07-06 16:48:40.952" paidDate="2009-07-06 16:52:52.901" dueDate="2009-08-05 16:48:40.952"/>
<InvoiceItem invoiceId="8001" invoiceItemSeqId="1" invoiceItemTypeId="PINV_SURCHARGE_ADJ" taxableFlag="Y" quantity="1.000000" amount="10.000"/>
<!--demo data for testCancelCheckRunPayments-->
<Invoice invoiceId="8002" invoiceTypeId="PURCHASE_INVOICE" partyIdFrom="AcctBigSupplier" partyId="Company" statusId="INVOICE_PAID" invoiceDate="2009-07-11 12:24:31.85" paidDate="2009-07-11 12:28:44.034" dueDate="2009-08-10 12:24:31.85" currencyUomId="USD"/>
<Invoice invoiceId="8003" invoiceTypeId="PURCHASE_INVOICE" partyIdFrom="AcctBigSupplier" partyId="Company" statusId="INVOICE_PAID" invoiceDate="2009-07-11 12:25:26.085" paidDate="2009-07-11 12:28:44.034" dueDate="2009-08-10 12:25:26.085" currencyUomId="USD"/>
<Invoice invoiceId="8004" invoiceTypeId="PURCHASE_INVOICE" partyIdFrom="DemoSupplier" partyId="Company" statusId="INVOICE_PAID" invoiceDate="2009-07-11 12:26:29.758" paidDate="2009-07-11 12:28:44.95" dueDate="2009-08-10 12:26:29.758" currencyUomId="USD"/>
<InvoiceItem invoiceId="8002" invoiceItemSeqId="00001" invoiceItemTypeId="PINV_WE_ITEM" uomId="USD" taxableFlag="Y" amount="33.990"/>
<InvoiceItem invoiceId="8002" invoiceItemSeqId="00002" invoiceItemTypeId="PINV_SURCHARGE_ADJ" uomId="USD" taxableFlag="Y" amount="2.440"/>
<InvoiceItem invoiceId="8003" invoiceItemSeqId="00001" invoiceItemTypeId="PINV_WE_ITEM" uomId="USD" taxableFlag="Y" amount="33.990"/>
<InvoiceItem invoiceId="8003" invoiceItemSeqId="00002" invoiceItemTypeId="PINV_SURCHARGE_ADJ" uomId="USD" taxableFlag="Y" amount="2.440"/>
<InvoiceItem invoiceId="8003" invoiceItemSeqId="00003" invoiceItemTypeId="PITM_FEE" taxableFlag="Y" amount="10.000"/>
<InvoiceItem invoiceId="8004" invoiceItemSeqId="00001" invoiceItemTypeId="PINV_WE_ITEM" uomId="USD" taxableFlag="Y" amount="33.990"/>
<InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="8002" statusDate="2009-07-11 12:24:31.854"/>
<InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="8003" statusDate="2009-07-11 12:25:26.088"/>
<InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="8004" statusDate="2009-07-11 12:26:29.761"/>
<InvoiceStatus statusId="INVOICE_READY" invoiceId="8002" statusDate="2009-07-11 12:24:42.425"/>
<InvoiceStatus statusId="INVOICE_READY" invoiceId="8003" statusDate="2009-07-11 12:26:07.814"/>
<InvoiceStatus statusId="INVOICE_READY" invoiceId="8004" statusDate="2009-07-11 12:27:04.758"/>
<InvoiceStatus statusId="INVOICE_PAID" invoiceId="8002" statusDate="2009-07-11 12:28:44.788"/>
<InvoiceStatus statusId="INVOICE_PAID" invoiceId="8003" statusDate="2009-07-11 12:28:44.589"/>
<InvoiceStatus statusId="INVOICE_PAID" invoiceId="8004" statusDate="2009-07-11 12:28:45.144"/>
<Payment paymentId="8001" paymentTypeId="VENDOR_PAYMENT" paymentMethodTypeId="COMPANY_CHECK" partyIdFrom="Company" partyIdTo="AcctBigSupplier" statusId="PMNT_SENT" effectiveDate="2009-07-11 12:28:44.034" paymentRefNum="100,100" amount="82.86" currencyUomId="USD"/>
<Payment paymentId="8002" paymentTypeId="VENDOR_PAYMENT" paymentMethodTypeId="COMPANY_CHECK" partyIdFrom="Company" partyIdTo="DemoSupplier" statusId="PMNT_SENT" effectiveDate="2009-07-11 12:28:44.95" paymentRefNum="100,101" amount="33.99" currencyUomId="USD"/>
<PaymentApplication paymentApplicationId="9000" paymentId="8001" invoiceId="8002" amountApplied="36.43"/>
<PaymentApplication paymentApplicationId="9001" paymentId="8001" invoiceId="8003" amountApplied="46.43"/>
<PaymentApplication paymentApplicationId="9002" paymentId="8002" invoiceId="8004" amountApplied="33.99"/>
<PaymentGroup paymentGroupId="9000" paymentGroupTypeId="CHECK_RUN" paymentGroupName="Check Run for 2009-07-11 12:28:44.95"/>
<PaymentGroupMember paymentGroupId="9000" paymentId="8001" fromDate="2009-07-11 12:28:45.315"/>
<PaymentGroup paymentGroupId="9001" paymentGroupTypeId="CHECK_RUN" paymentGroupName="Check run for 2009-08-11 12:28:45.315"/>
<PaymentGroupMember paymentGroupId="9001" paymentId="8002" fromDate="2009-08-11 12:28:45.315"/>
<AcctgTrans acctgTransId="8000" acctgTransTypeId="PURCHASE_INVOICE" transactionDate="2009-07-06 16:50:43.806" isPosted="Y" postedDate="2009-07-06 16:50:44.219" glFiscalTypeId="ACTUAL" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8000"/>
<AcctgTrans acctgTransId="8001" acctgTransTypeId="OUTGOING_PAYMENT" transactionDate="2009-07-06 16:53:49.259" isPosted="Y" postedDate="2009-07-06 16:53:49.741" glFiscalTypeId="ACTUAL" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" paymentId="8000"/>
<AcctgTrans acctgTransId="8002" acctgTransTypeId="PURCHASE_INVOICE" transactionDate="2009-07-06 16:50:43.806" isPosted="Y" postedDate="2009-07-06 16:50:44.219" glFiscalTypeId="ACTUAL" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8001"/>
<AcctgTrans acctgTransId="8003" acctgTransTypeId="PURCHASE_INVOICE" transactionDate="2009-07-11 12:24:42.744" isPosted="Y" postedDate="2009-07-11 12:24:43.469" glFiscalTypeId="ACTUAL" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8002"/>
<AcctgTrans acctgTransId="8004" acctgTransTypeId="PURCHASE_INVOICE" transactionDate="2009-07-11 12:26:08.03" isPosted="Y" postedDate="2009-07-11 12:26:08.317" glFiscalTypeId="ACTUAL" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8003"/>
<AcctgTrans acctgTransId="8005" acctgTransTypeId="PURCHASE_INVOICE" transactionDate="2009-07-11 12:27:04.916" isPosted="Y" postedDate="2009-07-11 12:27:05.127" glFiscalTypeId="ACTUAL" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8004"/>
<AcctgTrans acctgTransId="8006" acctgTransTypeId="OUTGOING_PAYMENT" transactionDate="2009-07-11 12:28:44.219" isPosted="Y" postedDate="2009-07-11 12:28:44.451" glFiscalTypeId="ACTUAL" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" paymentId="8001"/>
<AcctgTrans acctgTransId="8007" acctgTransTypeId="PAYMENT_APPL" transactionDate="2009-07-11 12:28:44.655" isPosted="Y" postedDate="2009-07-11 12:28:44.762" glFiscalTypeId="ACTUAL" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8003" paymentId="8001"/>
<AcctgTrans acctgTransId="8008" acctgTransTypeId="PAYMENT_APPL" transactionDate="2009-07-11 12:28:44.828" isPosted="Y" postedDate="2009-07-11 12:28:44.933" glFiscalTypeId="ACTUAL" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8002" paymentId="8001"/>
<AcctgTrans acctgTransId="8009" acctgTransTypeId="OUTGOING_PAYMENT" transactionDate="2009-07-11 12:28:44.996" isPosted="Y" postedDate="2009-07-11 12:28:45.1" glFiscalTypeId="ACTUAL" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" paymentId="8002"/>
<AcctgTrans acctgTransId="8010" acctgTransTypeId="PAYMENT_APPL" transactionDate="2009-07-11 12:28:45.183" isPosted="Y" postedDate="2009-07-11 12:28:45.305" glFiscalTypeId="ACTUAL" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8004" paymentId="8002"/>
<AcctgTransEntry acctgTransId="8000" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="649000" organizationPartyId="Company" amount="60.00" currencyUomId="USD" origAmount="60.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8000" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="60.00" currencyUomId="USD" origAmount="60.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8001" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="213000" organizationPartyId="Company" amount="70.00" currencyUomId="USD" origAmount="70.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8001" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="60.00" currencyUomId="USD" origAmount="60.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8001" acctgTransEntrySeqId="00003" acctgTransEntryTypeId="_NA_" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="10.00" currencyUomId="USD" origAmount="10.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8002" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" productId="GZ-1000" glAccountId="516100" organizationPartyId="Company" amount="10.00" currencyUomId="USD" origAmount="10.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8002" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="10.00" currencyUomId="USD" origAmount="10.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8003" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="140000" organizationPartyId="Company" amount="33.99" currencyUomId="USD" origAmount="33.99" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8003" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="516100" organizationPartyId="Company" amount="2.44" currencyUomId="USD" origAmount="2.44" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8003" acctgTransEntrySeqId="00003" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="36.43" currencyUomId="USD" origAmount="36.43" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8004" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="140000" organizationPartyId="Company" amount="33.99" currencyUomId="USD" origAmount="33.99" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8004" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="516100" organizationPartyId="Company" amount="2.44" currencyUomId="USD" origAmount="2.44" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8004" acctgTransEntrySeqId="00003" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="516100" organizationPartyId="Company" amount="10.00" currencyUomId="USD" origAmount="10.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8004" acctgTransEntrySeqId="00004" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="46.43" currencyUomId="USD" origAmount="46.43" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8005" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="140000" organizationPartyId="Company" amount="33.99" currencyUomId="USD" origAmount="33.99" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8005" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="33.99" currencyUomId="USD" origAmount="33.99" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8006" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="111100" organizationPartyId="Company" amount="82.86" currencyUomId="USD" origAmount="82.86" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8006" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="82.86" currencyUomId="USD" origAmount="82.86" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8007" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="46.43" currencyUomId="USD" origAmount="46.43" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8007" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="46.43" currencyUomId="USD" origAmount="46.43" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8008" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="36.43" currencyUomId="USD" origAmount="36.43" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8008" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="36.43" currencyUomId="USD" origAmount="36.43" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8009" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="111100" organizationPartyId="Company" amount="33.99" currencyUomId="USD" origAmount="33.99" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8009" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="33.99" currencyUomId="USD" origAmount="33.99" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8010" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="33.99" currencyUomId="USD" origAmount="33.99" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8010" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="33.99" currencyUomId="USD" origAmount="33.99" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<!-- Demo invoice data for sales invoice with INVOICE_PAID status -->
<Party partyId="DemoCustAgent"/>
<PartyRole partyId="DemoCustAgent" roleTypeId="SALES_REP"/>
<Product productId="WG-9943" productTypeId="FINISHED_GOOD"/>
<Product productId="WG-9943-B3" productTypeId="FINISHED_GOOD"/>
<Agreement agreementId="8000" partyIdFrom="Company" partyIdTo="DemoCustAgent" agreementTypeId="COMMISSION_AGREEMENT" description="Commission Agreement with DemoCustAgent"/>
<AgreementItem agreementId="8000" agreementItemSeqId="0001" agreementItemTypeId="AGREEMENT_COMMISSION" currencyUomId="USD" agreementText="Commission in USD"/>
<AgreementTerm agreementTermId="8000" termTypeId="FIN_COMM_FIXED" agreementId="8000" agreementItemSeqId="0001" invoiceItemTypeId="INV_FPROD_ITEM" termValue="1.000" termDays="30"/>
<AgreementTerm agreementTermId="8001" termTypeId="FIN_COMM_VARIABLE" agreementId="8000" agreementItemSeqId="0001" invoiceItemTypeId="INV_FPROD_ITEM" termValue="3.000" termDays="30"/>
<AgreementTerm agreementTermId="8002" termTypeId="FIN_COMM_MIN" agreementId="8000" agreementItemSeqId="0001" invoiceItemTypeId="INV_FPROD_ITEM" termValue="0.000" termDays="30"/>
<AgreementProductAppl agreementId="8000" agreementItemSeqId="0001" productId="WG-9943"/>
<Invoice invoiceId="8100" invoiceTypeId="SALES_INVOICE" partyIdFrom="Company" partyId="admin" statusId="INVOICE_PAID" invoiceDate="2009-07-08 11:54:00.765" paidDate="2009-07-08 11:54:03.246" dueDate="2009-08-07 11:54:00.765" currencyUomId="USD"/>
<InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="8100" statusDate="2009-07-08 11:54:00.845"/>
<InvoiceStatus statusId="INVOICE_PAID" invoiceId="8100" statusDate="2009-07-08 11:54:03.8"/>
<InvoiceStatus statusId="INVOICE_READY" invoiceId="8100" statusDate="2009-07-08 11:54:01.863"/>
<InvoiceItem invoiceId="8100" invoiceItemSeqId="00002" invoiceItemTypeId="INV_FPROD_ITEM" productId="WG-9943-B3" quantity="3.000000" amount="440.000" description="Giant Widget B3"/>
<InvoiceRole invoiceId="8100" partyId="Company" roleTypeId="BILL_FROM_VENDOR" datetimePerformed="2009-07-08 11:54:00.979"/>
<InvoiceRole invoiceId="8100" partyId="DemoCustAgent" roleTypeId="SALES_REP" datetimePerformed="2009-07-08 11:54:00.979"/>
<!-- Demo Invoice data in READY status, it is prepared to test checkrun process. This will issue two check for three invoices[(8005),(8006,8007)]. -->
<Invoice invoiceId="8005" invoiceTypeId="PURCHASE_INVOICE" partyIdFrom="DemoSupplier" partyId="Company" statusId="INVOICE_READY" invoiceDate="2009-07-11 12:26:29.758" paidDate="" dueDate="2009-08-10 12:26:29.758" description="Another invoice" currencyUomId="USD"/>
<Invoice invoiceId="8006" invoiceTypeId="PURCHASE_INVOICE" partyIdFrom="AcctBigSupplier" partyId="Company" statusId="INVOICE_READY" invoiceDate="2009-07-11 12:25:26.085" paidDate="" dueDate="2009-08-10 12:25:26.085" description="Another invoice" currencyUomId="USD"/>
<Invoice invoiceId="8007" invoiceTypeId="PURCHASE_INVOICE" partyIdFrom="AcctBigSupplier" partyId="Company" statusId="INVOICE_READY" invoiceDate="2009-07-11 12:24:31.85" paidDate="" dueDate="2009-08-10 12:24:31.85" description="Another invoice" currencyUomId="USD"/>
<InvoiceItem invoiceId="8005" invoiceItemSeqId="00001" invoiceItemTypeId="PINV_WE_ITEM" uomId="USD" taxableFlag="Y" amount="33.990" description="Service received"/>
<InvoiceItem invoiceId="8006" invoiceItemSeqId="00003" invoiceItemTypeId="PITM_FEE" taxableFlag="Y" amount="10.000"/>
<InvoiceItem invoiceId="8006" invoiceItemSeqId="00002" invoiceItemTypeId="PINV_SURCHARGE_ADJ" uomId="USD" taxableFlag="Y" amount="2.440" description="Service received"/>
<InvoiceItem invoiceId="8006" invoiceItemSeqId="00001" invoiceItemTypeId="PINV_WE_ITEM" uomId="USD" taxableFlag="Y" amount="33.990" description="Service received"/>
<InvoiceItem invoiceId="8007" invoiceItemSeqId="00002" invoiceItemTypeId="PINV_SURCHARGE_ADJ" uomId="USD" taxableFlag="Y" amount="2.440" description="Service received"/>
<InvoiceItem invoiceId="8007" invoiceItemSeqId="00001" invoiceItemTypeId="PINV_WE_ITEM" uomId="USD" taxableFlag="Y" amount="33.990" description="Service received"/>
<InvoiceStatus statusId="INVOICE_READY" invoiceId="8005" statusDate="2009-07-11 12:28:45.144"/>
<InvoiceStatus statusId="INVOICE_READY" invoiceId="8007" statusDate="2009-07-11 12:28:44.788"/>
<InvoiceStatus statusId="INVOICE_READY" invoiceId="8006" statusDate="2009-07-11 12:28:44.589"/>
<AcctgTrans acctgTransId="8011" acctgTransTypeId="PURCHASE_INVOICE" transactionDate="2009-07-10 00:00:00.000" isPosted="Y" postedDate="2009-07-11 00:00:00.000" glFiscalTypeId="ACTUAL" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8005"/>
<AcctgTransEntry acctgTransId="8011" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="649000" organizationPartyId="Company" amount="100" currencyUomId="USD" origAmount="100" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8011" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="100" currencyUomId="USD" origAmount="100" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTrans acctgTransId="8012" acctgTransTypeId="PURCHASE_INVOICE" transactionDate="2009-07-10 00:00:00.000" isPosted="Y" postedDate="2009-07-11 00:00:00.000" glFiscalTypeId="ACTUAL" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8006"/>
<AcctgTransEntry acctgTransId="8012" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="649000" organizationPartyId="Company" amount="100" currencyUomId="USD" origAmount="100" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8012" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="100" currencyUomId="USD" origAmount="100" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTrans acctgTransId="8013" acctgTransTypeId="PURCHASE_INVOICE" transactionDate="2009-07-10 00:00:00.000" isPosted="Y" postedDate="2009-07-11 00:00:00.000" glFiscalTypeId="ACTUAL" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8007"/>
<AcctgTransEntry acctgTransId="8013" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountId="649000" organizationPartyId="Company" amount="100" currencyUomId="USD" origAmount="100" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/>
<AcctgTransEntry acctgTransId="8013" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="100" currencyUomId="USD" origAmount="100" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<!--Data for Batch Payments-->
<Payment paymentId="8003" paymentTypeId="CUSTOMER_PAYMENT" paymentMethodTypeId="COMPANY_CHECK" partyIdFrom="AcctBuyer" partyIdTo="Company" statusId="PMNT_RECEIVED" effectiveDate="2009-08-12 16:33:34.922" amount="20.00" currencyUomId="USD" actualCurrencyAmount="20.00" actualCurrencyUomId="USD"/>
<AcctgTrans acctgTransId="8014" acctgTransTypeId="INCOMING_PAYMENT" transactionDate="2009-08-13 10:51:37.47" isPosted="Y" postedDate="2009-08-13 10:51:38.159" glFiscalTypeId="ACTUAL" partyId="AcctBuyer" roleTypeId="BILL_TO_CUSTOMER" paymentId="8003"/>
<AcctgTransEntry acctgTransId="8014" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" glAccountId="112000" organizationPartyId="Company" amount="20.00" currencyUomId="USD" origAmount="20.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED" />
<AcctgTransEntry acctgTransId="8014" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" glAccountTypeId="ACCOUNTS_RECEIVABLE" glAccountId="120000" organizationPartyId="Company" amount="20.00" currencyUomId="USD" origAmount="20.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<FinAccountTrans finAccountTransId="9100" finAccountTransTypeId="DEPOSIT" finAccountId="SC_CHECKING" amount="50000.00"
partyId="Company" transactionDate="2009-04-01 00:00:01.000" entryDate="2009-04-01 00:00:01.000" performedByPartyId="admin" statusId="FINACT_TRNS_APPROVED"/>
<FinAccountTrans finAccountTransId="9101" finAccountTransTypeId="DEPOSIT" finAccountId="ABN_CHECKING" amount="75000.00"
partyId="Company" glReconciliationId="9000" transactionDate="2009-04-01 00:00:01.000" entryDate="2009-04-01 00:00:01.000" performedByPartyId="admin" statusId="FINACT_TRNS_APPROVED"/>
<FinAccountTrans finAccountTransId="9102" finAccountTransTypeId="WITHDRAWAL" finAccountId="ABN_CHECKING" amount="500.00"
partyId="Company" transactionDate="2009-07-18 00:00:01.000" entryDate="2009-07-18 00:00:01.000" performedByPartyId="admin" statusId="FINACT_TRNS_CREATED" paymentId="8001"/>
<Payment paymentId="8001" finAccountTransId="9102"/>
<FinAccountTrans finAccountTransId="9103" finAccountTransTypeId="DEPOSIT" finAccountId="ABN_CHECKING" amount="20.00"
partyId="Company" transactionDate="2009-08-12 16:34:33.306" entryDate="2009-08-12 16:34:33.306" paymentId="8003" statusId="FINACT_TRNS_CREATED"/>
<Payment paymentId="8003" finAccountTransId="9103"/>
<FinAccountTrans finAccountTransId="9104" finAccountTransTypeId="WITHDRAWAL" finAccountId="ABN_CHECKING" amount="33.990"
partyId="Company" transactionDate="2009-07-18 00:00:01.000" entryDate="2009-08-11 12:28:45.315" performedByPartyId="admin" statusId="FINACT_TRNS_CREATED" paymentId="8002"/>
<Payment paymentId="8002" finAccountTransId="9104"/>
<!-- invoice export demo data for replacement id's -->
<Product productId="GZ-2644"/><!-- further data to be added in other components" -->
<GoodIdentification goodIdentificationTypeId="INVOICE_EXPORT" idValue="GZ-2644-replaced" productId="GZ-2644"/>
<Party partyId="DemoCustomer"/><!-- further data to be added in other components" -->
<PartyIdentification idValue="DemoCustomer2" partyId="DemoCustomer" partyIdentificationTypeId="INVOICE_EXPORT"/>
</entity-engine-xml>
@@ -1,420 +0,0 @@
<?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.
-->
<entity-engine-xml>
<!-- Gl Setup Demo Data -->
<!-- for sales invoice items -->
<InvoiceItemType invoiceItemTypeId="INVOICE_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="INV_PROMOTION_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="INV_DISCOUNT_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="FEE" defaultGlAccountId="804000"/>
<InvoiceItemType invoiceItemTypeId="INV_MISC_CHARGE" defaultGlAccountId="409000"/>
<!-- <InvoiceItemType invoiceItemTypeId="INV_SALES_TAX" /> --> <!-- Use InvoiceItem.overrideGlAccountId -->
<InvoiceItemType invoiceItemTypeId="INV_SHIPPING_CHARGES" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="INV_SURCHARGE_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="INV_ADD_FEATURE" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="INV_WARRANTY_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="INV_INTRST_CHRG" defaultGlAccountId="810000"/>
<InvoiceItemType invoiceItemTypeId="INVOICE_ITM_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="ITM_PROMOTION_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="ITM_REPLACE_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="ITM_DISCOUNT_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="ITM_FEE" defaultGlAccountId="804000"/>
<InvoiceItemType invoiceItemTypeId="ITM_MISC_CHARGE" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="ITM_SALES_TAX" defaultGlAccountId="224100"/>
<InvoiceItemType invoiceItemTypeId="ITM_SHIPPING_CHARGES" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="ITM_SURCHARGE_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="ITM_ADD_FEATURE" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="ITM_WARRANTY_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="INV_PROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_FPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_DPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_FDPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_PROD_FEATR_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_SPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_WE_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="INV_TE_ITEM" defaultGlAccountId="401000"/>
<!-- invoice item types for purchase (AP) invoices -->
<InvoiceItemType invoiceItemTypeId="PINVOICE_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_PROMOTION_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_DISCOUNT_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="P_FEE" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_MISC_CHARGE" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_SALES_TAX" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_SHIP_CHARGES" defaultGlAccountId="510000"/>
<InvoiceItemType invoiceItemTypeId="PINV_SURCHARGE_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_ADD_FEATURE" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_WARRANTY_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINVOICE_ITM_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_PROMOTION_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_REPLACE_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_DISCOUNT_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_FEE" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_MISC_CHARGE" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_SALES_TAX" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_SHIP_CHARGES" defaultGlAccountId="510000"/>
<InvoiceItemType invoiceItemTypeId="PITM_SURCHARGE_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_ADD_FEATURE" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PITM_WARRANTY_ADJ" defaultGlAccountId="516100"/>
<InvoiceItemType invoiceItemTypeId="PINV_PROD_ITEM" defaultGlAccountId="214000"/>
<InvoiceItemType invoiceItemTypeId="PINV_FPROD_ITEM" defaultGlAccountId="214000"/>
<InvoiceItemType invoiceItemTypeId="PINV_DPROD_ITEM" defaultGlAccountId="500000"/>
<InvoiceItemType invoiceItemTypeId="PINV_FDPROD_ITEM" defaultGlAccountId="214000"/>
<InvoiceItemType invoiceItemTypeId="PINV_PROD_FEATR_ITEM" defaultGlAccountId="214000"/>
<InvoiceItemType invoiceItemTypeId="PINV_RPROD_ITEM" defaultGlAccountId="214000"/>
<InvoiceItemType invoiceItemTypeId="PINV_SPROD_ITEM" defaultGlAccountId="500000"/>
<InvoiceItemType invoiceItemTypeId="PINV_INVPRD_ITEM" defaultGlAccountId="650000"/>
<InvoiceItemType invoiceItemTypeId="PINV_SUPLPRD_ITEM" defaultGlAccountId="650000"/>
<InvoiceItemType invoiceItemTypeId="PINV_FXASTPRD_ITEM" defaultGlAccountId="650000"/>
<InvoiceItemType invoiceItemTypeId="PINV_WE_ITEM" defaultGlAccountId="140000"/>
<InvoiceItemType invoiceItemTypeId="PINV_TE_ITEM" defaultGlAccountId="140000"/>
<!-- invoice items for customer returns -->
<InvoiceItemType invoiceItemTypeId="CRT_PROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_FPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_DPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_FDPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_RPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_PROD_FEATR_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_SPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_WE_ITEM" defaultGlAccountId="424000"/>
<InvoiceItemType invoiceItemTypeId="CRT_TE_ITEM" defaultGlAccountId="424000"/>
<InvoiceItemType invoiceItemTypeId="CRT_PROMOTION_ADJ" defaultGlAccountId="422000"/>
<InvoiceItemType invoiceItemTypeId="CRT_REPLACE_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_DISCOUNT_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_FEE_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_MISC_ADJ" defaultGlAccountId="423000"/>
<!-- <InvoiceItemType invoiceItemTypeId="CRT_SALES_TAX_ADJ"/> --> <!-- Use InvoiceItem.overrideGlAccountId -->
<InvoiceItemType invoiceItemTypeId="CRT_SHIPPING_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_SURCHARGE_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_ADD_FEATURE_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_WARRANTY_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_MKTG_PKG_ADJ" defaultGlAccountId="423000"/>
<InvoiceItemType invoiceItemTypeId="CRT_MAN_ADJ" defaultGlAccountId="423000"/>
<!-- invoice items for returns to suppliers -->
<InvoiceItemType invoiceItemTypeId="SRT_PROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_FPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_DPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_FDPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_RPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_PROD_FEATR_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_SPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_WE_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_TE_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_PROMOTION_ADJ" defaultGlAccountId="410000"/>
<InvoiceItemType invoiceItemTypeId="SRT_REPLACE_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_DISCOUNT_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_FEE_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_MISC_ADJ" defaultGlAccountId="409000"/>
<!-- <InvoiceItemType invoiceItemTypeId="SRT_SALES_TAX_ADJ"/> --> <!-- Use InvoiceItem.overrideGlAccountId -->
<InvoiceItemType invoiceItemTypeId="SRT_SHIPPING_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_SURCHARGE_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_ADD_FEATURE_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_WARRANTY_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_MKTG_PKG_ADJ" defaultGlAccountId="409000"/>
<InvoiceItemType invoiceItemTypeId="SRT_MAN_ADJ" defaultGlAccountId="409000"/>
<!-- invoice item types for commission invoices -->
<InvoiceItemType invoiceItemTypeId="COMM_INV_ITEM" defaultGlAccountId="601300"/>
<InvoiceItemType invoiceItemTypeId="COMM_INV_ADJ" defaultGlAccountId="601400"/>
<!-- invoice item types for payrol invoices PAYROL_EARN_HOURS-->
<InvoiceItemType invoiceItemTypeId="PAYROL_HRLY_RATE" defaultGlAccountId="601100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_HRLY_RATE_SIC" defaultGlAccountId="603100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_SALARY" defaultGlAccountId="601100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_SALARY_SICK" defaultGlAccountId="603100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_SALARY_VAC" defaultGlAccountId="602100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_BONUS" defaultGlAccountId="601000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_COMMISSION" defaultGlAccountId="601300"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_ADV_PAY" defaultGlAccountId="601100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_MIL_REIMB" defaultGlAccountId="601000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_OFF_EXP_REIMB" defaultGlAccountId="601000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_PAYPER_OVRPAY" defaultGlAccountId="601100"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_PAYPER_PAY" defaultGlAccountId="601100"/>
<!-- invoice item types for payrol invoices DEDUCTIONS-->
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_FROM_GROSS" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_125COMPY" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_125PPO" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_125HSA" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_401K" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_REPAY" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_CHAR_DONAT" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_CHILD_SUPP" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_MISC" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_ROTH_401K" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_SIMP_IRA" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_UNION" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_SAL_TIMOFF" defaultGlAccountId="605000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_DD_WAG_GARN" defaultGlAccountId="605000"/>
<!-- invoice item types for payrol invoices TAXES-->
<InvoiceItemType invoiceItemTypeId="PAYROL_TAXES" defaultGlAccountId="604000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_TAX_FEDERAL" defaultGlAccountId="604000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_SOC_SEC_EMPL" defaultGlAccountId="604000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_TAX_MED_EMPL" defaultGlAccountId="604000"/>
<InvoiceItemType invoiceItemTypeId="PAYROL_TAX_MD_WITHOL" defaultGlAccountId="604000"/>
<PaymentMethodType paymentMethodTypeId="CREDIT_CARD" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="GIFT_CARD" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="GIFT_CERTIFICATE" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="CASH" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EFT_ACCOUNT" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="FIN_ACCOUNT" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="PERSONAL_CHECK" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="COMPANY_CHECK" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="CERTIFIED_CHECK" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="MONEY_ORDER" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="COMPANY_ACCOUNT" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_BILLACT" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_COD" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_EBAY" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_OFFLINE" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_PAYPAL" defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_WORLDPAY" defaultGlAccountId="122000"/>
<CostComponentCalc costComponentCalcId="GEN_COST_CALC" costGlAccountTypeId="OPERATING_EXPENSE"/>
<CostComponentCalc costComponentCalcId="TASK_COST_CALC" costGlAccountTypeId="OPERATING_EXPENSE"/>
<!-- General Ledger Setup for the "Company" organization for "Company" -->
<!-- GL journal for suspended transactions (failed post) -->
<GlJournal organizationPartyId="Company" glJournalId="ERROR_JOURNAL" glJournalName="Suspense transactions"/>
<PartyAcctgPreference partyId="Company" taxFormId="US_IRS_1120" cogsMethodId="COGS_LIFO" baseCurrencyUomId="USD"
invoiceSeqCustMethId="INV_HOOK_ENF_SEQ" invoiceIdPrefix="CI"
quoteIdPrefix="CQ"
orderIdPrefix="CO"
errorGlJournalId="ERROR_JOURNAL"/>
<!-- Chart Of Accounts -->
<GlAccountOrganization organizationPartyId="Company" glAccountId="100000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="110000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="111000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="111100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="111900" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="112000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="120000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="125000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="121800" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="122000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="122100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="122200" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="122300" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="122500" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="126000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="140000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="141000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="142000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="150000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="171000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="174000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="188000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="210000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="213000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="213200" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="213300" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="213500" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="214000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="215000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="216000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="221100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224106" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224140" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224151" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224153" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="224209" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="231000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="310000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="336000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="400000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="401000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="409000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="410000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="421000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="422000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="423000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="424000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="500000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="510000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="514000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="515000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="516100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="518000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="600000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="601000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="601100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="601200" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="601300" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="601400" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="602100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="602200" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="603100" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="603200" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="604000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="605000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="625000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="649000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="650000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="675400" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="804000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="810000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="850000" fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="900000" fromDate="2001-01-01 00:00:00.0"/>
<!-- Default mapping between account types and account ids -->
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="ACCOUNTS_RECEIVABLE" glAccountId="120000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="ACCREC_UNAPPLIED" glAccountId="126000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INTRSTINC_RECEIVABLE" glAccountId="121800"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INVENTORY_XFER_OUT" glAccountId="125000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INVENTORY_ACCOUNT" glAccountId="140000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="RAWMAT_INVENTORY" glAccountId="141000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="WIP_INVENTORY" glAccountId="142000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="PREPAID_EXPENSES" glAccountId="150000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="CUSTOMER_CREDIT" glAccountId="213000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="CUSTOMER_DEPOSIT" glAccountId="213300"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="UNINVOICED_SHIP_RCPT" glAccountId="214000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INVENTORY_XFER_IN" glAccountId="215000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="ACCPAYABLE_UNAPPLIED" glAccountId="216000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="COMMISSIONS_PAYABLE" glAccountId="221100"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="RETAINED_EARNINGS" glAccountId="336000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="SALES_ACCOUNT" glAccountId="400000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="COGS_ACCOUNT" glAccountId="500000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INV_ADJ_VAL" glAccountId="515000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="FX_GAIN_LOSS_ACCT" glAccountId="518000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="OPERATING_EXPENSE" glAccountId="600000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="PROFIT_LOSS_ACCOUNT" glAccountId="850000"/>
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="TAX_ACCOUNT" glAccountId="900000"/>
<!-- Demo Cost center -->
<GlAccountCategory glAccountCategoryId="9301" glAccountCategoryTypeId="COST_CENTER" description="Cost Center 1"/>
<GlAccountCategory glAccountCategoryId="9302" glAccountCategoryTypeId="COST_CENTER" description="Cost Center 2"/>
<GlAccountCategory glAccountCategoryId="9303" glAccountCategoryTypeId="COST_CENTER" description="Cost Center 3"/>
<!-- mappings for payments -->
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="CUSTOMER_REFUND" glAccountTypeId="CUSTOMER_CREDIT"/>
<!-- NOTE: do not change this -->
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="VENDOR_PAYMENT" glAccountTypeId="ACCPAYABLE_UNAPPLIED"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="VENDOR_PREPAY" glAccountTypeId="PREPAID_EXPENSES"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="COMMISSION_PAYMENT" glAccountTypeId="COMMISSIONS_PAYABLE"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="PAY_CHECK" glAccountTypeId="ACCPAYABLE_UNAPPLIED"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="GC_WITHDRAWAL" glAccountTypeId="CUSTOMER_CREDIT"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="SALES_TAX_PAYMENT" glAccountTypeId="ACCPAYABLE_UNAPPLIED"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="PAYROL_PAYMENT" glAccountTypeId="OPERATING_EXPENSE"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="PAYROLL_TAX_PAYMENT" glAccountTypeId="TAX_ACCOUNT"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="INCOME_TAX_PAYMENT" glAccountTypeId="TAX_ACCOUNT"/>
<!-- NOTE: do not change this -->
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="CUSTOMER_PAYMENT" glAccountTypeId="ACCREC_UNAPPLIED"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="CUSTOMER_DEPOSIT" glAccountTypeId="CUSTOMER_DEPOSIT"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="INTEREST_RECEIPT" glAccountTypeId="INTRSTINC_RECEIVABLE"/>
<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="GC_DEPOSIT" glAccountTypeId="CUSTOMER_DEPOSIT"/>
<!--
No need to load these if they are set with the 122000 account (the same set as a global value for the payment type)
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="CREDIT_CARD" glAccountId="122000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="GIFT_CARD" glAccountId="122000"/>
-->
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="GIFT_CERTIFICATE" glAccountId="120000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="CASH" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EFT_ACCOUNT" glAccountId="111100"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="FIN_ACCOUNT" glAccountId="111100"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="PERSONAL_CHECK" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="COMPANY_CHECK" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="CERTIFIED_CHECK" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="MONEY_ORDER" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="COMPANY_ACCOUNT" glAccountId="111100"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_BILLACT" glAccountId="213000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_COD" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_EBAY" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_OFFLINE" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_PAYPAL" glAccountId="122500"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_WORLDPAY" glAccountId="122500"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_AMERICANEXPRESS" glAccountId="122100"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_DINERSCLUB" glAccountId="122100"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_DISCOVER" glAccountId="122200"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_VISA" glAccountId="122300"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_MASTERCARD" glAccountId="122300"/>
<!--
No need to load these if they are set with the 122000 account (the default for the CREDIT_CARD payment method type)
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_ENROUTE" glAccountId="122000"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_CARTEBLANCHE" glAccountId="122000"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_JCB" glAccountId="122000"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_SOLO" glAccountId="122000"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_SWITCH" glAccountId="122000"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_VISAELECTRON" glAccountId="122000"/>
<CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_UATP" glAccountId="122000"/>
-->
<FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="GIFTCERT_ACCOUNT" glAccountId="213200"/>
<FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="DEPOSIT_ACCOUNT" glAccountId="213500"/>
<FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="BANK_ACCOUNT" glAccountId="213500"/>
<FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="INVESTMENT_ACCOUNT" glAccountId="213500"/>
<VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_LOST" glAccountId="514000"/>
<VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_STOLEN" glAccountId="514000"/>
<VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_FOUND" glAccountId="514000"/>
<VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_DAMAGED" glAccountId="514000"/>
<VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_INTEGR" glAccountId="514000"/>
<VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_SAMPLE" glAccountId="625000"/>
<!-- Some Sample Time Periods, two Years with Quarters -->
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6010" periodTypeId="FISCAL_YEAR" fromDate="2010-01-01 00:00:00.000" thruDate="2011-01-01 23:59:59.000" isClosed="N" periodNum="1" periodName="2010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6011" periodTypeId="FISCAL_QUARTER" fromDate="2010-01-01 00:00:00.000" thruDate="2010-04-01 23:59:59.000" isClosed="N" periodNum="2" periodName="2010/Q1" parentPeriodId="6010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6012" periodTypeId="FISCAL_QUARTER" fromDate="2010-04-01 00:00:00.000" thruDate="2010-07-01 23:59:59.000" isClosed="N" periodNum="3" periodName="2010/Q2" parentPeriodId="6010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6013" periodTypeId="FISCAL_QUARTER" fromDate="2010-07-01 00:00:00.000" thruDate="2010-10-01 23:59:59.000" isClosed="N" periodNum="4" periodName="2010/Q3" parentPeriodId="6010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6014" periodTypeId="FISCAL_QUARTER" fromDate="2010-10-01 00:00:00.000" thruDate="2011-01-01 23:59:59.000" isClosed="N" periodNum="5" periodName="2010/Q4" parentPeriodId="6010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6015" periodTypeId="FISCAL_YEAR" fromDate="2011-01-01 00:00:00.000" thruDate="2030-01-01 23:59:59.000" isClosed="N" periodNum="1" periodName="2011-2030"/>
<!-- to convert demo invoice -->
<UomConversionDated uomId="USD" uomIdTo="EUR" fromDate="2001-01-01 00:00:00.0" conversionFactor="0.7"/>
<UomConversionDated uomId="EUR" uomIdTo="USD" fromDate="2001-01-01 00:00:00.0" conversionFactor="1.5"/>
<UomConversionDated uomId="USD" uomIdTo="USD" fromDate="2001-01-01 00:00:00.0" conversionFactor="1"/>
<!-- Gl Reconciliation -->
<GlReconciliation glReconciliationId="9000" glReconciliationName="demoGlReconciliation" glAccountId="111100" statusId="GLREC_RECONCILED" organizationPartyId="Company" reconciledBalance="75000.00" reconciledDate="2009-08-08 20:03:14.000"/>
<GlReconciliation glReconciliationId="9001" glReconciliationName="testGlReconciliation" glAccountId="111100" statusId="GLREC_CREATED" organizationPartyId="Company" reconciledDate="2009-08-12 20:03:14.000"/>
<GlAccountCategoryMember glAccountId="112000" glAccountCategoryId="9301" fromDate="2009-07-08 11:54:03.8" amountPercentage="50"/>
<GlAccountCategoryMember glAccountId="112000" glAccountCategoryId="9302" fromDate="2009-07-08 11:54:03.8" amountPercentage="20"/>
<GlAccountCategoryMember glAccountId="112000" glAccountCategoryId="9303" fromDate="2009-07-08 11:54:03.8" amountPercentage="30"/>
<GlAccountCategoryMember glAccountId="140000" glAccountCategoryId="9301" fromDate="2009-05-08 11:54:03.8" amountPercentage="50"/>
<GlAccountCategoryMember glAccountId="140000" glAccountCategoryId="9302" fromDate="2009-06-08 11:54:03.8" amountPercentage="20"/>
<GlAccountCategoryMember glAccountId="140000" glAccountCategoryId="9303" fromDate="2009-07-08 11:54:03.8" amountPercentage="30"/>
<GlAccountCategoryMember glAccountId="516100" glAccountCategoryId="9301" fromDate="2009-06-08 11:54:03.8" amountPercentage="50"/>
<GlAccountCategoryMember glAccountId="516100" glAccountCategoryId="9302" fromDate="2009-08-08 11:54:03.8" amountPercentage="20"/>
<GlAccountCategoryMember glAccountId="516100" glAccountCategoryId="9303" fromDate="2009-07-08 11:54:03.8" amountPercentage="30"/>
</entity-engine-xml>
@@ -0,0 +1,367 @@
<?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.
-->
<entity-engine-xml>
<!-- The main Company Internal Organization -->
<Party partyId="Company" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="Company" groupName="Your Company Name Here" logoImageUrl="/images/ofbiz_logo.png"/>
<PartyRole partyId="Company" roleTypeId="BILL_FROM_VENDOR"/>
<PartyRole partyId="Company" roleTypeId="BILL_TO_CUSTOMER"/>
<PartyRole partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="Company" roleTypeId="_NA_"/>
<PartyStatus partyId="Company" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<ContactMech contactMechId="9000" contactMechTypeId="POSTAL_ADDRESS"/>
<PartyContactMech partyId="Company" contactMechId="9000" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
<PostalAddress contactMechId="9000" toName="Company XYZ" address1="2003 Open Blvd" city="Open City" postalCode="999999" countryGeoId="USA" stateProvinceGeoId="CA" geoPointId="9000"/>
<ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@example.com"/>
<PartyContactMech partyId="Company" contactMechId="Company" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="Company" contactMechId="Company" fromDate="2003-01-01 00:00:00.000"/>
<ContactMech contactMechId="CompanySupport" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbizsupport@example.com"/>
<PartyContactMech partyId="Company" contactMechId="CompanySupport" fromDate="2003-01-01 00:00:00.0" allowSolicitation="Y"/>
<PartyContactMechPurpose contactMechPurposeTypeId="SUPPORT_EMAIL" partyId="Company" contactMechId="CompanySupport" fromDate="2003-01-01 00:00:00.0"/>
<PartyContactMechPurpose partyId="Company" contactMechId="9000" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
<PartyContactMechPurpose partyId="Company" contactMechId="9000" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
<PartyContactMechPurpose partyId="Company" contactMechId="9000" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
<PartyGeoPoint partyId="Company" geoPointId="9000" fromDate="2009-01-09 00:00:00.000"/>
<!-- Sub-Organizations -->
<Party partyId="MARKETING" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="MARKETING" groupName="Marketing department"/>
<PartyRole partyId="MARKETING" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="MARKETING" roleTypeId="_NA_"/>
<PartyStatus partyId="MARKETING" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="MARKETING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="ACCOUNTING" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="ACCOUNTING" groupName="Accounting department"/>
<PartyRole partyId="ACCOUNTING" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="ACCOUNTING" roleTypeId="_NA_"/>
<PartyRole partyId="ACCOUNTING" roleTypeId="DEPARTMENT"/>
<PartyStatus partyId="ACCOUNTING" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="ACCOUNTING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="SALES" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="SALES" groupName="Sales department"/>
<PartyRole partyId="SALES" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="SALES" roleTypeId="_NA_"/>
<PartyStatus partyId="SALES" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="SALES" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="DEV" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="DEV" groupName="Development department"/>
<PartyRole partyId="DEV" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="DEV" roleTypeId="_NA_"/>
<PartyStatus partyId="DEV" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="DEV" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="TESTING" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="TESTING" groupName="Testing department"/>
<PartyRole partyId="TESTING" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="TESTING" roleTypeId="_NA_"/>
<PartyStatus partyId="TESTING" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="TESTING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/>
<!-- Development Teams -->
<Party partyId="DevTeam1" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2009-05-06 11:16:40.989" createdByUserLogin="admin" lastModifiedDate="2009-05-06 11:16:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="DevTeam1" groupName="Development Team1"/>
<PartyRole partyId="DevTeam1" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="DevTeam1" roleTypeId="_NA_"/>
<PartyStatus partyId="DevTeam1" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="DEV" partyIdTo="DevTeam1" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="DevTeam2" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2009-05-06 11:16:40.989" createdByUserLogin="admin" lastModifiedDate="2009-05-06 11:16:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="DevTeam2" groupName="Development Team2"/>
<PartyRole partyId="DevTeam2" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="DevTeam2" roleTypeId="_NA_"/>
<PartyStatus partyId="DevTeam2" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="DEV" partyIdTo="DevTeam2" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="DevTeam3" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2009-05-06 11:16:40.989" createdByUserLogin="admin" lastModifiedDate="2009-05-06 11:16:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="DevTeam3" groupName="Development Team3"/>
<PartyRole partyId="DevTeam3" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="DevTeam3" roleTypeId="_NA_"/>
<PartyStatus partyId="DevTeam3" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="DEV" partyIdTo="DevTeam3" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="DevTeam4" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2009-05-06 11:16:40.989" createdByUserLogin="admin" lastModifiedDate="2009-05-06 11:16:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="DevTeam4" groupName="Development Team4"/>
<PartyRole partyId="DevTeam4" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="DevTeam4" roleTypeId="_NA_"/>
<PartyStatus partyId="DevTeam4" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="DEV" partyIdTo="DevTeam4" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/>
<!-- Testing Teams-->
<Party partyId="TestingTeam1" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2009-05-06 11:16:40.989" createdByUserLogin="admin" lastModifiedDate="2009-05-06 11:16:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="TestingTeam1" groupName="Testing Team1"/>
<PartyRole partyId="TestingTeam1" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="TestingTeam1" roleTypeId="_NA_"/>
<PartyStatus partyId="TestingTeam1" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="TESTING" partyIdTo="TestingTeam1" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="TestingTeam2" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2009-05-06 11:16:40.989" createdByUserLogin="admin" lastModifiedDate="2009-05-06 11:16:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="TestingTeam2" groupName="Testing Team2"/>
<PartyRole partyId="TestingTeam2" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="TestingTeam2" roleTypeId="_NA_"/>
<PartyStatus partyId="TestingTeam2" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="TESTING" partyIdTo="TestingTeam2" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/>
<!--Team Members -->
<Party partyId="Developer1" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="Developer1" firstName="Developer1"/>
<PartyRole partyId="Developer1" roleTypeId="_NA_"/>
<PartyRole partyId="Developer1" roleTypeId="EMPLOYEE"/>
<PartyRole partyId="Developer1" roleTypeId="MANAGER"/>
<PartyStatus partyId="Developer1" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="Developer1" partyRelationshipTypeId="EMPLOYMENT" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="EMPLOYEE"
fromDate="2001-05-02 00:00:00.000"/>
<PartyRelationship partyIdFrom="DevTeam1" partyIdTo="Developer1" partyRelationshipTypeId="MANAGER" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="MANAGER"
fromDate="2001-05-02 00:00:00.000"/>
<PartyRelationship partyIdFrom="DevTeam1" partyIdTo="Developer1" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="_NA_"
fromDate="2001-05-02 00:00:00.000"/>
<Party partyId="Developer2" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="Developer2" firstName="Developer2"/>
<PartyRole partyId="Developer2" roleTypeId="_NA_"/>
<PartyRole partyId="Developer2" roleTypeId="EMPLOYEE"/>
<PartyStatus partyId="Developer2" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="Developer2" partyRelationshipTypeId="EMPLOYMENT" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="EMPLOYEE"
fromDate="2001-05-02 00:00:00.000"/>
<PartyRelationship partyIdFrom="DevTeam1" partyIdTo="Developer2" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="_NA_"
fromDate="2001-05-02 00:00:00.000"/>
<Party partyId="Developer3" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="Developer3" firstName="Developer3"/>
<PartyRole partyId="Developer3" roleTypeId="_NA_"/>
<PartyRole partyId="Developer3" roleTypeId="EMPLOYEE"/>
<PartyStatus partyId="Developer3" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="Developer3" partyRelationshipTypeId="EMPLOYMENT" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="EMPLOYEE"
fromDate="2001-05-02 00:00:00.000"/>
<PartyRelationship partyIdFrom="DevTeam1" partyIdTo="Developer3" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="_NA_"
fromDate="2001-05-02 00:00:00.000"/>
<Party partyId="TestingTeamMember1" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="TestingTeamMember1" firstName="TestingTeamMember1"/>
<PartyRole partyId="TestingTeamMember1" roleTypeId="_NA_"/>
<PartyRole partyId="TestingTeamMember1" roleTypeId="EMPLOYEE"/>
<PartyRole partyId="TestingTeamMember1" roleTypeId="MANAGER"/>
<PartyStatus partyId="TestingTeamMember1" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="TestingTeamMember1" partyRelationshipTypeId="EMPLOYMENT" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="EMPLOYEE"
fromDate="2001-05-02 00:00:00.000"/>
<PartyRelationship partyIdFrom="TestingTeam1" partyIdTo="TestingTeamMember1" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="_NA_"
fromDate="2001-05-02 00:00:00.000"/>
<PartyRelationship partyIdFrom="TestingTeam1" partyIdTo="TestingTeamMember1" partyRelationshipTypeId="MANAGER" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="MANAGER"
fromDate="2001-05-02 00:00:00.000"/>
<Party partyId="TestingTeamMember2" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="TestingTeamMember2" firstName="TestingTeamMember2"/>
<PartyRole partyId="TestingTeamMember2" roleTypeId="_NA_"/>
<PartyRole partyId="TestingTeamMember2" roleTypeId="EMPLOYEE"/>
<PartyStatus partyId="TestingTeamMember2" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="TestingTeamMember2" partyRelationshipTypeId="EMPLOYMENT" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="EMPLOYEE"
fromDate="2001-05-02 00:00:00.000"/>
<PartyRelationship partyIdFrom="TestingTeam1" partyIdTo="TestingTeamMember2" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="_NA_"
fromDate="2001-05-02 00:00:00.000"/>
<Party partyId="TestingTeamMember3" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="TestingTeamMember3" firstName="TestingTeamMember3"/>
<PartyRole partyId="TestingTeamMember3" roleTypeId="_NA_"/>
<PartyRole partyId="TestingTeamMember3" roleTypeId="EMPLOYEE"/>
<PartyStatus partyId="TestingTeamMember3" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Company" partyIdTo="TestingTeamMember3" partyRelationshipTypeId="EMPLOYMENT" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="EMPLOYEE"
fromDate="2001-05-02 00:00:00.000"/>
<PartyRelationship partyIdFrom="TestingTeam1" partyIdTo="TestingTeamMember3" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="_NA_"
fromDate="2001-05-02 00:00:00.000"/>
<!-- demo rates -->
<RateAmount rateTypeId="STANDARD" rateCurrencyUomId="USD" periodTypeId="RATE_HOUR" workEffortId="_NA_" partyId="_NA_" emplPositionTypeId="_NA_" fromDate="2000-01-01 00:00:00.000" rateAmount="95.0"/>
<RateAmount rateTypeId="DISCOUNTED" rateCurrencyUomId="USD" periodTypeId="RATE_HOUR" workEffortId="_NA_" partyId="_NA_" emplPositionTypeId="_NA_" fromDate="2000-01-01 00:00:00.000" rateAmount="55.0"/>
<RateAmount rateTypeId="OVERTIME" rateCurrencyUomId="USD" periodTypeId="RATE_HOUR" workEffortId="_NA_" partyId="_NA_" emplPositionTypeId="_NA_" fromDate="2000-01-01 00:00:00.000" rateAmount="125.0"/>
<!-- An Enterprise Internal Organization -->
<Party partyId="Enterprise" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="Enterprise" groupName="Large Enterprise, Inc." logoImageUrl="/images/ofbiz_logo.png"/>
<PartyRole partyId="Enterprise" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="Enterprise" roleTypeId="PARENT_ORGANIZATION"/>
<PartyStatus partyId="Enterprise" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<!-- Top tier divisions -->
<Party partyId="bu_div" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="bu_div" groupName="Business Unit Division"/>
<PartyRole partyId="bu_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="bu_div" roleTypeId="DIVISION"/>
<PartyStatus partyId="bu_div" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Enterprise" partyIdTo="bu_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="PARENT_ORGANIZATION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="md_div" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="md_div" groupName="Market Development Division"/>
<PartyRole partyId="md_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="md_div" roleTypeId="DIVISION"/>
<PartyStatus partyId="md_div" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Enterprise" partyIdTo="md_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="PARENT_ORGANIZATION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="cf_div" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="cf_div" groupName="Corporate Functions Division"/>
<PartyRole partyId="cf_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="cf_div" roleTypeId="DIVISION"/>
<PartyStatus partyId="cf_div" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="Enterprise" partyIdTo="cf_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="PARENT_ORGANIZATION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
<!-- Business unit divisions -->
<Party partyId="gizmo_div" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="gizmo_div" groupName="Gizmo Business Unit"/>
<PartyRole partyId="gizmo_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="gizmo_div" roleTypeId="DIVISION"/>
<PartyStatus partyId="gizmo_div" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="bu_div" partyIdTo="gizmo_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="widget_div" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="widget_div" groupName="Widget Business Unit"/>
<PartyRole partyId="widget_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="widget_div" roleTypeId="DIVISION"/>
<PartyStatus partyId="widget_div" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="bu_div" partyIdTo="widget_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
<!-- Market development divisions -->
<Party partyId="na_div" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="na_div" groupName="North America"/>
<PartyRole partyId="na_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="na_div" roleTypeId="DIVISION"/>
<PartyStatus partyId="na_div" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="md_div" partyIdTo="na_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="sa_div" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="sa_div" groupName="Central and South America"/>
<PartyRole partyId="sa_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="sa_div" roleTypeId="DIVISION"/>
<PartyStatus partyId="sa_div" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="md_div" partyIdTo="sa_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="we_div" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="we_div" groupName="Western Europe"/>
<PartyRole partyId="we_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="we_div" roleTypeId="DIVISION"/>
<PartyStatus partyId="we_div" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="md_div" partyIdTo="we_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="asia_div" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="asia_div" groupName="Asia"/>
<PartyRole partyId="asia_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="asia_div" roleTypeId="DIVISION"/>
<PartyStatus partyId="asia_div" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="md_div" partyIdTo="asia_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="anz_div" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="anz_div" groupName="Australia and New Zealand"/>
<PartyRole partyId="anz_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="anz_div" roleTypeId="DIVISION"/>
<PartyStatus partyId="anz_div" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="md_div" partyIdTo="anz_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="india_div" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
<PartyGroup partyId="india_div" groupName="India"/>
<PartyRole partyId="india_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="india_div" roleTypeId="DIVISION"/>
<PartyStatus partyId="india_div" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="md_div" partyIdTo="india_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
<!-- Business Unit departments -->
<Party partyId="RECEIVING" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="RECEIVING" groupName="Receiving Department"/>
<PartyRole partyId="RECEIVING" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="RECEIVING" roleTypeId="DEPARTMENT"/>
<PartyStatus partyId="RECEIVING" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="gizmo_div" partyIdTo="RECEIVING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<PartyRelationship partyIdFrom="widget_div" partyIdTo="RECEIVING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="PRODUCTION" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="PRODUCTION" groupName="Production Department"/>
<PartyRole partyId="PRODUCTION" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="PRODUCTION" roleTypeId="DEPARTMENT"/>
<PartyStatus partyId="PRODUCTION" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="gizmo_div" partyIdTo="PRODUCTION" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<PartyRelationship partyIdFrom="widget_div" partyIdTo="PRODUCTION" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="SHIPPING" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="SHIPPING" groupName="Shipping Department"/>
<PartyRole partyId="SHIPPING" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="SHIPPING" roleTypeId="DEPARTMENT"/>
<PartyStatus partyId="SHIPPING" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="gizmo_div" partyIdTo="SHIPPING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<PartyRelationship partyIdFrom="widget_div" partyIdTo="SHIPPING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="MAINTENANCE" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="MAINTENANCE" groupName="Maintenance Department"/>
<PartyRole partyId="MAINTENANCE" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="MAINTENANCE" roleTypeId="DEPARTMENT"/>
<PartyStatus partyId="MAINTENANCE" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="gizmo_div" partyIdTo="MAINTENANCE" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<PartyRelationship partyIdFrom="widget_div" partyIdTo="MAINTENANCE" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<!-- Corporate Functions departments -->
<Party partyId="LEGAL" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="LEGAL" groupName="Legal Department"/>
<PartyRole partyId="LEGAL" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="LEGAL" roleTypeId="DEPARTMENT"/>
<PartyStatus partyId="LEGAL" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="cf_div" partyIdTo="LEGAL" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="PUBLIC_REL" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="PUBLIC_REL" groupName="Public Relations"/>
<PartyRole partyId="PUBLIC_REL" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="PUBLIC_REL" roleTypeId="DEPARTMENT"/>
<PartyStatus partyId="PUBLIC_REL" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="cf_div" partyIdTo="PUBLIC_REL" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="HUMAN_RES" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="HUMAN_RES" groupName="Human Resources"/>
<PartyRole partyId="HUMAN_RES" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="HUMAN_RES" roleTypeId="DEPARTMENT"/>
<PartyStatus partyId="HUMAN_RES" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="cf_div" partyIdTo="HUMAN_RES" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="INFO_TECH" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="INFO_TECH" groupName="Information Technology"/>
<PartyRole partyId="INFO_TECH" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="INFO_TECH" roleTypeId="DEPARTMENT"/>
<PartyStatus partyId="INFO_TECH" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="cf_div" partyIdTo="INFO_TECH" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="R_AND_D" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="R_AND_D" groupName="Research and Development"/>
<PartyRole partyId="R_AND_D" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="R_AND_D" roleTypeId="DEPARTMENT"/>
<PartyStatus partyId="R_AND_D" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="cf_div" partyIdTo="R_AND_D" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<Party partyId="LOGISTICS" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="LOGISTICS" groupName="Logistics"/>
<PartyRole partyId="LOGISTICS" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="LOGISTICS" roleTypeId="DEPARTMENT"/>
<PartyStatus partyId="LOGISTICS" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
<PartyRelationship partyIdFrom="cf_div" partyIdTo="LOGISTICS" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
<PartyRelationship partyIdFrom="cf_div" partyIdTo="ACCOUNTING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
</entity-engine-xml>
@@ -0,0 +1,56 @@
<?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.
-->
<entity-engine-xml>
<!-- Payment Gateway Config -->
<PaymentGatewayConfig paymentGatewayConfigId="SAGEPAY_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_SAGEPAY" description="SagePay Config"/>
<PaymentGatewaySagePay paymentGatewayConfigId="SAGEPAY_CONFIG" vendor="YOUR_VENDOR_NAME" productionHost="https://live.sagepay.com:443" testingHost="https://test.sagepay.com:443" sagePayMode="TEST" protocolVersion="2.22" authenticationTransType="DEFERRED" authenticationUrl="/gateway/service/vspdirect-register.vsp" authoriseTransType="RELEASE" authoriseUrl="/gateway/service/release.vsp" releaseTransType="ABORT" releaseUrl="/gateway/service/abort.vsp" voidUrl="/gateway/service/void.vsp" refundUrl="/gateway/service/refund.vsp"/>
<PaymentGatewayConfig paymentGatewayConfigId="AUTHORIZE_NET_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_AUTH_NET" description="Authorize Dot Net Config"/>
<PaymentGatewayAuthorizeNet paymentGatewayConfigId="AUTHORIZE_NET_CONFIG" transactionUrl="https://test.authorize.net/gateway/transact.dll" certificateAlias="test.authorize.net" apiVersion="3.1" delimitedData="TRUE" delimiterChar="|" method="CC" emailCustomer="FALSE" emailMerchant="FALSE" testMode="TRUE" relayResponse="FALSE" tranKey="" userId="" pwd="" transDescription="OFBizAuthNet"/>
<PaymentGatewayConfig paymentGatewayConfigId="CYBERSOURCE_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_CYBERSRC" description="CyberSource Config"/>
<PaymentGatewayCyberSource paymentGatewayConfigId="CYBERSOURCE_CONFIG" merchantId="[MerchantID]" apiVersion="1.43" production="false" keysDir="${sys:getProperty('ofbiz.home')}/applications/accounting/icskeys" keysFile="merchantID.p12" logEnabled="true" logDir="${sys:getProperty('ofbiz.home')}/runtime/logs" logFile="cybersource.log" logSize="10" merchantDescr="Some Nice Web Store" merchantContact="" autoBill="false" enableDav="N" fraudScore="N" ignoreAvs="false" disableBillAvs="Y" avsDeclineCodes=""/>
<PaymentGatewayConfig paymentGatewayConfigId="EWAY_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_EWAY" description="eWay Config"/>
<PaymentGatewayEway paymentGatewayConfigId="EWAY_CONFIG" customerId="87654321" refundPwd="" testMode="Y" enableBeagle="N" enableCvn="N"/>
<PaymentGatewayConfig paymentGatewayConfigId="PAYFLOWPRO_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_PAYFLOWPRO" description="Payflow Pro Config"/>
<PaymentGatewayPayflowPro paymentGatewayConfigId="PAYFLOWPRO_CONFIG" certsPath="${sys:getProperty('ofbiz.home')}/applications/accounting/pfcerts" hostAddress="pilot-payflowpro.paypal.com" hostPort="443" timeout="80" proxyAddress="" proxyPort="80" proxyLogon="" proxyPassword=""
vendor="[Vendor]" userId="[PayFlow UserID]" pwd="[PayFlow Password]" partner="[PayFlow Partner]" checkAvs="Y" checkCvv2="Y" preAuth="Y" enableTransmit="true" logFileName="${sys:getProperty('ofbiz.home')}/runtime/logs/payflow_java.log" loggingLevel="6" maxLogFileSize="1000000" stackTraceOn="N" returnUrl="[Express Checkout Return URL]" cancelReturnUrl="[Express Checkout Cancel Return URL]" redirectUrl="[Express Checkout Customer Redirect URL]"/>
<PaymentGatewayConfig paymentGatewayConfigId="PAYPAL_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_PAYPAL" description="PayPal Config"/>
<PaymentGatewayPayPal paymentGatewayConfigId="PAYPAL_CONFIG" businessEmail="" apiUserName="" apiPassword="" apiSignature="" apiEnvironment="" notifyUrl="" returnUrl="" cancelReturnUrl="" imageUrl="" confirmTemplate="/order/emailconfirmation.ftl" redirectUrl="https://www.sandbox.paypal.com/webscr" confirmUrl="https://www.sandbox.paypal.com/us/cgi-bin/webscr" shippingCallbackUrl="" requireConfirmedShipping="N"/>
<PaymentGatewayConfig paymentGatewayConfigId="CLEARCOMMERCE_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_CLRCOMRC" description="Clear Commerce Config"/>
<PaymentGatewayClearCommerce paymentGatewayConfigId="CLEARCOMMERCE_CONFIG" sourceId="mySource" groupId="myGroup" clientId="[ClearCommerce clientId]" username="[ClearCommerce username]" pwd="[ClearCommerce password]" userAlias="[ClearCommerce alias]" effectiveAlias="" processMode="P" serverURL="https://test5x.clearcommerce.com:11500" enableCVM="N"/>
<PaymentGatewayConfig paymentGatewayConfigId="WORLDPAY_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_WORLDPAY" description="RBS WorldPay Config"/>
<PaymentGatewayWorldPay paymentGatewayConfigId="WORLDPAY_CONFIG" redirectUrl="https://select-test.worldpay.com/wcc/purchase" instId="" authMode="A" fixContact="N" hideContact="N" hideCurrency="N" langId="" noLanguageMenu="N" withDelivery="N" testMode="100"/>
<PaymentGatewayConfig paymentGatewayConfigId="ORBITAL_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_ORBITAL" description="Orbital Config"/>
<PaymentGatewayOrbital paymentGatewayConfigId="ORBITAL_CONFIG" username="ofbizuser" connectionPassword="ofbizpwd" merchantId="785240009879" engineClass="com.paymentech.orbital.sdk.engine.https.HttpsEngine" hostName="orbitalvar1.paymentech.net" port="443" hostNameFailover="orbitalvar2.paymentech.net" portFailover="443" connectionTimeoutSeconds="90" readTimeoutSeconds="90" authorizationURI="/authorize" sdkVersion="PaymentechSDK_6.3.0" sslSocketFactory="default" responseType="gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="SECUREPAY_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_SECUREPAY" description="SecurePay Config"/>
<PaymentGatewaySecurePay paymentGatewayConfigId="SECUREPAY_CONFIG" merchantId="[SecurePay MerchantID]" pwd="[SecurePay Password]" serverURL="[SecurePay serverURL]" processTimeout="80" enableAmountRound="N"/>
<PaymentGatewayConfig paymentGatewayConfigId="IDEAL_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_IDEAL" description="iDEAL Config"/>
<PaymentGatewayiDEAL paymentGatewayConfigId="IDEAL_CONFIG" merchantId="[iDEAL MerchantID]" merchantSubId="[iDEAL MerchantSubID]" merchantReturnURL="[iDEAL MerchantReturnURL]" acquirerURL="[iDEAL AcquirerURL]" acquirerTimeout="10" privateCert="[iDEAL PrivateCert]" acquirerKeyStoreFilename="[iDEAL AcquirerKeyStoreFilename]" acquirerKeyStorePassword="[iDEAL AcquirerKeyStorePassword]" merchantKeyStoreFilename="[iDEAL MerchantKeyStoreFilename]" merchantKeyStorePassword="[iDEAL MerchantKeyStorePassword]" expirationPeriod="[iDEAL ExpirationPeriod]"/>
</entity-engine-xml>
@@ -0,0 +1,83 @@
<?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.
-->
<entity-engine-xml>
<!-- ################################# -->
<!-- This is an example of a fixed asset (a machine or a workcenter) with standard costing information -->
<FixedAsset fixedAssetId="WORKCENTER_COST" fixedAssetTypeId="GROUP_EQUIPMENT" fixedAssetName="Demo Workcenter with Standard Costs information"/>
<!-- Deprecated: in the future cost information will be stored in the CostComponentCalc entity;
these entries can then be associated to a work effort thru the WorkEffortCostCalc entity. -->
<!-- This is the standard cost per hour needed to setup the fixed asset for the task -->
<FixedAssetStdCost fixedAssetId="WORKCENTER_COST" fixedAssetStdCostTypeId="SETUP_COST" fromDate="2005-12-31 00:01:00.0" amountUomId="USD" amount="20"/>
<!-- This is the standard cost per hour for the usage of the fixed asset to perform a given task -->
<FixedAssetStdCost fixedAssetId="WORKCENTER_COST" fixedAssetStdCostTypeId="USAGE_COST" fromDate="2005-12-31 00:01:00.0" amountUomId="USD" amount="80"/>
<!-- ################################# -->
<!-- ################################# -->
<!-- This is a finished good, PROD_COST, manufactured using 2 units of the raw material MAT_A_COST and 3 units of raw material MAT_B_COST -->
<!-- Finished good and raw materials definitions: -->
<Product productId="PROD_MANUF" productTypeId="FINISHED_GOOD" internalName="Demo Product for Costing" productName="Demo Product for Costing" description="Demo Product for Standard Costing" isVirtual="N" isVariant="N" billOfMaterialLevel="0"/>
<Product productId="MAT_A_COST" productTypeId="RAW_MATERIAL" internalName="Demo Material A for Costing" description="Demo Material A for Standard Costing" isVirtual="N" isVariant="N" billOfMaterialLevel="1"/>
<Product productId="MAT_B_COST" productTypeId="RAW_MATERIAL" internalName="Demo Material B for Costing" description="Demo Material B for Standard Costing" isVirtual="N" isVariant="N" billOfMaterialLevel="1"/>
<ProductPrice productId="PROD_MANUF" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="455.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
<ProductPrice productId="MAT_A_COST" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="40.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
<ProductPrice productId="MAT_B_COST" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="50.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
<!-- Cost information for the raw materials only (the ones for the finished good will be automatically computed by the costing algorithm): -->
<CostComponent costComponentId="6000" costComponentTypeId="EST_STD_MAT_COST" productId="MAT_A_COST" fromDate="2005-12-31 00:01:00.0" costUomId="USD" cost="9"/>
<CostComponent costComponentId="6001" costComponentTypeId="EST_STD_MAT_COST" productId="MAT_B_COST" fromDate="2005-12-31 00:01:00.0" costUomId="USD" cost="7"/>
<SupplierProduct partyId="DemoSupplier" supplierPrefOrderId="10_MAIN_SUPPL" minimumOrderQuantity="0" currencyUomId="USD" productId="MAT_A_COST" lastPrice="9.0" supplierProductId="MAT_A" supplierProductName="Material A" availableFromDate="2005-01-01 00:00:00.000"/>
<SupplierProduct partyId="DemoSupplier" supplierPrefOrderId="10_MAIN_SUPPL" minimumOrderQuantity="0" currencyUomId="USD" productId="MAT_B_COST" lastPrice="7.0" supplierProductId="MAT_B" supplierProductName="Material B" availableFromDate="2005-01-01 00:00:00.000"/>
<ProductFacility productId="PROD_MANUF" facilityId="WebStoreWarehouse" minimumStock="0" reorderQuantity="1" daysToShip="1"/>
<ProductFacility productId="MAT_A_COST" facilityId="WebStoreWarehouse" minimumStock="0" reorderQuantity="5" daysToShip="1"/>
<ProductFacility productId="MAT_B_COST" facilityId="WebStoreWarehouse" minimumStock="0" reorderQuantity="5" daysToShip="1"/>
<!-- ################################# -->
<!-- Bill of materials definition: -->
<ProductAssoc productId="PROD_MANUF" productIdTo="MAT_A_COST" productAssocTypeId="MANUF_COMPONENT" fromDate="2005-12-31 00:01:00.0" sequenceNum="10" quantity="2.0"/>
<ProductAssoc productId="PROD_MANUF" productIdTo="MAT_B_COST" productAssocTypeId="MANUF_COMPONENT" fromDate="2005-12-31 00:01:00.0" sequenceNum="20" quantity="3.0"/>
<!-- ################################# -->
<!-- Product Routing definition: -->
<!-- this routing is composed of one task -->
<!-- the task is executed in the fixed asset WORKCENTER_COST; the setup time is 10 minutes (600000 milliseconds); the unit task time is 5 minutes (300000 milliseconds) -->
<WorkEffort workEffortId="ROUTING_COST" workEffortTypeId="ROUTING" currentStatusId="ROU_ACTIVE" workEffortName="Demo Routing for Costing" description="Demo Routing for Costing" revisionNumber="1" quantityToProduce="0"/>
<WorkEffort workEffortId="TASK_COST" workEffortTypeId="ROU_TASK" workEffortPurposeTypeId="ROU_ASSEMBLING" currentStatusId="ROU_ACTIVE" workEffortName="Demo Routing Task for Costing" description="Demo Routing Task for Costing" revisionNumber="1" fixedAssetId="WORKCENTER_COST" estimatedMilliSeconds="300000" estimatedSetupMillis="600000"/>
<WorkEffortAssoc workEffortIdFrom="ROUTING_COST" workEffortIdTo="TASK_COST" workEffortAssocTypeId="ROUTING_COMPONENT" sequenceNum="10" fromDate="2005-12-31 00:01:00.0"/>
<WorkEffortGoodStandard workEffortId="ROUTING_COST" productId="PROD_MANUF" workEffortGoodStdTypeId="ROU_PROD_TEMPLATE" statusId="WEGS_CREATED" fromDate="2005-12-31 00:01:00.0"/>
<!-- Cost information for the task -->
<!-- This is the cost derived from fixed assets' usage; variableCost is per minute (perMilliSeconds=60000) -->
<CostComponentCalc costComponentCalcId="TASK_COST_CALC" description="Indirect cost (power supply)" currencyUomId="USD" fixedCost="1" variableCost="2" perMilliSecond="60000"/>
<WorkEffortCostCalc workEffortId="TASK_COST" costComponentTypeId="OTHER_COST" costComponentCalcId="TASK_COST_CALC" fromDate="2005-12-31 00:01:00.0"/>
<!-- General Cost for the finished product -->
<CostComponentCalc costComponentCalcId="GEN_COST_CALC" description="Overhead cost (5 percent of total cost) for general costs" currencyUomId="USD" fixedCost="0.05" costCustomMethodId="PROD_PERC_FORMULA"/>
<ProductCostComponentCalc productId="PROD_MANUF" costComponentTypeId="GEN_COST" costComponentCalcId="GEN_COST_CALC" fromDate="2005-12-31 00:01:00.0"/>
<InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL01" datetimeReceived="2008-08-01 08:00:00.000"
inventoryItemId="9029" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="MAT_A_COST" ownerPartyId="Company" currencyUomId="USD" unitCost="9.0"/>
<InventoryItemDetail inventoryItemId="9029" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="20" quantityOnHandDiff="20" accountingQuantityDiff="20"/>
<InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL01" datetimeReceived="2008-08-01 08:00:00.000"
inventoryItemId="9030" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="MAT_B_COST" ownerPartyId="Company" currencyUomId="USD" unitCost="7.0"/>
<InventoryItemDetail inventoryItemId="9030" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="20" quantityOnHandDiff="20" accountingQuantityDiff="20"/>
</entity-engine-xml>
@@ -0,0 +1,271 @@
<?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.
-->
<entity-engine-xml>
<Party partyId="USA_IRS" partyTypeId="PARTY_GROUP"/>
<PartyGroup partyId="USA_IRS" groupName="United States of America - Internal Revenue Service"/>
<PartyRole partyId="USA_IRS" roleTypeId="TAX_AUTHORITY"/>
<Party partyId="CA_BOE" partyTypeId="PARTY_GROUP"/>
<PartyGroup partyId="CA_BOE" groupName="State of California Board of Equalization"/>
<ContactMech contactMechId="CA_BOE_0" contactMechTypeId="POSTAL_ADDRESS"/>
<PostalAddress contactMechId="CA_BOE_0" toName="Board of Equalization" address1="P O BOX 942879" city="Sacramento" stateProvinceGeoId="CA" postalCode="94279" countryGeoId="USA"/>
<PartyContactMech partyId="CA_BOE" contactMechId="CA_BOE_0" fromDate="2000-01-01 00:00:00.000" allowSolicitation="N"/>
<PartyContactMechPurpose partyId="CA_BOE" contactMechId="CA_BOE_0" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
<PartyContactMechPurpose partyId="CA_BOE" contactMechId="CA_BOE_0" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
<PartyRole partyId="CA_BOE" roleTypeId="TAX_AUTHORITY"/>
<Party partyId="NY_DTF" partyTypeId="PARTY_GROUP"/>
<PartyGroup partyId="NY_DTF" groupName="New York Department of Taxation and Finance"/>
<ContactMech contactMechId="NY_DTF_0" contactMechTypeId="POSTAL_ADDRESS"/>
<PostalAddress contactMechId="NY_DTF_0" toName="NYS Sales Tax Processing" address1="JAF Building" address2="PO BOX 1205" city="New York" stateProvinceGeoId="NY" postalCode="11016" countryGeoId="USA"/>
<PartyContactMech partyId="NY_DTF" contactMechId="NY_DTF_0" fromDate="2000-01-01 00:00:00.000" allowSolicitation="N"/>
<PartyContactMechPurpose partyId="NY_DTF" contactMechId="NY_DTF_0" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
<PartyContactMechPurpose partyId="NY_DTF" contactMechId="NY_DTF_0" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
<PartyRole partyId="NY_DTF" roleTypeId="TAX_AUTHORITY"/>
<Party partyId="TX_TAXMAN" partyTypeId="PARTY_GROUP"/>
<PartyGroup partyId="TX_TAXMAN" groupName="Texas Sales Tax Authority"/>
<PartyRole partyId="TX_TAXMAN" roleTypeId="TAX_AUTHORITY"/>
<Party partyId="UT_TAXMAN" partyTypeId="PARTY_GROUP"/>
<PartyGroup partyId="UT_TAXMAN" groupName="Utah Sales Tax Authority"/>
<PartyRole partyId="UT_TAXMAN" roleTypeId="TAX_AUTHORITY"/>
<Party partyId="UT_UTAH_TAXMAN" partyTypeId="PARTY_GROUP"/>
<PartyGroup partyId="UT_UTAH_TAXMAN" groupName="Utah County, Utah Sales Tax Authority"/>
<PartyRole partyId="UT_UTAH_TAXMAN" roleTypeId="TAX_AUTHORITY"/>
<Party partyId="CAN_TAXMAN" partyTypeId="PARTY_GROUP"/>
<PartyGroup partyId="CAN_TAXMAN" groupName="Canada Tax Authority"/>
<PartyRole partyId="CAN_TAXMAN" roleTypeId="TAX_AUTHORITY"/>
<Party partyId="ON_TAXMAN" partyTypeId="PARTY_GROUP"/>
<PartyGroup partyId="ON_TAXMAN" groupName="Ontario Sales Tax (VAT) Authority"/>
<PartyRole partyId="ON_TAXMAN" roleTypeId="TAX_AUTHORITY"/>
<!-- _NA_ TaxAuthority defs -->
<ProductCategory productCategoryId="20111"/>
<TaxAuthority taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" includeTaxInPrice="N"/>
<TaxAuthorityGlAccount taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" organizationPartyId="Company" glAccountId="224000"/>
<TaxAuthorityCategory taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" productCategoryId="20111"/> <!-- Micro Widgets, a category to be used to test categorized rates -->
<!-- taxAuthorityRateSeqId left blank to be auto-sequenced during the EE XML import -->
<TaxAuthorityRateProduct taxAuthorityRateSeqId="9000" taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" taxAuthorityRateTypeId="SALES_TAX"
productCategoryId="" titleTransferEnumId="" minItemPrice="25.00" minPurchase="0.00" taxShipping="N" taxPercentage="1" taxPromotions="N"
fromDate="2001-05-13 00:00:00.001" thruDate="" description="1% OFB _NA_ Tax"/>
<!-- USA TaxAuthority defs -->
<TaxAuthority taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" taxIdFormatPattern="\d{2}\-\d{7}|\d{3}\-\d{2}\-\d{4}" includeTaxInPrice="N"/>
<TaxAuthorityGlAccount taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" organizationPartyId="Company" glAccountId="224100"/>
<TaxAuthority taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" includeTaxInPrice="N"/>
<TaxAuthorityGlAccount taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" organizationPartyId="Company" glAccountId="224106"/>
<TaxAuthorityAssoc taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" toTaxAuthGeoId="CA" toTaxAuthPartyId="CA_BOE" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/>
<TaxAuthorityRateProduct taxAuthorityRateSeqId="9001" taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" taxAuthorityRateTypeId="SALES_TAX"
productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="6.25" taxPromotions="N"
fromDate="2001-05-13 00:00:00.001" thruDate="" description="California State Sales Tax"/>
<TaxAuthority taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" includeTaxInPrice="N"/>
<TaxAuthorityGlAccount taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" organizationPartyId="Company" glAccountId="224140"/>
<TaxAuthorityAssoc taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" toTaxAuthGeoId="NY" toTaxAuthPartyId="NY_DTF" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/>
<TaxAuthorityRateProduct taxAuthorityRateSeqId="9002" taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" taxAuthorityRateTypeId="SALES_TAX"
productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="4.25" taxPromotions="N"
fromDate="2001-05-13 00:00:00.001" thruDate="" description="New York State Sales Tax"/>
<TaxAuthority taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" includeTaxInPrice="N"/>
<TaxAuthorityGlAccount taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" organizationPartyId="Company" glAccountId="224151"/>
<TaxAuthorityAssoc taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" toTaxAuthGeoId="TX" toTaxAuthPartyId="TX_TAXMAN" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/>
<TaxAuthorityRateProduct taxAuthorityRateSeqId="9003" taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" taxAuthorityRateTypeId="SALES_TAX"
productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="6.25" taxPromotions="N"
fromDate="2001-05-13 00:00:00.001" thruDate="" description="Texas State Sales Tax"/>
<TaxAuthority taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" includeTaxInPrice="N"/>
<TaxAuthorityGlAccount taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" organizationPartyId="Company" glAccountId="224153"/>
<TaxAuthorityAssoc taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" toTaxAuthGeoId="UT" toTaxAuthPartyId="UT_TAXMAN" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/>
<TaxAuthorityRateProduct taxAuthorityRateSeqId="9004" taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" taxAuthorityRateTypeId="SALES_TAX"
productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="4.75" taxPromotions="N"
fromDate="2001-05-13 00:00:00.001" thruDate="" description="Utah State Sales Tax"/>
<!-- An example county; there is some zip code data for testing this; note this is ONLY test data, there isn't really extra sales tax for this county -->
<TaxAuthority taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" includeTaxInPrice="N"/>
<!-- NOTE: using the state's sales tax GL Account -->
<TaxAuthorityGlAccount taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" organizationPartyId="Company" glAccountId="224153"/>
<TaxAuthorityAssoc taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" toTaxAuthGeoId="UT-UTAH" toTaxAuthPartyId="UT_UTAH_TAXMAN" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/>
<TaxAuthorityRateProduct taxAuthorityRateSeqId="9005" taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" taxAuthorityRateTypeId="SALES_TAX"
productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="0.1"
fromDate="2001-05-13 00:00:00.001" thruDate="" description="Utah County, Utah Sales Tax"/>
<!-- Canada TaxAuthority defs -->
<TaxAuthority taxAuthGeoId="CAN" taxAuthPartyId="CAN_TAXMAN" includeTaxInPrice="N"/>
<TaxAuthorityGlAccount taxAuthGeoId="CAN" taxAuthPartyId="CAN_TAXMAN" organizationPartyId="Company" glAccountId="224209"/>
<TaxAuthority taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN" includeTaxInPrice="Y"/>
<TaxAuthorityGlAccount taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN" organizationPartyId="Company" glAccountId="224209"/>
<!-- Party TaxAuthority info for Company -->
<!-- some interesting information at: http://www.taxadmin.org/fta/rate/tax_stru.html -->
<PartyTaxAuthInfo partyId="Company" taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/>
<PartyTaxAuthInfo partyId="Company" taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="12-3456789" isExempt="Y" isNexus="N"/>
<PartyTaxAuthInfo partyId="Company" taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/>
<PartyTaxAuthInfo partyId="Company" taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/>
<PartyTaxAuthInfo partyId="Company" taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="N"/> <!-- this one is not a nexus to test that feature -->
<PartyTaxAuthInfo partyId="Company" taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/>
<PartyTaxAuthInfo partyId="Company" taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/>
<PartyTaxAuthInfo partyId="Company" taxAuthGeoId="CAN" taxAuthPartyId="CAN_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="87654321" isExempt="N" isNexus="Y"/>
<PartyTaxAuthInfo partyId="Company" taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/>
<!-- EU tax authorities -->
<Party partyId="AUT_BMF" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2009-01-01 00:00:00.000"/>
<PartyGroup partyId="AUT_BMF" groupName="Bundesministerium für Finanzen"/>
<PartyRole partyId="AUT_BMF" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="AUT_BMF" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="AUT" taxIdFormatPattern="^(AT-?)[U]\d{9}$"/>
<Party partyId="BEL_FOD" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2009-01-01 00:00:00.000"/>
<PartyGroup partyId="BEL_FOD" groupName="Federale OverheidsDienst FINANCIËN"/>
<PartyRole partyId="BEL_FOD" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="BEL_FOD" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="BEL" taxIdFormatPattern="^(BE-?)\d{10}$"/>
<Party partyId="BGR_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="BGN" statusId="PARTY_ENABLED" createdDate="2009-01-01 00:00:00.000"/>
<PartyGroup partyId="BGR_TA" groupName="Tax Authority of Bulgaria"/>
<PartyRole partyId="BGR_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="BGR_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="BGR" taxIdFormatPattern="^(BG-?)\d{10}$"/>
<Party partyId="DEU_BZSt" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2009-01-01 00:00:00.000"/>
<PartyGroup partyId="DEU_BZSt" groupName="Bundeszentralamt für Steuern"/>
<PartyRole partyId="DEU_BZSt" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="DEU_BZSt" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="DEU" taxIdFormatPattern="^(DE-?)?{0,1}[0-9]{9}$"/>
<Party partyId="DNK_SKAT" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="DKK" statusId="PARTY_ENABLED" createdDate="2009-01-01 00:00:00.000"/>
<PartyGroup partyId="DNK_SKAT" groupName="SKAT"/>
<PartyRole partyId="DNK_SKAT" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="DNK_SKAT" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="DNK" taxIdFormatPattern="^(DK-?)?([0-9]{2}\ ?){3}[0-9]{2}$"/>
<Party partyId="CYP_ΤΕΠ" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="CYP_ΤΕΠ" groupName="Τμήματος Εσωτερικών Προσόδων"/>
<PartyRole partyId="CYP_ΤΕΠ" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="CYP_ΤΕΠ" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="CYP" taxIdFormatPattern="^(CY-?)?[0-9]{8}[A-Z]$"/>
<Party partyId="CZE_CDS" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="CZK" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="CZE_CDS" groupName="Česká daňová správa - Ministerstvo financí ČR"/>
<PartyRole partyId="CZE_CDS" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="CZE_CDS" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="CZE" taxIdFormatPattern="^(CZ-?)?[0-9]{8,10}$"/>
<Party partyId="ESP_AT" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="ESP_AT" groupName="Agenzia Tributaria"/>
<PartyRole partyId="ESP_AT" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="ESP_AT" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="ESP" taxIdFormatPattern="^(ES-?)?([0-9A-Z][0-9]{7}[A-Z])|([A-Z][0-9]{7}[0-9A-Z])$"/>
<Party partyId="EST_EMTA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="EST_EMTA" groupName="Maksu- ja Tolliamet"/>
<PartyRole partyId="EST_EMTA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="EST_EMTA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="EST" taxIdFormatPattern="^(EE-?)?{0,1}[0-9]{9}$"/>
<Party partyId="FIN_VERO" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="FIN_VERO" groupName="Verohallinto"/>
<PartyRole partyId="FIN_VERO" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="FIN_VERO" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="FIN" taxIdFormatPattern="^(FI-?)?{0,1}[0-9]{8}$"/>
<Party partyId="FRA_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="FRA_TA" groupName="Ministère de l'économie et des finances"/>
<PartyRole partyId="FRA_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="FRA_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="FRA" taxIdFormatPattern="^(FR-?)?[0-9A-Z]{2}\ ?[0-9]{9}$"/>
<Party partyId="GBR_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="GBP" statusId="PARTY_ENABLED" createdDate="2009-01-01 00:00:00.000"/>
<PartyGroup partyId="GBR_TA" groupName="HM Revenue and Customs"/>
<PartyRole partyId="GBR_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="GBR_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="GBR" taxIdFormatPattern="^(GB)?([0-9]{9}|[0-9]{12}|(GD|HA)[0-9]{3})$"/>
<Party partyId="GRC_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="GRC_TA" groupName="Tax Authority of Greece"/>
<PartyRole partyId="GRC_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="GRC_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="GRC" taxIdFormatPattern="^(EL-?)?{0,1}[0-9]{9}$"/>
<Party partyId="HRV_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="HRV_TA" groupName="Porezna Uprava"/>
<PartyRole partyId="HRV_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="HRV_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="HRV" taxIdFormatPattern="^(HR-?)?{0,1}[0-9]{11}$"/>
<Party partyId="HUN_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="HUF" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="HUN_TA" groupName="Tax Authority of Hungary"/>
<PartyRole partyId="HUN_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="HUN_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="HUN" taxIdFormatPattern="^(HU-?)?{0,1}[0-9]{8}$"/>
<Party partyId="IRL_ITC" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="IRL_ITC" groupName="Irish Tax and Customs"/>
<PartyRole partyId="IRL_ITC" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="IRL_ITC" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="IRL" taxIdFormatPattern="^(IE-?)?[0-9][0-9A-Z\+\*][0-9]{5}[A-Z]$"/>
<Party partyId="ITA_ADE" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="ITA_ADE" groupName="Agenzia delle Entrata"/>
<PartyRole partyId="ITA_ADE" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="ITA_ADE" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="ITA" taxIdFormatPattern="^(IT-?)?{0,1}[0-9]{11}$"/>
<Party partyId="LVA_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="LVA_TA" groupName="Tax Authority of Lativa"/>
<PartyRole partyId="LVA_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="LVA_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="LVA" taxIdFormatPattern="^(LV-?)?{0,1}[0-9]{11}$"/>
<Party partyId="LTU_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="LTU_TA" groupName="Tax Authority of Lithuania"/>
<PartyRole partyId="LTU_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="LTU_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="LTU" taxIdFormatPattern="^(LT-?)?([0-9]{9}|[0-9]{12})$"/>
<Party partyId="LUX_ACD" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="LUX_ACD" groupName="Administration des Contributions Directe"/>
<PartyRole partyId="LUX_ACD" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="LUX_ACD" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="LUX" taxIdFormatPattern="^(LU-?)?{0,1}[0-9]{8}$"/>
<Party partyId="MLT_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="MLT_TA" groupName="Tax Authority of MT (Malta)"/>
<PartyRole partyId="MLT_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="MLT_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="MLT" taxIdFormatPattern="^(MT-?)?{0,1}[0-9]{8}$"/>
<Party partyId="NLD_NBD" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2009-01-01 00:00:00.000"/>
<PartyGroup partyId="NLD_NBD" groupName="Ned. Belastingdienst"/>
<PartyRole partyId="NLD_NBD" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="NLD_NBD" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="NLD" taxIdFormatPattern="^(NL-?)?[0-9]{9}B[0-9]{2}$"/>
<Party partyId="POL_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="PLN" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="POL_TA" groupName="Tax Authority of PL"/>
<PartyRole partyId="POL_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="POL_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="POL" taxIdFormatPattern="^(PL-?)?{0,1}[0-9]{10}$"/>
<Party partyId="PRT_AT" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="PRT_AT" groupName="Autoritade Tributária e Aduaneira"/>
<PartyRole partyId="PRT_AT" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="PRT_AT" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="PRT" taxIdFormatPattern="^(PT-?)?{0,1}[0-9]{9}$"/>
<Party partyId="ROM_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="RON" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="ROM_TA" groupName="Tax Authority of Romania"/>
<PartyRole partyId="ROM_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="ROM_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="ROU" taxIdFormatPattern=""/>
<Party partyId="SVK_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="SVK_TA" groupName="Tax Authority of Slovakia"/>
<PartyRole partyId="SVK_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="SVK_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="SVK" taxIdFormatPattern="^(SK-?)?{0,1}[0-9]{10}$"/>
<Party partyId="SVN_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="SVN_TA" groupName="Tax Authority of Slovenia"/>
<PartyRole partyId="SVN_TA" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="SVN_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="SVN" taxIdFormatPattern="^(SI-?)?{0,1}[0-9]{8}$"/>
<Party partyId="SWE_SV" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="SEK" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
<PartyGroup partyId="SWE_SV" groupName="Skatteverket"/>
<PartyRole partyId="SWE_SV" roleTypeId="TAX_AUTHORITY"/>
<TaxAuthority taxAuthPartyId="SWE_SV" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="SWE" taxIdFormatPattern="^(SE-?)?{0,1}[0-9]{12}$"/>
</entity-engine-xml>
@@ -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>Accounting Introduction</title>
<para>
The Accounting system is organized according to age old and generally accepted principles such as double-entry accounting, a General Ledger with hierarchical accounts,
journals and posting of transactions and corresponding entries.
</para>
<para>
The structure is primary based on the OMG GL standard and the work that was done on an
AR/AP extension of the OMG GL standard. This correlates well with other standards such as ebXML and OAGIS.
</para>
<para>
The Accounting entities are structured such that accounts for multiple organizations can be managed. The multiple organizations could be multiple companies,
or departments or other organizations within a company. Each Organization can have various GL Accounts associated with it so that it can operate
with its own subset of the Master Chart of Accounts.
</para>
<para>
Each Organization can also have its own set of Journals for flexibility, even though the
use of Journals should be as minimal as possible in favor of allowing the system to automatically create and post transactions based on business events
triggered by standard procedures and documents such as purchase and sales orders, invoices, inventory transfers, payments, receipts, and so forth.
</para>
</section>
@@ -0,0 +1,32 @@
<?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 Assign GL Account help screen</title>
<para>The chart of accounts for the default organisation is built up by selecting or 'assigning' accounts that you want to use from the global chart of accounts master template. This means that if you want to create a new account then it needs to be created in the global chart of accounts before it can be assigned to be used. </para>
<section>
<title>How do I assign a GL account?</title>
<orderedlist>
<listitem><para>Click on the 'Assign GL Account' tab</para></listitem>
<listitem><para>Use the drop down box to select the 'GL Account Id' to required</para></listitem>
<listitem><para>Use the drop down box to select the 'Party Id' to assign the GL Account to (NOTE: Only parties that have been setup under 'Organization GL Settings' will be displayed)</para></listitem>
<listitem><para>Press the 'Create Assignment' button</para></listitem>
</orderedlist>
<para>NOTE: All assignments for a party can be viewed under 'Organization GL Settings / Setup / Chart of Accounts' for the party required.</para>
</section>
</section>
@@ -0,0 +1,102 @@
<?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 Authorize Transaction help screen</title>
<para>An authorization is a temporary transaction that shows a commitment to take money from an
account.</para>
<para>The 'Authorize' process is the first step in allowing a sales transaction payment to be
accepted. In OFBiz a service would be defined to carry out the authorisation process each
time for example, a credit card is used. It will perform specific validation tests before
the payment can be classes as 'authorised'. </para>
<para>When a payment is authorised it means that it has been validated and that the credit card
or bank account has been checked to ensure that it has sufficient funds available to cover
the proposed transaction. A number or code may be issued as evidence of the
authorisation.</para>
<para>NOTE: In the 'Payment' settings for a store as part of the Product Payment setup the user
can specify various services that will process a payment transactions through to completion.
This includes the following:</para>
<para>
<itemizedlist>
<listitem>
<para>Payment Authorisation</para>
</listitem>
<listitem>
<para>Payment Capture</para>
</listitem>
<listitem>
<para>Payment Credit</para>
</listitem>
<listitem>
<para>Payment Authentication Verification</para>
</listitem>
<listitem>
<para>Payment Re-Authorisation</para>
</listitem>
<listitem>
<para>Payment Refund</para>
</listitem>
<listitem>
<para>Payment Release Authorisation </para>
</listitem>
</itemizedlist>
</para>
<para>This is used to provide verification and approval for the first step of the sales
transaction payment process.</para>
<para>An 'Authorize' button is also displayed on Sales Order detail screen if a Credit Card
payment was specified for a sales order. This is probably a more natural place for a payment
transaction to be authorised.</para>
<para>NOTE: Using OFBiz demo data if DemoCustomer uses their credit card for payment then an
transaction is created that is automatically authorised and can be viewed using the Gateway
Responses. </para>
<section>
<title>How do I create and authorise a transaction?</title>
<para>
<orderedlist>
<listitem>
<para>Enter the 'Order Id' of the sales order for which payment is being
made</para>
</listitem>
<listitem>
<para>Enter the 'Order Payment Preference Id' (NOTE: This is automatically
generated at sales order creation and may be difficult to find out...I found
it by initially doing an order and then paying by DemoCustomer's credit card
and checking Gateway Responses for what was displayed in that field for the
order)</para>
</listitem>
<listitem>
<para>Select the 'Payment Method Type' (NOTE TO CHECK: What happens if you use
other selections not just credit card?)</para>
</listitem>
<listitem>
<para>Enter the 'Amount'</para>
</listitem>
<listitem>
<para>Press the 'Authorize' button</para>
</listitem>
<listitem>
<para>A new transaction should be displayed with the status of authorised</para>
</listitem>
</orderedlist>
</para>
<para>NOTE: The demo data payment settings for the Payment authorisation Service is set to
always approve so no transactions will display here because of this. Need to test and
maybe try removing the 'always approve' to see if the transaction will be created as
'unauthorised ' </para>
</section>
</section>
@@ -0,0 +1,199 @@
<?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 Financial Account Bank Reconciliation screen.</title>
<para>Bank Reconciliation is a regular task where transactions from the
company bank statement are matched against transactions that have
occurred in the General Ledger. This is done based on a specific
date(NOTE: This can be done daily, weekly but is usually an end of
month).</para>
<para> A specific GL account is normally used to represent the company
bank account and any accounting transaction that involves the bank
account will automatically record and entry in
the GL. </para>
<para>The bank reconciliation process ensures that the GL account and
the
bank statement reconcile to the same amounts. </para>
<para>Differences can occur between the GL and the bank statement for a
variety of valid reasons including the following:</para>
<itemizedlist>
<listitem>
<para>Payments or Deposits in process (especially cheques)</para>
</listitem>
<listitem>
<para>Interest or Bank Charges that are not known in advance but are
applied to the bank account</para>
</listitem>
<listitem>
<para>Currency or Exchange Rate variations / charges</para>
</listitem>
<listitem>
<para>Any outstanding </para>
</listitem>
</itemizedlist>
<para>NOTE: The differences will occur because of timing differences of
when and how transactions are recorded. Examples are as follows:
</para>
<orderedlist>
<listitem>
<para>Bank charges are known to the bank first and only once they
have applied the charge to the bank account can the company
duplicate the transaction in the GL to make the balance reconcile.
</para>
</listitem>
<listitem>
<para>A customer cheque payment may be recorded in the GL first
before it is paid into the bank account</para>
</listitem>
</orderedlist>
<section>
<title>How do I create a Bank Reconciliation?</title>
<para>The bank reconciliation process is made up of 3 steps.</para>
<orderedlist>
<listitem>
<para>Creating an account reconciliation group</para>
</listitem>
<listitem>
<para>Assigning transactions to the reconciliation</para>
</listitem>
<listitem>
<para>Validating the figures and confirming the reconciliation
</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I create an account reconciliation group for Bank
Reconciliation?</title>
<orderedlist>
<listitem>
<para>Go to the Financial Account 'Reconciliation' sub menu for the
bank account to be reconciled</para>
</listitem>
<listitem>
<para>Press the 'Create New Financial Account Reconciliations'
button</para>
</listitem>
<listitem>
<para>Complete the details (eg name, description, organisation and
opening balance) required on the 'Add New Financial Account
Reconciliations' screen and press the 'Create' button</para>
</listitem>
<listitem>
<para>The new account reconciliation group is created and may be
used to assign transactions to</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I locate transactions that have not been assigned to a
Bank Reconciliation?</title>
<orderedlist>
<listitem>
<para>Go to the Financial Account 'Transactions' sub menu of the
bank account to be reconciled</para>
</listitem>
<listitem>
<para>The 'Find Transactions For Financial Account: XXXX' is
displayed </para>
</listitem>
<listitem>
<para>Use the dropdown box for 'GL Reconciliation Id' field to
select 'Not Assigned' and then press the 'Search' button</para>
</listitem>
<listitem>
<para>A list of transactions (deposits, withdrawals or adjustments)
that have not been reconciled will be displayed (NOTE: If no
transactions are displayed then there are no transactions to
reconcile)</para>
</listitem>
<listitem>
<para>Click on the 'check box' at the end of the transaction line
that corresponds to the entry that needs to be assigned (NOTE:More
than one transaction can be selected at a time)</para>
</listitem>
<listitem>
<para>Above the 'check box' is the 'Assign to Reconciliation' button
and to the left of this is a dropdown box to select the
reconciliation that the transaction is to be assigned to.</para>
</listitem>
<listitem>
<para>Using the drop down box select the reconciliation required and
press the 'Assign to Reconciliation' button</para>
</listitem>
<listitem>
<para>The transaction is removed from the 'Not Assigned' status and
added to the specified reconciliation group</para>
</listitem>
</orderedlist>
<para></para>
</section>
<section>
<title>How do I validate and confirm the Bank Reconciliation?</title>
<para>Validation can be done for individual transactions or for the complete account reconciliation group. The user controls this by the search criteria entered on this screen.</para>
<orderedlist>
<listitem>
<para>Go to the 'Transactions' sub menu for the bank account and press the 'Bank Reconciliation' button</para>
</listitem>
<listitem>
<para>Select the 'GL Reconciliation Id' that is to be reconciled</para>
</listitem>
<listitem>
<para>Click on the 'Select All' check box on the right hand side of the screen. (NOTE: All transactions in this group will be reconciled)</para>
</listitem>
<listitem>
<para>Press the 'Reconcile' button above the 'Select All' check box</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I view a Bank Reconciliation?</title>
<para>Once all the transactions in a reconciliation group have been reconciled then the status of the group is changed to 'Reconciled'. This means that no new transactions can be added to the is group and the reconciled balance is fixed.</para>
<orderedlist>
<listitem>
<para>Go to the 'Reconciliation' sub menu for the bank account</para>
</listitem>
<listitem>
<para>A list of all the bank reconciliation groups are displayed with details of the status (eg Created or Reconciled)</para>
</listitem>
<listitem>
<para>Click on the 'GL Reconciliation Id' of the group and the details are displayed</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I cancel a Bank Reconciliation?</title>
<para>If a bank reconciliation needs to be cancelled due to a mistake or error then the bank reconciliation can be cancelled as long as it has not been fully reconciled (i.e. the status of the reconciliation has not been changed to 'Reconciled'. This will allow you to start the bank reconcilation again.</para>
<orderedlist>
<listitem>
<para>Go to the 'Reconciliation' sub menu for the bank account</para>
</listitem>
<listitem>
<para>A list of all the bank reconciliation groups are displayed (NOTE: If no transactions are associated with a reconciliation group then it will not be displayed here)</para>
</listitem>
<listitem>
<para>Click on the 'Cancel' button associated with the 'GL Reconciliation Id' of the group that needs to be cancelled</para>
</listitem>
<listitem>
<para>All transactions will be removed from the reconciliation group and their status will be changed back to 'Not Assigned' so that they can be re-assigned to this or any other reconciliation.</para>
</listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,95 @@
<?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 Billing Account Invoices help screen</title>
<para>The Billing Account Find Invoices screen displays by default a list of invoices that have
been charged to the billing account.</para>
<para>Any invoice displayed here means that its invoice amount has been deducted from the
billing account credit limit.For example: If the Billing Account Credit Limit is $100 and
the there are 2 invoices displayed with amounts $10 and $25 then the available credit for
the billing account will be $75.</para>
<para>The invoice can be at various statues and there is an option to locate an invoice by
status.</para>
<para>It is also used to apply any payments that have been made into the Billing Account to an
invoice. A 'Capture' button is displayed next to each invoice displayed that has an amount
outstanding.</para>
<para>Example:</para>
<para>
<itemizedlist>
<listitem>
<para>Two invoices are charged to a Billing Account (Invoice A $10 and Invoice B
$25)</para>
</listitem>
<listitem>
<para>A payment of $17 has been paid into the Billing Account</para>
</listitem>
<listitem>
<para>If the Capture button is pressed for the invoice A then $10 of the $17 payment
will be applied to this invoice and a new payment transaction of $7 will be
created and available to apply to a different invoice </para>
</listitem>
</itemizedlist>
</para>
<section>
<title>How do I locate an invoice by status?</title>
<para>
<orderedlist>
<listitem>
<para>Select the 'Invoices' sub menu</para>
</listitem>
<listitem>
<para>Use the drop down box to select the 'Status Id' for the invoice
required</para>
</listitem>
<listitem>
<para>Press the 'Submit' button</para>
</listitem>
</orderedlist>
</para>
<para>A list of invoices with the required status will be displayed </para>
</section>
<section>
<title>How do I capture a payment for an invoice?</title>
<para>IMPORTANT: In order for this to work a payment needs to have been made to the billing
account that has not been completely applied to any other invoices. Payments to a
billing account can be done via the 'Payments' sub menu for the billing account or by
using Accounting / Payments menu.</para>
<para>
<orderedlist>
<listitem>
<para>Select the 'Invoices' sub menu</para>
</listitem>
<listitem>
<para>Locate the invoice required (NOTE: The 'Amount to Apply' is the same as
the 'Total' column)</para>
</listitem>
<listitem>
<para>Press the 'Capture' button (NOTE: The 'Amount to Apply' is different to
the 'Total' column)</para>
</listitem>
</orderedlist>
</para>
<para>The 'Capture' button is no longer displayed next to the invoice and an additional
payments transaction will be created for any difference between the invoice total and
the amount paid (Eg Invoice Total $100, Payment Amount $125, the new payment transaction
amount will be $25)</para>
<para>NOTE: The above example assumes that the payment available will cover the total amount
outstanding for the invoice</para>
</section>
</section>
@@ -0,0 +1,29 @@
<?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 Billing Account Orders help screen</title>
<para>This sub menu lists the details of any Sales Orders that have
been charged to the billing account. A Sales Order is charged to a
billing account by selecting the billing account as the Payment
Method.</para>
<para>NOTE: The details displayed here in conjunction with the
'Payments' sub menu could also be used to generate a customer
statement or account showing details of customer activity during a
specified time period.</para>
</section>
@@ -0,0 +1,131 @@
<?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 Billing Account Payments help screen</title>
<para>This sub menu allows the creation of a payment that is automatically applied to the
billing account.</para>
<para>It is used when a payment has been received from a customer that is used to pay off the
balance (or part balance) of a billing account. </para>
<para>An example of how this works is similar to a credit card statement where a list of
transactions have been incurred over the previous month and one payment is used to settle
the outstanding balance.</para>
<section>
<title>How do I add a payment to a billing account?</title>
<para>
<orderedlist>
<listitem>
<para>Select the 'Payments' sub menu</para>
</listitem>
<listitem>
<para>The 'Create Payment' screen is displayed</para>
</listitem>
<listitem>
<para>Enter or use the lookup to enter the 'From Party Id' (NOTE: By default
this will be the Bill To Party of the Billing Account)</para>
</listitem>
<listitem>
<para>Select the 'Organisation Party Id' from the drop down box</para>
</listitem>
<listitem>
<para>Select the 'Payment Type Id' from the drop down box (NOTE: By default this
will be set to 'Customer Deposit')</para>
</listitem>
<listitem>
<para>Leave the 'Payment Method Type' as 'Billing Account' (NOTE TO CHECK: What
happens if you do change this....)</para>
</listitem>
<listitem>
<para>Enter the 'Amount' of the payment</para>
</listitem>
<listitem>
<para>Press the 'Create' button</para>
</listitem>
</orderedlist>
</para>
<para>The new entry is displayed at the bottom of the screen. </para>
<para>NOTE: The total amount of the payment will be applied to the Billing Account. This can
be verified by going to Accounting / Payments menu and locating the newly created
payment. The 'Amount to Apply' column will be zero.</para>
</section>
<section>
<title>How do I update a payment for a billing account?</title>
<para>A payment can be updated for a billing account by amending the amount of the payment
that has been applied to the billing account. For example if a payment of $100 has been
applied to a billing account it can be amended so that only $75 will be applied and $25
will be available to be applied elsewhere.</para>
<para>
<orderedlist>
<listitem>
<para>Click on the 'Payment Id' of the payment that needs to be removed</para>
</listitem>
<listitem>
<para>The 'Payment Overview' screen is displayed</para>
</listitem>
<listitem>
<para>Press the 'Update' button in the 'Payments Applied' box</para>
</listitem>
<listitem>
<para>The 'Payment Applications' screen is displayed</para>
</listitem>
<listitem>
<para>Locate the 'Billing Account Id' and 'Amount Applied'</para>
</listitem>
<listitem>
<para>Amend the 'Amount Applied' for the billing account</para>
</listitem>
<listitem>
<para>Press the 'Update' button next to the entry that refers to the 'Billing
Account Id'</para>
</listitem>
</orderedlist>
</para>
<para>A message will be displayed saying that the payment has been removed from the billing
account</para>
</section>
<section>
<title>How do I delete a payment from a billing account?</title>
<para>A payment can be removed from billing account by removing the link that has applied
the payment to the billing account.</para>
<para>
<orderedlist>
<listitem>
<para>Click on the 'Payment Id' of the payment that needs to be removed</para>
</listitem>
<listitem>
<para>The 'Payment Overview' screen is displayed</para>
</listitem>
<listitem>
<para>Press the 'Update' button in the 'Payments Applied' box</para>
</listitem>
<listitem>
<para>The 'Payment Applications' screen is displayed</para>
</listitem>
<listitem>
<para>Press the 'Remove' button next to the entry that refers to the 'Billing
Account Id'</para>
</listitem>
</orderedlist>
</para>
<para>A message will be displayed saying that the payment has been removed from the billing
account</para>
<para>NOTE : The above example was done when the payment status was at 'Not Paid' - need to
test if it still works if the payment status is at 'Received' or 'Confirmed' too.
</para>
</section>
</section>
@@ -0,0 +1,55 @@
<?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 Capture Transaction help screen. </title>
<para>This screen is used to input or 'capture' a payment against a Sales Order. Unlike the
authorise, this function will actually deduct the amount from eg a credit card and apply the
payment to a specific order.</para>
<para>It is likely that the before the payment is 'captured' in this screen, it would have been
through an authorisation first.</para>
<para>NOTE TO CHECK: Investigate how this links in with the Payment Gateway Configurations
screens</para>
<section>
<title>How do I capture a transaction?</title>
<para>
<orderedlist>
<listitem>
<para>Enter the Order Id for the payment (eg Sales Order Id)</para>
</listitem>
<listitem>
<para>Enter Order Payment Preference Id (Unsure of what this is...a type of
unique identifier perhaps?)</para>
</listitem>
<listitem>
<para>Select the 'Payment Method Type'</para>
</listitem>
<listitem>
<para>Select the 'Payment Type'</para>
</listitem>
<listitem>
<para>Enter the 'Amount'</para>
</listitem>
<listitem>
<para>Press the 'Capture' button</para>
</listitem>
</orderedlist>
</para>
<para>A transaction will be created and can be viewed via the 'Gateway Responses' tab</para>
</section>
</section>
@@ -0,0 +1,22 @@
<?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 Cost Centers help screen</title>
<para></para>
</section>
@@ -0,0 +1,49 @@
<?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 Edit Agreement help screen</title>
<para>The 'Agreement' sub menu is used to enter the basic details required for setting up a new
agreement or editing an existing one.</para>
<para>It can be used to create or update the following details for an Agreement:</para>
<itemizedlist>
<listitem><para>The parties the agreement is between and their roles</para></listitem>
<listitem><para>The agreement type (eg Sales, Purchase, Commission, Employment etc)</para></listitem>
<listitem><para>Specific products </para></listitem>
<listitem><para>Start and End Date</para></listitem>
<listitem><para>Description</para></listitem>
</itemizedlist>
<section>
<title>How do I edit an agreement?</title>
<orderedlist>
<listitem><para>Find the agreement that needs to be amended</para></listitem>
<listitem><para>Click on Agreement Id</para></listitem>
<listitem><para>The 'Edit Agreement' screen will be displayed</para></listitem>
<listitem><para>Amend the details required and press the 'Submit' button (NOTE: Additional agreement details can be updated via the other tabs eg Agreement Terms, Agreement Roles, Agreement Items and Agreement Work Effort Appls)</para></listitem>
</orderedlist>
</section>
<section>
<title>How do I copy an existing agreement?</title>
<orderedlist>
<listitem><para>Find the agreement that needs to be copied</para></listitem>
<listitem><para>Click on the Agreement Id</para></listitem>
<listitem><para>The 'Edit Agreement' screen will be displayed</para></listitem>
<listitem><para>At the bottom of the screen press the 'Copy' in the 'Copy Agreement' window (NOTE: The default tick boxes will copy the agreement terms, products and party. If not required then click on the boxes to stop them being copied)</para></listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,42 @@
<?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 Agreement Content help screen</title>
<para>This screen use for uploading any contents that concern the agreement. The screen consists of :</para>
<itemizedlist>
<listitem><para>- Add Agreement Content</para></listitem>
<listitem><para>- Agreement Content List</para></listitem>
</itemizedlist>
<section>
<title>Add Agreement Content</title>
<para>
To upload the content. The content can be classified by choosing the Content Type Id and Mime Type Id.
</para>
</section>
<section>
<title>Agreement Content List</title>
<para>
To Show the list of contents. There are 2 buttons in each content:
<orderedlist>
<listitem><para>Download : To download the uploaded content</para></listitem>
<listitem><para>Delete : To delete the uploaded content</para></listitem>
</orderedlist>
</para>
</section>
</section>
@@ -0,0 +1,23 @@
<?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 Edit Agreement Geo help screen</title>
<para>This screen is used to create a geographical location for an agreement item.</para>
<para>NOTE: A new entry can be created or removed but not updated.</para>
</section>
@@ -0,0 +1,50 @@
<?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 Edit Agreement Item help screen</title>
<para>This screen allows specific items to be added to agreement. Currently these are limited to the following:</para>
<itemizedlist>
<listitem><para>Pricing</para></listitem>
<listitem><para>Commission Rate</para></listitem>
<listitem><para>Sub-Agreement</para></listitem>
<listitem><para>Exhibit</para></listitem>
<listitem><para>Section</para></listitem>
</itemizedlist>
<section>
<title>How do I create an agreement item?</title>
<orderedlist>
<listitem><para>Press the 'Create Agreement Item' button</para></listitem>
<listitem><para>The 'Edit Agreement Item' screen is displayed</para></listitem>
<listitem><para>Select the 'Agreement Item Type Id' from the drop down box</para></listitem>
<listitem><para>Use the drop down box to select the 'Currency' for the Agreement Item</para></listitem>
<listitem><para>Enter any 'Agreement Text' if required</para></listitem>
<listitem><para>Enter path for 'Agreement Image' if required</para></listitem>
<listitem><para>Press the 'Submit' button</para></listitem>
<listitem><para>A new sub menu will be displayed containing 'Promotions','Terms','Products','Party' and 'Geo' for additional details that can be setup for the agreement item</para></listitem>
</orderedlist>
</section>
<section>
<title>How do I edit an agreement item?</title>
<orderedlist>
<listitem><para>Select the agreement item to be updated by clicking on the Agreement Item Id</para></listitem>
<listitem><para>The 'Edit Agreement Item' screen is displayed</para></listitem>
<listitem><para>Update the fields required (NOTE: Additional details can be updated by selecting the Promotions, Terms, Product, Party or Geo sub menus)</para></listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,26 @@
<?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 Edit Agreement Item Party help screen</title>
<para>This screen is used to add or update a party linked to an agreement item. This could be useful for storing specific contact names associated with an agreement item.</para>
<section>
<title>How do I update a party for an agreement item?</title>
<para>Parties for an agreement item cannot be updated. They can only be added or removed.</para>
</section>
</section>
@@ -0,0 +1,22 @@
<?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 Edit Agreement Item Product help screen</title>
<para>This screen is used to create or update a product entry for an agreement item.</para>
</section>
@@ -0,0 +1,22 @@
<?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 Edit Agreement Item Supplier Product help screen</title>
<para>This screen is used to create or update a product entry for a supplier agreement item. Any updates made in this screen can also be viewed in Catalog Manager for the product under the product 'Suppliers' and 'Agreements' tabs.</para>
</section>
@@ -0,0 +1,22 @@
<?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 Edit Agreement Item Term help screen</title>
<para>This screen is used to create or update the terms for an agreement item.</para>
</section>
@@ -0,0 +1,41 @@
<?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 Edit Agreements Roles help screen</title>
<para>This screen is used to assign a party roles for an agreement.</para>
<section>
<title>How do I add a party role to an agreement?</title>
<orderedlist>
<listitem><para>Use the lookup to select the 'Party Id'</para></listitem>
<listitem><para>Use the drop down box to select the 'Party Role Id'</para></listitem>
<listitem><para>Press the 'Add' button (NOTE: If the party does not have this role associated with them then an error will be displayed)</para></listitem>
<listitem><para>The new entry will be displayed in the lower part of the screen</para></listitem>
</orderedlist>
</section>
<section>
<title>How do I update a party role for an agreement?</title>
<para>Party roles can only be added and deleted. They cannot be updated.</para>
</section>
<section>
<title>How do I delete a party role from an agreement?</title>
<orderedlist>
<listitem><para>Press the 'Remove' button for the entry that needs to be deleted.</para></listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,106 @@
<?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 Edit Agreement Terms help screen</title>
<para>Agreement Terms are the rules that make up the agreement.
Agreements may have a one or more terms.</para>
<para>Examples of agreement terms from a sales and purchase viewpoint
include the following:</para>
<itemizedlist>
<listitem>
<para>Payment due within a certain timeframe (eg 30 days)</para>
</listitem>
<listitem>
<para>Discounts for early payment</para>
</listitem>
<listitem>
<para>Specifying Late fee penalties</para>
</listitem>
<listitem>
<para>Purchasing agreements</para>
</listitem>
<listitem>
<para>Specifying commission rates</para>
</listitem>
<listitem>
<para>Exclusive Relationship</para>
</listitem>
</itemizedlist>
<para>NOTE: Agreements can also be specified for Employment, Legal, Non
Compete etc.</para>
<para>Agreement terms are configured by linking them to the Invoice
Item Type.</para>
<para>IMPORTANT NOTE: The drop down box for 'Invoice Item Type'
contains what appears to be duplicates for items such as 'Invoice
Fee', 'Invoice Discount', 'Invoice Finished Good Item' etc. These are
NOT duplicates one of these entries refers to the Sales Invoice and
the other refers to the Purchase Invoice. As the descriptions are
exactly the same it is impossible to know which refers to which so
needs to be done using trial and error!</para>
<section>
<title>How do I add a payment term for 30 days?</title>
<orderedlist>
<listitem>
<para>Select 'Payment Net Days' from the 'Term Type Id' drop down
box</para>
</listitem>
<listitem>
<para>Enter '30' in the 'Term Days' field</para>
</listitem>
<listitem>
<para>Press the 'Submit' button</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I add a discount term of 2% if paid within 10 days?
</title>
<orderedlist>
<listitem>
<para>Select 'Payment Discounted if paid with Specified Days' from
the 'Term Type Id' drop down box</para>
</listitem>
<listitem>
<para>Enter '2' in the 'Term Value' field</para>
</listitem>
<listitem>
<para>Enter '10' in the 'Term Days' field</para>
</listitem>
<listitem>
<para>Press the 'Submit' button</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I specify pricing in a specific currency only for this
customer or supplier?</title>
<para>This is done using the 'Agreement Items' sub menu</para>
</section>
<section>
<title>How do I delete a payment term?</title>
<orderedlist>
<listitem>
<para>Locate the payment term required</para>
</listitem>
<listitem>
<para>Press the 'Remove'on the entry that needs to be removed</para>
</listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,41 @@
<?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 Agreement Work Effort Applications help screen</title>
<para>This screen is used to link a work effort to the whole agreement or an individual agreement item.</para>
<section>
<title>How do I add a work effort to an agreement?</title>
<orderedlist>
<listitem><para>Use the drop down box to select the 'Agreement Item Seq Id'</para></listitem>
<listitem><para>Use the lookup to select the 'Workeffort Id'</para></listitem>
<listitem><para>Press the 'Add' button</para></listitem>
<listitem><para>The new entry is displayed in the lower part of the screen</para></listitem>
</orderedlist>
</section>
<section>
<title>How do I update a work effort for an agreement?</title>
<para>Work efforts can only be added or deleted. They cannot be updated</para>
</section>
<section>
<title>How do I delete a work effort from an agreement?</title>
<orderedlist>
<listitem><para>Press the 'Delete' button for the entry that needs to be deleted</para></listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,159 @@
<?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 Edit Billing Account help screen</title>
<para>The 'Account' sub menu is used to enter the basic details required for setting up a new
billing account or editing an existing one.</para>
<para>It can be used to create or update the following details for a Billing Account:</para>
<para>
<itemizedlist>
<listitem>
<para>Billing Account Identification</para>
</listitem>
<listitem>
<para>Party to be Billed</para>
</listitem>
<listitem>
<para>Billing Account Limit (NOTE: This is how much credit the customer will be
given eg $5000)</para>
</listitem>
<listitem>
<para>Currency to be used for Billing Account</para>
</listitem>
<listitem>
<para>Start and End Dates </para>
</listitem>
</itemizedlist>
</para>
<para>NOTE: There are currently two ways to add a party to a billing account.</para>
<para>
<orderedlist>
<listitem>
<para>Enter a party id in the 'Party Billed To' field</para>
</listitem>
<listitem>
<para>Use the 'Roles' sub menu to add a party id with the role of 'Bill To
Customer'</para>
</listitem>
<listitem>
<para>If using the first method then when you press the update button this removes
the party id from this field and automatically creates the party under the Roles
sub menu with the role of 'Bill To Customer' </para>
</listitem>
</orderedlist>
</para>
<section>
<title>How do I create a new Billing Account?</title>
<para>NOTE TO CHECK: If the party doesnt have the role 'Bill To Customer' is it
automatically added when the billing account is created or will the creation
fail?..</para>
<para>Example: To create a new Billing Account</para>
<para>
<orderedlist>
<listitem>
<para>Press the 'New' button and the 'Edit Billing Account' screen is
displayed</para>
</listitem>
<listitem>
<para>Enter a code or number for the 'Billing Account Id' (NOTE: If this is left
blank a number will be automatically generated)</para>
</listitem>
<listitem>
<para>Enter a number for the 'Billing Account Limit' (eg 5000)</para>
</listitem>
<listitem>
<para>Leave the 'Account Currency UOM Id' as it is (NOTE: This should be the
default currency for Company...)</para>
</listitem>
<listitem>
<para>Enter a description that can be used to identify the Billing Account (eg
Joe Bloggs Builders Billing Account)</para>
</listitem>
<listitem>
<para>Leave the 'Contact Mech' field as it is (NOTE: This field cannot be filled
in until either the 'Party Billed To' has been filled in or a party with the
role of 'Bill To Customer' has been added under the 'Roles' sub menu</para>
</listitem>
<listitem>
<para>Enter the Billing Account start date in the 'From Date' field. (NOTE: If
left blank then this will default to the current date and time. NOTE TO
CHECK: Can this date be in the future.....?)</para>
</listitem>
<listitem>
<para>Leave the 'Thru date' field blank</para>
</listitem>
<listitem>
<para>Enter or use the lookup to select the 'Party Billed To'</para>
</listitem>
<listitem>
<para>Press the 'Update' button</para>
</listitem>
</orderedlist>
</para>
<para>After the 'Update' button has been pressed then the 'Contact Mech Id' field will
either be automatically filled in or will allow you to select a contact mech from a drop
down list </para>
</section>
<section>
<title>How do I update an existing Billing Account?</title>
<para>Billing Account details can be updated. A key field that may need to be updated is the
actual Billing Account Limit if a customer reduces or improves their credit
rating</para>
<para>Example: To Update a Billing Account</para>
<para>
<orderedlist>
<listitem>
<para>Click on the 'Billing Account Id' of the Billing Account to updated</para>
</listitem>
<listitem>
<para>The 'Edit Billing Account' screen is displayed</para>
</listitem>
<listitem>
<para>Enter the changes required</para>
</listitem>
<listitem>
<para>Press the 'Update' button</para>
</listitem>
</orderedlist>
</para>
</section>
<section>
<title>How do I delete a Billing Account?</title>
<para>Billing Accounts cannot be deleted. They can only be expired. This means that they
will no longer be able to be used to associate invoices or payments against.</para>
<para>Example: To Expire a Billing Account</para>
<para>
<orderedlist>
<listitem>
<para> Click on the 'Billing Account Id' of the Billing Account to be
expired</para>
</listitem>
<listitem>
<para>The 'Edit Billing Account' screen is displayed</para>
</listitem>
<listitem>
<para>Enter the current date in the 'Thru date' field</para>
</listitem>
<listitem>
<para>Press the 'Update' button </para>
</listitem>
</orderedlist>
</para>
</section>
</section>
@@ -0,0 +1,98 @@
<?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 Billing Account Roles help screen</title>
<para>This sub menu allows parties with specific roles to be associated with to a Billing
Account. Roles allows you to specify a party role. </para>
<para> is used to specify which party should be billed for the billing account. It can be used
as follows:</para>
<para>
<itemizedlist>
<listitem>
<para>Simple billing account for a single party</para>
</listitem>
<listitem>
<para>More complex billing account where multiple parties (eg company subsidiaries)
charge invoices to the billing account but a different party (eg head office)
will pay the account </para>
</listitem>
</itemizedlist>
</para>
<section>
<title>How do I add a party role to a billing account?</title>
<para>Select the 'Roles' sub menu</para>
<orderedlist>
<listitem>
<para>Enter or use the lookup to select the 'Party Id'</para>
</listitem>
<listitem>
<para>Select the 'Role Type Id' from the drop down box (eg Bill To Customer)</para>
</listitem>
<listitem>
<para>Leave the 'From Date' blank (NOTE: If left blank it will default to the
current date and time)</para>
</listitem>
<listitem>
<para>Leave the 'Thru Date' blank</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
</orderedlist>
<para>The new party role is displayed at the bottom of the screen </para>
</section>
<section>
<title>How do I update a party role for a billing account?</title>
<para>The only field that can be updated for a party role is the 'Thru Date'. If any other
details need to be amended then the entry will need to be deleted and then
recreated.</para>
<para>
<orderedlist>
<listitem>
<para>Select the 'Roles' sub menu</para>
</listitem>
<listitem>
<para>Locate the entry that needs to be amended</para>
</listitem>
<listitem>
<para>Enter or use the lookup to enter the 'Thru Date'</para>
</listitem>
<listitem>
<para>Press the 'Update' button for the entry </para>
</listitem>
</orderedlist>
</para>
</section>
<section>
<title>How do I delete a party role from a billing account?</title>
<para>
<orderedlist>
<listitem>
<para>Locate the entry that needs to be deleted</para>
</listitem>
<listitem>
<para>Press the 'Delete' button next to the entry</para>
</listitem>
<listitem>
<para>The entry will be removed from the bottom of the screen </para>
</listitem>
</orderedlist>
</para>
</section>
</section>
@@ -0,0 +1,106 @@
<?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 Billing Account Terms help screen</title>
<para>This sub menu allows terms to be associated with a billing account. Currently these can be
the following:</para>
<para>
<itemizedlist>
<listitem>
<para>payment terms (discounted if paid within specified days)</para>
</listitem>
<listitem>
<para>payment terms (due on a specified day per month)</para>
</listitem>
<listitem>
<para>payment terms (net days)</para>
</listitem>
<listitem>
<para>penalty terms (late fee)</para>
</listitem>
<listitem>
<para>penalty terms (collection agency fee)</para>
</listitem>
<listitem>
<para>miscellaneous (non returnable sales item)</para>
</listitem>
</itemizedlist>
</para>
<para>>NOTE: There is an overlap here with the terms that can be specified in an agreement.
Would a billing account party also have an agreement for payment terms...? .</para>
<section>
<title>How do I add terms to a billing account?</title>
<para>
<orderedlist>
<listitem>
<para>Select the 'Terms' sub menu</para>
</listitem>
<listitem>
<para>Select a 'Term Type' from the drop down box (eg. Payment net days)</para>
</listitem>
<listitem>
<para>Leave the 'UOM' field blank</para>
</listitem>
<listitem>
<para>Enter a number in the 'Term Value' field (eg. 30 which would mean '30
days' when related to 'Payment net days')</para>
</listitem>
<listitem>
<para>Press the 'Save' button</para>
</listitem>
</orderedlist>
</para>
<para>The term is displayed in the top part of the screen </para>
</section>
<section>
<title>How do I update terms for a billing account?</title>
<para>Select the 'Terms' sub menu</para>
<para>
<orderedlist>
<listitem>
<para>Press the 'Edit' button next to the entry that needs to be amended</para>
</listitem>
<listitem>
<para>The details are displayed in the 'Edit Billing Account Terms' box</para>
</listitem>
<listitem>
<para>Update the 'Term Type', 'UOM' or 'Term Value' as required</para>
</listitem>
<listitem>
<para>Press the 'Save' button</para>
</listitem>
</orderedlist>
</para>
<para>The updated term is displayed in the top part of the screen </para>
</section>
<section>
<title>How do I remove terms from a billing account?</title>
<para>
<orderedlist>
<listitem>
<para>Select the 'Terms' sub menu</para>
</listitem>
<listitem>
<para>Press the 'Delete' button next to the entry that needs to be removed
</para>
</listitem>
</orderedlist>
</para>
</section>
</section>
@@ -0,0 +1,22 @@
<?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 Edit Cost Calculations help screen</title>
<para></para>
</section>
@@ -0,0 +1,101 @@
<?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 Credit Card Type GL Accounts help screen</title>
<para>The Credit Card Type / GL Account default is used to map
different types of credit card to different general ledger accounts.
</para>
<para>NOTE: This setup will affect one side of a journal entry only.
</para>
<para>This type of mapping is useful if you need to track the amounts
to be collected from different credit card agents. The OFBiz demo data
comes with some setup here (NOTE: The demo entries appear to be
duplicated...has something changed in ENUM for defining each credit
card type.....?????)</para>
<para>Examples are as follows:</para>
<itemizedlist>
<listitem>
<para>American Express</para>
</listitem>
<listitem>
<para>Visa</para>
</listitem>
<listitem>
<para>Mastercard</para>
</listitem>
<listitem>
<para>Diners Club </para>
</listitem>
</itemizedlist>
<section>
<title>How do I add a Credit Card Type GL Account mapping?</title>
<para>There are 10 mappings that come as part of the OFBiz demo data
but they do appear to be duplicated for some reason.</para>
<orderedlist>
<listitem>
<para>Select the 'Card Type' from the drop down list</para>
</listitem>
<listitem>
<para>Select the 'GL Account Id' to map it to from the drop down
list</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
<listitem>
<para>The new 'Credit Card / GL Account Id' mapping is displayed in
the list at the bottom of the screen</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I update a Credit Card Type GL Account mapping?</title>
<orderedlist>
<listitem>
<para>Select the 'Card Type' from the drop down list</para>
</listitem>
<listitem>
<para>Select the updated 'GL Account Id' to map it to from the drop
down list</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
<listitem>
<para>The updated 'Credit Card Type / GL Account' mapping is
displayed in the list at the bottom of the screen</para>
</listitem>
</orderedlist>
<para>NOTE: Used 'Visa' as an example to update and the 'CCT_VISA' was
updated but the 'Visa' one wasnt. This is probably related to the
duplication.</para>
</section>
<section>
<title>How do I remove a Credit Card Type GL Account mapping?</title>
<orderedlist>
<listitem>
<para>Press the 'Remove' button next to the entry that you want to
delete</para>
</listitem>
<listitem>
<para>The entry is removed from the list of entries displayed</para>
</listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,22 @@
<?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 Edit Custom Time Period help screen</title>
<para></para>
</section>
@@ -0,0 +1,61 @@
<?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 Financial Account Edit Deposit Slip screen.</title>
<para>This screen displays the details of a Payment Group and its transactions. The Deposit Slip
for the Payment Group can be printed if required and the Payment Group itself can be
updated.</para>
<para>Details that can be updated include the name of the Payment Group itself and the addition,
removal or update of transactions.</para>
<para>NOTE: Any changes to the Payment Group will be automatically updated to the Deposit
Slip.</para>
<section>
<title>How do I update a Deposit Slip?</title>
<para>
<orderedlist>
<listitem>
<para>Select the Payment Group required</para>
</listitem>
<listitem>
<para>Update the 'Payment Group Name' if required</para>
</listitem>
<listitem>
<para>Use the lookup for 'Payment Id' to add new transactions to the Payment
Group if required</para>
</listitem>
<listitem>
<para>Use the 'Cancel' button next to a particular transaction to remove it from
the Payment Group</para>
</listitem>
<listitem>
<para>Press the 'Update' or 'Add' buttons as required</para>
</listitem>
<listitem>
<para>Press the 'Print Deposit Slip' button</para>
</listitem>
</orderedlist>
</para>
<para>The Deposit Slip will be displayed with the latest details of the transactions for the
Payment Group</para>
</section>
</section>
@@ -0,0 +1,142 @@
<?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 Edit Financial Account screen.</title>
<para>This screen allows the user to create a new financial account or to edit an existing
one.</para>
<para>The 'Financial Account' submenu is the first of four submenus used in the creation or
update of a Financial Account. On the creation or update of a Financial Account it is the
default screen that is displayed.</para>
<para>It can be used for updating the basic details of a Financial account such as:</para>
<para>
<itemizedlist>
<listitem>
<para>Type of Account (eg Deposit, Investment, Gift Certificate)</para>
</listitem>
<listitem>
<para>Account Status (Active, Frozen, Cancel, etc)</para>
</listitem>
<listitem>
<para>Account Name and Code</para>
</listitem>
<listitem>
<para>Currency </para>
</listitem>
<listitem>
<para>Owner Party ID</para>
</listitem>
<listitem>
<para>Default GL Account for Posting</para>
</listitem>
<listitem>
<para>Replenishment Level </para>
</listitem>
</itemizedlist>
</para>
<section>
<title>How do I create a new Financial Account?</title>
<para>Select the 'Create New Financial Account' button from the 'Find Financial Accounts'
screen</para>
<orderedlist>
<listitem>
<para>The 'Create/Update Financial Account' screen is displayed.</para>
</listitem>
<listitem>
<para>Keep the default entry of 'Deposit Account' for the Fin Account Type
field</para>
</listitem>
<listitem>
<para>Keep the default entry of 'Active' for the status field</para>
</listitem>
<listitem>
<para>Enter a description (eg ABC Customer Prepaid Account) for the 'Fin Account
Name' field</para>
</listitem>
<listitem>
<para>Leave the Fin Account Pin field blank (NOTE TO CHECK: I think this is only
used in creation of Gift Cards and Certificates..)</para>
</listitem>
<listitem>
<para>Leave the Fin Account Code field blank (NOTE TO CHECK: I think this is only
used in the creation of Gift Cards and Certificates...)</para>
</listitem>
<listitem>
<para>The currency field will be the default currency of Company (eg USD). If this
account is to be in another currency (eg EUR) then select it from the drop down
list.</para>
</listitem>
<listitem>
<para>Set the Organization Party ID field to be 'Company'</para>
</listitem>
<listitem>
<para>Fill in the Owner Party Id field with the party id of the customer who has the
Financial Account (eg DemoCustomer or DemoCustCompany)</para>
</listitem>
<listitem>
<para>Fill in the 'Post to Gl Account field' to post the transactions for this
financial account to post to a specific GL Account</para>
</listitem>
<listitem>
<para>Select the current date from the calendar to fill in the 'From date' field
(NOTE: It can be left blank and still appears to work)</para>
</listitem>
<listitem>
<para>Leave the 'Thru date' field blank (NOTE TO CHECK: I think this could be used
to close or stop the use of an account ..)</para>
</listitem>
<listitem>
<para>Leave the default of 'Is Refundable' as 'Y' (NOTE TO CHECK: I think this will
allow money to be refunded to this account - eg if you have a return or credit
for the customer)</para>
</listitem>
<listitem>
<para>Leave the 'Replenish Payment ID' blank (NOTE TO CHECK: Not sure what this is -
maybe to automatically replenish account if it gets to a certain limit???)Leave
the 'Replenish Level' blank (NOTE TO CHECK: Not sure what this is but probably
linked to Replenish Payment ID where you set the limit - eg $100)</para>
</listitem>
</orderedlist>
<para>Press the 'Create' button and message appears saying that the account was successfully
created </para>
</section>
<section>
<title>How do I update an existing Financial Account?</title>
<orderedlist>
<listitem>
<para>Press the 'Search' button on the Financial Account main screen</para>
</listitem>
<listitem>
<para>A list of all existing Financial Accounts will be displayed</para>
</listitem>
<listitem>
<para>The 'Create/Update Financial' screen is displayed</para>
</listitem>
<listitem>
<para>Update the details of the financial account </para>
</listitem>
<listitem>
<para>Press the 'Update' button</para>
</listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,94 @@
<?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 Edit Financial Account Authorizations screen.</title>
<para>An authorization is a temporary transaction showing a commitment to take money from a
financial account. It is like a 'transaction in progress' where there can be delay between
when you buy something and the time it actually appears on your statement.</para>
<para>Authorizations can be time limit specific meaning that they can be controlled by entering
a start and end date so that they are only valid for a certain length of time. They can also
be expired. When an authorization is expired it removes the commitment from the financial
account. The history of expired authorizations are shown on the financial account.</para>
<para>NOTE:This could be very useful in ensuring that customers are not overcommitted and
keeping within their approved credit limits.</para>
<section>
<title>How do I add an authorization?</title>
<para>
<orderedlist>
<listitem>
<para>Enter an amount in the 'Amount' field (Eg 1000)</para>
</listitem>
<listitem>
<para>Leave the 'Currency' field blank as the default currency will be
used</para>
</listitem>
<listitem>
<para>Enter a date in the 'Authorisation Date' field</para>
</listitem>
<listitem>
<para>Leave the 'From Date' field blank</para>
</listitem>
<listitem>
<para>Leave the 'Thru Date' field blank</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
</orderedlist>
</para>
<para>NOTE: When you now view the Financial Account detail the 'Actual Balance' and
'Available Balance' fields will be different.</para>
</section>
<section>
<title>How do I update an authorization?</title>
<para>An authorization cannot be updated. It can only be expired. If you have made a mistake
and need to change an authorization then it needs to expired and then re-created
correctly.</para>
</section>
<section>
<title>How do I delete an authorization?</title>
<para>Authorizations are not deleted they are instead expired. This means that the history
of the authorizations will remain on the account as an audit trail.</para>
<para>Example: To expire an authorisation</para>
<para>
<orderedlist>
<listitem>
<para>Select the 'Authorizations' tab for the Financial Account</para>
</listitem>
<listitem>
<para>Any authorizations will be displayed at the bottom of the screen</para>
</listitem>
<listitem>
<para>If the authorization is still current the 'Thru Date' field will be blank
(NOTE TO CHECK: May not always be true as you can specify a future date for
it to expire......!!!)</para>
</listitem>
<listitem>
<para>Select the 'Expire' button next to the authorisation to be expired</para>
</listitem>
</orderedlist>
</para>
<para>The authorization is removed from the financial account and the screen is redisplayed
with the 'Thru Date' field completed </para>
</section>
</section>
@@ -0,0 +1,38 @@
<?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 Edit Financial Account Reconciliations screen.</title>
<para>This screen is used to create or update a reconciliation group / bank reconciliation. The following details can be input or updated for the reconciliation:</para>
<itemizedlist>
<listitem><para>GL Reconciliation Name or Identifier</para></listitem>
<listitem><para>Description for the reconciliation</para></listitem>
<listitem><para>Organisation Party Id for the reconciliation</para></listitem>
<listitem><para>Opening Balance for the reconciliation</para></listitem>
<listitem><para>Reconciliation date</para></listitem>
</itemizedlist>
<section>
<title></title>
<para></para>
</section>
</section>
@@ -0,0 +1,59 @@
<?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 Edit Financial Account Roles screen.</title>
<para>The Financial Account Roles sub menu screen allows you specify a party and link them to a
role for a particular financial account.</para>
<para>It can be used to add party roles eg 'Approver' or 'Administrator' for credit limits or
updates to the account. If an account belongs to a company then you may want to add a person
as a 'Contact' for dealing with the account.</para>
<para>The roles can also be time bound. This means that you can specify a start and end date for
the party role.</para>
<section>
<title>How do I add a Party Role to a Financial Account?</title>
<para>
<orderedlist>
<listitem>
<para>Select the 'Roles' sub menu for the Financial Account</para>
</listitem>
<listitem>
<para>Fill in the Party Id field by using the field lookup tool or by directly
entering the party id (eg flexadmin)</para>
</listitem>
<listitem>
<para>Select the role from the drop down list for the Role Type Id field (eg
administrator)</para>
</listitem>
<listitem>
<para>Enter the From Date field </para>
</listitem>
<listitem>
<para>Enter if the Thru Date field (optional)</para>
</listitem>
<listitem>
<para>Press the 'Add' button </para>
</listitem>
</orderedlist>
</para>
</section>
</section>
@@ -0,0 +1,91 @@
<?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 Edit Financial Account Transactions screen.</title>
<section>
<title>How do I add transactions to a financial account?</title>
<para>An example of how to bring in an opening balance is shown below:</para>
<para>
<orderedlist>
<listitem>
<para>Navigate to the the Financial Account Transactions sub menu</para>
</listitem>
<listitem>
<para>Select 'Adjustment' in the Fin Account Trans Type Id field</para>
</listitem>
<listitem>
<para>Leave the 'Party Id' field blank</para>
</listitem>
<listitem>
<para>Fill in the 'Transaction Date' field</para>
</listitem>
<listitem>
<para>Fill in the 'Entry Date' field (NOTE TO CHECK: Need to check exactly what
this is - is it the date the transaction is entered or is it the date the
transaction is processed?)</para>
</listitem>
<listitem>
<para>Fill in the 'Amount' field with the transaction amount (Eg. In our case
this is the opening balance such as 353.88 - dont think we need the $
sign)</para>
</listitem>
<listitem>
<para>Leave the 'Payment Id' field blank</para>
</listitem>
<listitem>
<para>Leave the 'Order Id' field blank</para>
</listitem>
<listitem>
<para>Leave the 'Order Item Seq Id' field blank</para>
</listitem>
<listitem>
<para>Leave the 'Reason Enum Id' field blank (NOTE TO CHECK: This could be
useful in identifying transactions to a greater level of detail....)</para>
</listitem>
<listitem>
<para>Fill in the 'Comments' field (Eg: Opening Balance from XYZ
Statement)</para>
</listitem>
<listitem>
<para>Press the 'Add' button and the transaction will be displayed at the bottom
of the screen</para>
</listitem>
</orderedlist>
</para>
<para>NOTE: When you now view the Financial Account detail the 'Actual Balance' and
'Available Balance' fields will show the entered opening balance (eg 353.88)</para>
</section>
<section>
<title>Other ways to add transactions to a financial account?</title>
<para>
<itemizedlist>
<listitem>
<para>By selecting financial account as a payment method for a customer</para>
</listitem>
<listitem>
<para>By selecting financial account as a refund method for a customer </para>
</listitem>
</itemizedlist>
</para>
</section>
</section>
@@ -0,0 +1,95 @@
<?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 Financial Account GL Account Type help screen</title>
<para>The FinAccount Type GL Account (Financial Account Type / GL
Account Type) is used to specify the default account to be used for a
specific type of Financial Account. This setup will translate to one
side of the journal entry only.</para>
<para>IMPORTANT NOTE: There is a limitation that only one account can
be specified per Financial Account type. Currently there are 6 types
of Financial Account (Bank, Deposit, Investment, Gift Certificate,
Replenish, Service Credit) - so if you have more than one of these
type of accounts that you need to track separately then there could be
a problem. </para>
<para>This mapping is normally be triggered if something is paid or
uses a Financial Account. Using the demo data this mapping is
triggered when someone purchases a gift certificate, or pays money
into a financial account.</para>
<section>
<title>How do I add a new Financial Account Type / GL Account mapping?
</title>
<para>By default there are 4 Financial Account Type / GL Type mappings
that are configured as part of the OFBiz demo data.</para>
<orderedlist>
<listitem>
<para>Select the 'FinAccount Type Id' from the drop down list</para>
</listitem>
<listitem>
<para>Select the ' GL Account' to map it to from the drop down list
</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
<listitem>
<para>The new mapping will be displayed in the list at the bottom of
the screen</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I update a Financial Account Type / GL Account mapping?
</title>
<para>A Financial Account Type / GL Account Type mapping can be
updated by modifying the GL Account only. Unlike other screens in
this area if the GL Account Type needs to be updated then it can be
done by creating a new record with the correct GL Account type which
will overwrite the existing record.</para>
<orderedlist>
<listitem>
<para>Locate the entry that needs to be updated in the list of
Financial Account Type / GL Account Type mappings</para>
</listitem>
<listitem>
<para>Modify the 'GL Account 'by using the drop down list next to
the GL Account field</para>
</listitem>
<listitem>
<para>Press the 'Update' button</para>
</listitem>
<listitem>
<para>The updated mapping will be displayed</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I remove a Financial Account Type / GL Account mapping?
</title>
<orderedlist>
<listitem>
<para>Locate the entry that needs to be deleted in the list of
Financial Account Type / GL Account Type mappings</para>
</listitem>
<listitem>
<para>Press the 'Remove' button next to the entry</para>
</listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,22 @@
<?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 Edit GL Account Category help screen</title>
<para></para>
</section>
@@ -0,0 +1,22 @@
<?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 Edit GL Category Member help screen</title>
<para></para>
</section>
@@ -0,0 +1,22 @@
<?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 Edit Invoice Item Type help screen</title>
<para></para>
</section>
@@ -0,0 +1,99 @@
<?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 Tax Authority GL Accounts help screen</title>
<para>The Tax Authority / GL Account default is used to map different
tax authorities to different general ledger accounts. This setup will
affect one side of a journal entry only.</para>
<para>NOTE: A tax authority is legal body usually the state (country)
that imposes a financial levy on business transactions.</para>
<para>Normal business rules require you will to keep track amounts
collected or paid to different tax authorities separately. This
mapping ensures that money collected or paid to various tax
authorities (eg through Sales Orders, Purchase Orders etc) can be
separated into specific accounts</para>
<para>The OFBiz demo data comes with 9 entries to show an example of
how this can be setup using the some of the US states as separate tax
authorities.</para>
<section>
<title>How do I add a Tax Authority / GL Account mapping?</title>
<para>Unlike the other GL Account defaults you cannot add a Tax
Authority / GL mapping through these screens. It needs to be done via
the 'GL Accounts' sub menu under the 'Tax Authorities' menu. The
method of how to add a mapping using the 'Tax Authorities' is shown
below.</para>
<orderedlist>
<listitem>
<para>From the Accounting Manager / Tax Authorities Menu press the
'Edit' button next to the Tax Authority required</para>
</listitem>
<listitem>
<para>Select the sub menu 'GL Accounts'</para>
</listitem>
<listitem>
<para>Enter or Lookup the party for the 'Organisation Party Id'
field (NOTE: Use 'Company' as default)</para>
</listitem>
<listitem>
<para>Enter or Lookup the GL Account to be mapped to</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
<listitem>
<para>The mapping will be displayed at the bottom of the screen.
</para>
</listitem>
<listitem>
<para>Return to the Tax Authority / GL Account default and this new
mapping will be shown in the list </para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I update a Tax Authority / GL Account mapping?</title>
<para>Only the GL Account Id linked to the mapping can be updated.
</para>
<orderedlist>
<listitem>
<para>Locate the Tax Authority / GL Account entry that needs to be
updated</para>
</listitem>
<listitem>
<para>Select the new 'GL Account Id' from the drop down list next to
the entry </para>
</listitem>
<listitem>
<para>Press the 'Update' button next to the entry</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I remove a Tax Authority / GL Account mapping?</title>
<orderedlist>
<listitem>
<para>Locate the Tax Authority / GL Account entry that needs to be
removed</para>
</listitem>
<listitem>
<para>Press the 'Delete' button next to the entry </para>
</listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,109 @@
<?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 Party GL Account help screen</title>
<para>he Party / GL Account mapping allows the translation of different
account types (eg Accounts Receivable, Accounts Payable etc) for a
party to be mapped to a separate general ledger account. The party
role (eg Bill To Customer) is also used to define the mapping even
further. OFBiz demo data setup comes with no entries here.</para>
<para>It is used as a way of implementing subledger functionality in
OFBiz. Subledger functionality is where a higher level account can be
split into lower levels. In this case these lower levels can be by
party.</para>
<para>An example could be that a business may want to use the general
ledger to track the Accounts Receivable (AR) by customer so the chart
of account would be setup something like as follows:</para>
<para>120000 Accounts Receivable</para>
<itemizedlist>
<listitem>
<para>120010 Accounts Receivable - Customer A</para>
</listitem>
<listitem>
<para>120020 Accounts Receiviable - Customer B</para>
</listitem>
<listitem>
<para>120030 Accounts Receivalbe - Customer C</para>
</listitem>
</itemizedlist>
<para>This has the main AR account is at the top of the hierarchy and 3
sub accounts below it. Entries for Customers A, B and C would be setup
with a role of 'Bill From Customer' as this is a role associated with
the customer when the Sales Invoice is generated.When a transaction
matching the criteria is processed in the system then these mappings
will control where it is posted to.In the case of Customer A any AR
transactions with role 'Bill To Customer' are posted to '120010'
instead of the standard '120000</para>
<section>
<title>How do I add a new Party / GL Account mapping?</title>
<orderedlist>
<listitem>
<para>Enter or Lookup the party for the 'Party Id' field</para>
</listitem>
<listitem>
<para>Select the 'Role Type Id' from the drop down list (NOTE: Be
careful that you select the correct role for the transactions you
want to track......)</para>
</listitem>
<listitem>
<para>Select the 'GL Account Type Id' from the drop down list</para>
</listitem>
<listitem>
<para>Select the 'GL Account Id' from the drop down list</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
<listitem>
<para>The new entry will be displayed at the bottom of the screen
</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I update a Party / GL Account mapping?</title>
<para>Only the GL Account Id linked to the mapping can be updated.
</para>
<orderedlist>
<listitem>
<para>Locate the Party / GL Account entry that needs to be updated
</para>
</listitem>
<listitem>
<para>Select the new 'GL Account Id' from the drop down list next to
the entry </para>
</listitem>
<listitem>
<para>Press the 'Update' button next to the entry</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I remove a Party / GL Account mapping?</title>
<orderedlist>
<listitem>
<para>Locate the Party / GL Account entry that needs to be removed
</para>
</listitem>
<listitem>
<para>Press the 'Delete' button next to the entry</para>
</listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,42 @@
<?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 Edit Payment Gateway Config help screen</title>
<para>This screen allows the user to update the payment gateway configuration.</para>
<para>A range of parameters need to be set before the payment gateway will work This includes
details of the username and password required for the validation of the external account
that will be using the gateway.</para>
<section>
<title>How do I update a Payment Gateway Configuration?</title>
<para>
<orderedlist>
<listitem>
<para>Select the gateway Find Payment Gateway Config screen</para>
</listitem>
<listitem>
<para>Enter the details required for the configuration type selected (NOTE: This
will be different for each individual configuration selected)</para>
</listitem>
<listitem>
<para>Press the 'Update' button</para>
</listitem>
</orderedlist>
</para>
</section>
</section>
@@ -0,0 +1,23 @@
<?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 Edit Payment Gateway Config Type help screen</title>
<para>This screen allows the update of an existing payment gateway configuration type.</para>
<para>NOTE: New Payment Gateway Configuration Types cannot be created via this screen.</para>
</section>
@@ -0,0 +1,22 @@
<?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 Edit Payment Method Type help screen</title>
<para></para>
</section>
@@ -0,0 +1,110 @@
<?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 Product Category GL Accounts help screen</title>
<para>The Product Category GL Account is used to specify the default
account to be used for a specific 'Product Category' and 'Account
Type' combination. This setup will translate to one side of the
journal entry only.</para>
<para>It is used for tracking product category transactions at a more
detailed level. Examples could be as follows:</para>
<itemizedlist>
<listitem>
<para>Tracking Accounts Receivable by Product Category in the General
Ledger</para>
</listitem>
<listitem>
<para>Tracking Cost of Goods by Product Category in the General
Ledger</para>
</listitem>
<listitem>
<para>Tracking Commissions paid by Product Category in the General
Ledger</para>
</listitem>
</itemizedlist>
<para>The demo data gives an idea of the use of product categories to
classify or separate different products streams. If specific
accounting or management reporting is required at this level then the
General Ledger can be setup to provide this detail. </para>
<section>
<title>How do I add a new Product Category / GL Account Type mapping?
</title>
<para>By default there are no Product Category / GL Account Type
mappings that are configured as part of the OFBiz demo data.</para>
<orderedlist>
<listitem>
<para>Select the 'Account Type' from the drop down list (NOTE: In
other screens this field is call the 'GL Account Type Id'.....)
</para>
</listitem>
<listitem>
<para>Select the ' GL Account' to map it to from the drop down list
</para>
</listitem>
<listitem>
<para>Enter or look up the 'Product Category Id' to be used</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
<listitem>
<para>The new mapping will be displayed in the list at the bottom of
the screen</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I update a Product Category / GL Account type mapping?
</title>
<para>A Product Category / GL Account Type mapping can be updated by
modifying the GL Account only. If the product category or the Account
Type needs to be updated then the mapping will need to be deleted and
then re-entered using the new product category or Account Type.
</para>
<orderedlist>
<listitem>
<para>Locate the entry that needs to be updated in the list of
Product Category / GL Account Type mappings</para>
</listitem>
<listitem>
<para>Modify the 'GL Account 'by using the drop down list next to
the 'GL Account' field</para>
</listitem>
<listitem>
<para>Press the 'Update' button</para>
</listitem>
<listitem>
<para>The updated mapping will be displayed</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I remove a Product Category / GL Account Type mapping?
</title>
<orderedlist>
<listitem>
<para>Locate the entry that needs to be deleted in the list of
Product Category / GL Account Type mappings</para>
</listitem>
<listitem>
<para>Press the 'Remove' button next to the entry</para>
</listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,113 @@
<?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 Product GL Accounts help screen</title>
<para>The Product GL Account is used to specify the default account to
be used for a specific Product' and 'Account Type' combination. This
setup will translate to one side of the journal entry only.</para>
<para>NOTE: Duplicate functionality .... This setup for the Product GL
Account can also be setup using the 'Accounts' sub menu for the
Product in Catalog Manager. Need to confirm whether this default work
like a hierarchy....eg Product GL Defaults will override General
Account defaults. </para>
<para>It is used for tracking product transactions at a more detailed
level. Examples could be as follows:</para>
<itemizedlist>
<listitem>
<para>Tracking Accounts Receivable by Product in the General Ledger
</para>
</listitem>
<listitem>
<para>Tracking Cost of Goods by product (or product variation) in the
General Ledger</para>
</listitem>
<listitem>
<para>Tracking Commissions paid by Product in the General Ledger
</para>
</listitem>
</itemizedlist>
<section>
<title>How do I add a new Product / GL Account Type mapping?</title>
<para>By default there are no Product / GL Account Type mappings that
are configured as part of the OFBiz demo data.</para>
<orderedlist>
<listitem>
<para>Select the 'Account Type' from the drop down list (NOTE: In
other screens this field is call the 'GL Account Type Id'.....)
</para>
</listitem>
<listitem>
<para>Select the ' GL Account' to map it to from the drop down list
</para>
</listitem>
<listitem>
<para>Enter or look up the 'Product Id' to be used</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
<listitem>
<para>The new mapping will be displayed in the list at the bottom of
the screen</para>
</listitem>
</orderedlist>
<para>NOTE: This mapping can also be also be done via the 'Accounts'
sub menu for the Product. Any mapping created here will be displayed
under the Product 'Accounts' sub menu. Alternatively any mapping
created in the Product 'Accounts' sub menu will also be displayed
here.</para>
</section>
<section>
<title>How do I update a Product / GL Account Type mapping?</title>
<para>A Product / GL Account Type mapping can be updated by modifying
the GL Account only. If the product needs to be updated then the
mapping will need to be deleted and then re-entered using the new
product.</para>
<orderedlist>
<listitem>
<para>Locate the entry that needs to be updated in the list of
Product / GL Account Type mappings</para>
</listitem>
<listitem>
<para>Modify the 'GL Account 'by using the drop down list next to
the 'GL Account' field</para>
</listitem>
<listitem>
<para>Press the 'Update' button</para>
</listitem>
<listitem>
<para>The updated mapping will be displayed </para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I delete a Product / GL Account Type mapping?</title>
<orderedlist>
<listitem>
<para>Locate the entry that needs to be deleted in the list of
Product / GL Account Type mappings</para>
</listitem>
<listitem>
<para> 2. Press the 'Remove' button next to the entry</para>
</listitem>
</orderedlist>
<para>NOTE: This can also be done via the 'Accounts' sub menu for the
Product using the 'Delete Link' button.</para>
</section>
</section>
@@ -0,0 +1,35 @@
<?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 Edit Tax Authority screen.</title>
<para>The 'Edit Tax Authority' sub menu is the first of six sub menus used in the creation or update of a Tax Authority. On the creation or update of a Tax Authority it is the default screen that is displayed.</para>
<para>It can be used for updating the basic details of a Tax Authority such as:</para>
<orderedlist>
<listitem><para>Changing whether a tax id or code is required for an exemption</para></listitem>
<listitem><para>Modifying the tax id or code format</para></listitem>
<listitem><para>Updating where or not to include the tax calculation as part of the product price</para></listitem>
</orderedlist>
<para>NOTE: An example of the Tax Id is as follows:</para>
<para>\d{2}\-\d{7}|\d{3}\-\d{2}\-\d{4} which translates to 99-9999999 or 999-99-9999</para>
</section>
@@ -0,0 +1,81 @@
<?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 Edit Tax Authority Associations screen.</title>
<para>An association is a way of specifying how tax authorities can be
linked to each other.</para>
<para>It can be used in the situation where the tax structure is
hierarchical (eg city tax, plus county tax plus state tax).</para>
<para>Using associations allows tax rates from multiple authorities to
be applied to a particular order at once.</para>
<section>
<title>How do I add a new association for a Tax Authority?</title>
<orderedlist>
<listitem>
<para>Enter or use the lookup to find the 'To Tax Auth Geo Id'
</para>
</listitem>
<listitem>
<para>Enter of use the lookup to find the 'To Tax Auth Party Id'
</para>
</listitem>
<listitem>
<para>Leave the 'From Date' blank (NOTE: It will default to the
current date and time</para>
</listitem>
<listitem>
<para>Leave the 'Thru Date' blank</para>
</listitem>
<listitem>
<para>Select the 'Type' from the dropdown or leave blank</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
<listitem>
<para>The new tax authority association is displayed at the bottom
of the screen.</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I update an association for a Tax Authority?</title>
<orderedlist>
<listitem>
<para>Only two fields are available for update, these are the 'Thru
Date' and 'Type'</para>
</listitem>
<listitem>
<para>Enter the changes required</para>
</listitem>
<listitem>
<para>Press the 'Update' button next to the entry updated</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I remove an association for a Tax Authority?</title>
<orderedlist>
<listitem>
<para>Press the 'Delete' button next to the entry that needs to be
deleted</para>
</listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,62 @@
<?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 Edit Tax Authority Categories screen.</title>
<para>The Tax Authority Categories sub menu screen allows you link a
tax authority to a specific catalog or product category.</para>
<para>It can be used to add product categories to a tax authority. This
means that all products in this category will be taxed at the rate
specified for the tax authority.</para>
<para>An example of this could be separating products into categories
for export to different countries. A separate tax authority will be
associated with each category so that the specific tax rate for each
of them will be applied.</para>
<section>
<title>How do I add a new Tax Authority / Category mapping?</title>
<orderedlist>
<listitem>
<para>Enter or Lookup the 'Category Id' to be mapped</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
<listitem>
<para>The new mapping will be displayed at the bottom of the screen
</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I update a Tax Authority / Category mapping?</title>
<para>A Tax Authority / Category mapping cannot be updated. If it
needs to be changed then the entry must be deleted and then
re-entered.</para>
</section>
<section>
<title>How do I remove a Tax Authority / Category mapping?</title>
<orderedlist>
<listitem>
<para>Locate the entry that needs to be removed</para>
</listitem>
<listitem>
<para>Press the 'Delete' button next to the entry </para>
</listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,92 @@
<?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 Edit Tax Authority GL Accounts screen.</title>
<para>The GL Accounts sub menu screen allows you specify which general
ledger account any tax calculated for this tax authority will be
posted. This is done at at organisation level so the minimum
requirement is that 'Company' is setup.</para>
<para>It is used to consolidate taxes for a specific tax authority into
one general ledger account. It can be very useful if you need to track
taxes for several tax authorities (eg different states or countries).
</para>
<section>
<title>How do I add a new general ledger account for a Tax Authority?
</title>
<orderedlist>
<listitem>
<para>Enter or use the lookup to select the 'Organisation Party Id'
(NOTE: Normally this would be 'Company')</para>
</listitem>
<listitem>
<para>Enter or use the lookup to select the 'GL Account'</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
</orderedlist>
<para>NOTE: The GL account used must have already been created in the
Global GL Settings and linked to the chart of accounts for 'Company'
</para>
</section>
<section>
<title>How do I update a general ledger account for a Tax Authority?
</title>
<orderedlist>
<listitem>
<para>The general ledger account can be updated by simply adding a
new account to replace the existing entry.</para>
</listitem>
<listitem>
<para>Enter or use the lookup to select the 'Organisation Party Id'
(NOTE: Normally this would be 'Company')</para>
</listitem>
<listitem>
<para>Enter or use the lookup to select the updated 'GL Account'
</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
<listitem>
<para>The existing entry will be replaced by the updated GL Account
</para>
</listitem>
</orderedlist>
<para>NOTE: Be careful when updating a general ledger account because
some transactions may have already been posted to the existing
account.</para>
</section>
<section>
<title>How do I delete a general ledger account for a Tax Authority?
</title>
<orderedlist>
<listitem>
<para>Locate the entry required</para>
</listitem>
<listitem>
<para>Press the 'Delete' button next to the entry that needs to be
deleted</para>
</listitem>
<listitem>
<para>The entry is removed </para>
</listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,32 @@
<?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 Edit Tax Authority Party Info screen.</title>
<para>This screen is used to create or update details for a Tax Authority Party entry.</para>
<para>If a new entry is being created all fields are available to be entered. If an existing entry is being updated only limited fields are available to be amended.</para>
<section>
<title></title>
<para></para>
</section>
</section>
@@ -0,0 +1,109 @@
<?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 Edit Tax Authority Product Rates screen.</title>
<para>This screen allows the setup of tax rates and types. The rates or
type can be assigned globally to a store (ie tax will be applied to
all products at the same rate) or category (ie limited to products in
a specific category).</para>
<para>Other parameters are available to allow the user to limit whether
the tax is to be applied to all purchases / sales or only those which
are above a certain threshold. </para>
<para>Tax associated with shipping charges or promotions can also be
configured here.</para>
<section>
<title>How do I add a new product tax rate?</title>
<orderedlist>
<listitem>
<para>Use the drop down box to select the tax 'Type' (eg Sales Tax)
</para>
</listitem>
<listitem>
<para>Use the lookup to select a 'Store Id' (or leave blank for all
Stores)</para>
</listitem>
<listitem>
<para>If a category has been setup it will be available for
selection in 'Category' field otherwise leave this blank</para>
</listitem>
<listitem>
<para>Leave 'Title Transfer' blank</para>
</listitem>
<listitem>
<para>Enter a value for the 'Minimum Price' for a product where the
tax is to be applied (NOTE: The Demo Data sets this as zero)</para>
</listitem>
<listitem>
<para>Enter a value for the 'Minimun Purchase' where the tax is to
be applied (NOTE: The Demo Data sets this as zero)</para>
</listitem>
<listitem>
<para>Use the drop down box to select whether 'Shipping Charges'
will be taxable</para>
</listitem>
<listitem>
<para>Enter the tax rate in the 'Tax Percentage' field (eg 12.5)
</para>
</listitem>
<listitem>
<para>Use the drop down box to select whether products on
'Promotion' will be taxable</para>
</listitem>
<listitem>
<para>Leave the 'From Date' and 'Thru Date' blank</para>
</listitem>
<listitem>
<para>Enter the name of the tax in the 'Description' field (eg VAT)
as this will be displayed and printed on documents when the tax is
applied</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I update an existing product tax rate</title>
<orderedlist>
<listitem>
<para>Select the entry that needs to be updated</para>
</listitem>
<listitem>
<para>Make the changes required</para>
</listitem>
<listitem>
<para>Press the 'Update' button next to the entry that needs to be
updated</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I delete a product tax rate?</title>
<orderedlist>
<listitem>
<para>Press the 'Delete' button next to the entry that needs to be
removed</para>
</listitem>
</orderedlist>
<para>NOTE: The deletion of tax rates may cause audit problems
particularly if the rate has already been used as part of a
transaction. In this case it would be better to expire the old rate
using the 'Thru Date' field and then enter the new rate.</para>
</section>
</section>
@@ -0,0 +1,104 @@
<?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 Variance Reason GL Accounts help screen</title>
<para>The Variance Reason / GL Account default is used for mapping any
stock differences to a particular general ledger account. If there are
variances in the number of products that are in stock then this
affects the value of inventory in the general ledger. By using this GL
default you can offset any differences in stock to the relevant
general ledger account.</para>
<para>The number of products (or items) in stock can vary. These
differences can be caused by numerous reasons. Some of these could be
as follows:</para>
<itemizedlist>
<listitem>
<para>Products have been damaged</para>
</listitem>
<listitem>
<para>Products were lost or stolen</para>
</listitem>
<listitem>
<para>Products were found </para>
</listitem>
<listitem>
<para>Under or over supply of a Product from a Supplier (eg. You have
ordered 10 and 11 are delivered....) </para>
</listitem>
<listitem>
<para>Free samples or giveaways to potential clients</para>
</listitem>
</itemizedlist>
<para>NOTE: These mappings are used in Catalog Manager when a manual
inventory adjustment is done through the Inventory Item screens.
</para>
<section>
<title>How do I add a new Variance Reason / GL Account mapping?
</title>
<para>There are 6 mappings that come as part of the OFBiz demo data.
</para>
<orderedlist>
<listitem>
<para>Select the 'Variance Reason Id' from the drop down list</para>
</listitem>
<listitem>
<para>Select the 'GL Account Type Id' to map it to from the drop
down list</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
<listitem>
<para>The new 'Variance Reason / GL Account Type' mapping is
displayed in the list at the bottom of the screen</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I update a Variance Reason / GL Account mapping?</title>
<orderedlist>
<listitem>
<para>Select the 'Variance Reason Id' from the drop down list</para>
</listitem>
<listitem>
<para>Select the updated 'GL Account Type Id' to map it to from the
drop down list</para>
</listitem>
<listitem>
<para>Press the 'Add' button</para>
</listitem>
<listitem>
<para>The updated 'Variance Reason / GL Account Type' mapping is
displayed in the list at the bottom of the screen</para>
</listitem>
</orderedlist>
</section>
<section>
<title>How do I remove a Variance Reason / GL Account mapping?</title>
<orderedlist>
<listitem>
<para>Press the 'Remove' button next to the entry that you want to
delete</para>
</listitem>
<listitem>
<para>The entry is removed from the list of entries displayed</para>
</listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,31 @@
<?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>Accounting Features</title>
<para>
<orderedlist>
<listitem>
<para>Invoices</para>
</listitem>
<listitem>
<para>Payments</para>
</listitem>
</orderedlist>
</para>
</section>
@@ -0,0 +1,35 @@
<?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 Financial Account Main screen.</title>
<para>The default screen for Financial Accounts displays a list of any
bank accounts that have been created. Details listed include the
account the following</para>
<itemizedlist>
<listitem>
<para>account name</para>
</listitem>
<listitem>
<para>organisation the account is linked to</para>
</listitem>
<listitem>
<para>account balances (available and actual)</para>
</listitem>
</itemizedlist>
</section>
@@ -0,0 +1,48 @@
<?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 Find Agreements help screen</title>
<para> The default screen is for the Agreements tab is 'Find Agreements'. It is used to locate existing agreements that have been created. The user has the option to</para>
<itemizedlist><listitem><para>use the 'Find' button to locate an existing agreement or </para></listitem>
<listitem><para>create a new one by clicking on the 'Create Agreement' button.</para></listitem>
</itemizedlist>
<section>
<title>How do I locate an existing agreement?</title>
<orderedlist>
<listitem><para>Enter search option details if known</para></listitem>
<listitem><para>Press the 'Find' button</para></listitem>
<listitem><para>A list of existing agreements will be displayed</para></listitem>
</orderedlist>
</section>
<section>
<title>How do I create a new agreement?</title>
<orderedlist>
<listitem><para>Press the 'Create Agreement' button</para></listitem>
<listitem><para>The 'Edit Agreement' screen is displayed</para></listitem>
<listitem><para>Enter the details required and press the 'Submit' button</para></listitem>
</orderedlist>
</section>
<section>
<title>How do I cancel an agreement?</title>
<orderedlist>
<listitem><para>Locate the agreement required</para></listitem>
<listitem><para>Press the 'Cancel' button on the agreement entry that needs to be cancelled</para></listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,26 @@
<?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 Find Billing Account help screen</title>
<para>The default screen is for the Billing Account tab is 'Find
Billing Account'. It is used to locate existing billing accounts that
have been created.</para>
<para>The user has the option to select an existing billing account or
create a new one by clicking on the 'New' button.</para>
</section>
@@ -0,0 +1,64 @@
<?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 Find Deposit Slips screen.</title>
<para>This screen is used to locate payment groups and their associated deposit slips that have
been created. Deposit slips are created by grouping transactions together into a Payment
Group. This can be done using the 'Accounting / Payment Group' tab, the 'Financial Account /
Deposit Withdraw' tab or the 'Create New Deposit Slip' button. </para>
<para>Currently Deposit Slips are created for AR Batch Payments only.</para>
<para>The deposit slips are available in PDF format and there is an option to cancel the batch
that generated the deposit slip if required.</para>
<section>
<title>How do I locate an existing Deposit Slip?</title>
<para>Enter some characters from the 'Payment Group Id' or 'Payment Group Name' if
known</para>
<para>Press the 'Search' button</para>
</section>
<section>
<title>How do I update an existing Deposit Slip?</title>
<para>
<orderedlist>
<listitem>
<para>Locate the Payment Group required</para>
</listitem>
<listitem>
<para>Select the Payment Group by clicking on the Payment Group Id</para>
</listitem>
</orderedlist>
</para>
<para>The 'Edit Payment Group' screen is displayed</para>
<para>Add any new payment deposits or update existing deposits for the Payment Group</para>
<para>All changes in the Payment Group will automatically be updated to the Deposit
Slip</para>
</section>
<section>
<title>How do I delete an existing Deposit Slip?</title>
<para>A deposit slip can not be directly deleted but it is removed when a Payment Group is
cancelled</para>
<para>Press the 'Cancel' button next to the Payment Group required to cancel a payment
group</para>
<para>The Payment Group is removed from the 'Find Deposits' screen and no deposit slips can
be viewed or printed.</para>
</section>
</section>
@@ -0,0 +1,41 @@
<?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 Find Financial Accounts screen.</title>
<para>This screen is used to locate existing financial accounts that
have been created.</para>
<para>It also includes the option to use the 'Advanced Search' button to display additional fields that can be used to locate a specific financial account.</para>
<para>New Financial Accounts can be created using the 'Create New Financial Account' button.</para>
<section>
<title>How do locate an existing Financial Account?</title>
<para>Press the 'Search' button</para>
<para>A list of all existing Financial Accounts will be displayed.</para>
</section>
<section>
<title>How do I delete an existing Financial Account?</title>
<para>Press the 'Search' button on the Financial Account main screen</para>
<para>A list of all existing Financial Accounts will be displayed</para>
<para>Press the 'Delete' button next to the Financial Account that needs to be deleted.</para>
</section>
</section>
@@ -0,0 +1,23 @@
<?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 Find Financial Account Reconciliations screen.</title>
<para>This screen displays the details of any reconciliations in progress for a financial account. Only reconciliations that have actual transactions associated with them will be displayed. If a reconciliation group has no transactions assigned to it then it will not be displayed.</para>
</section>
@@ -0,0 +1,59 @@
<?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 Find Financial Account Transactions screen.</title>
<para>A transaction is an entry that is shown on the financial account.
Transactions can be one
of the following types:</para>
<para>
<itemizedlist>
<listitem>
<para>Deposits</para>
</listitem>
<listitem>
<para>Withdrawals</para>
</listitem>
<listitem>
<para>Adjustments</para>
</listitem>
</itemizedlist>
</para>
<para>Transactions are used to show entries and the financial history
of the financial account.
Similar to a bank account or credit card statement the transaction will show
details of what
was spent or paid into the account.</para>
<para>Some transaction totals have been added to this screen to help as
part of the
reconciliation processes. Additional details available include number of
transactions,
transaction totals and status.</para>
<section>
<title>How do I find transactions for a Financial Account?</title>
<itemizedlist>
<listitem>
<para>Press the 'Search' button</para>
</listitem>
<listitem>
<para>A list of transactions for the financial account will be
displayed</para>
</listitem>
</itemizedlist>
</section>
</section>
@@ -0,0 +1,44 @@
<?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 Find Gateway Responses help screen</title>
<para>This is the default screen for the 'Transactions' sub menu. Press the 'Lookup' button to
display details of all transactions that have been authorised, captured or manually
entered.</para>
<section>
<title>How do I view all Gateway response transactions?</title>
<para>
<orderedlist>
<listitem>
<para>Press the 'Lookup' button</para>
</listitem>
</orderedlist>
</para>
<para>A list of all transactions that have been authorised, captured or manually entered
will be displayed.</para>
</section>
<section>
<title>Transaction results (external link)</title>
<para>
<link xl:href="http://www.authorize.net/support/merchant/Transaction_Response/Transaction_Response.htm">
List of all the transaction results
</link>
</para>
</section>
</section>
@@ -0,0 +1,22 @@
<?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 Find GL Account Category help screen</title>
<para></para>
</section>
@@ -0,0 +1,31 @@
<?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 Find Global GL Account help screen</title>
<para> The default screen for the Global GL Settings tab is 'List Accounts'. If the demo data has been loaded then the default screen displays a list of the general ledger accounts that form the Global Chart of Accounts template. Each general ledger account must exist in the global template before it can be assigned to an organisation (eg Company) for transaction and reporting use.</para>
<para>It is used to view or edit the details of the general ledger accounts in the global template and there are options to print or export the account details.</para>
<section>
<title>How do I view details for an account?</title>
<orderedlist>
<listitem><para>Locate the account required</para></listitem>
<listitem><para>Click on account id</para></listitem>
<listitem><para>The account details will be displayed</para></listitem>
</orderedlist>
</section>
</section>
@@ -0,0 +1,23 @@
<?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 Find Payment Gateway Config help screen</title>
<para>The default screen allows the user to search for any payment gateway configurations that are setup.</para>
<para>Press the 'Lookup' button to see a list of existing configurations.</para>
</section>

Some files were not shown because too many files have changed in this diff Show More