A patch from  Praveen Agrawal for "Checking with orderAdjustment.productPromoId rather than adjustment.productPromoId" https://issues.apache.org/jira/browse/OFBIZ-5411

While iterating the adjustments list we are checking with orderAdjustment.productPromoId rather then the adjustment.productPromoId. Using orderAdjustment.productPromoId the condition will never true and the newOrderAdjustmentTotal will always be 0.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1547548 13f79535-47bb-0310-9956-ffa450edef68
Merged revision(s) 1547657 from ofbiz/branches/release13.07:
Fixed some flawed conditional logic introduced in rev 1488656.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1547673 13f79535-47bb-0310-9956-ffa450edef68
Fixes an issue reported by Christian Carlow at "Invoice Item type drop down empty when creating new invoice item" https://issues.apache.org/jira/browse/OFBIZ-5415

jleroux: Rather than what proposed Christian I used the same best practice than in r1527171

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1547717 13f79535-47bb-0310-9956-ffa450edef68
Fixes an issue when no amount have been specified while creating an invoice item
Better groovy scriplets (elvis operator)
I believe using BigDecimal for both fields quantity and total can't hurt
Increases size of both fields quantity and total 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1547719 13f79535-47bb-0310-9956-ffa450edef68
I made a mistake in r1527171. When I removed the call to GetInvoiceItemTypes.groovy in InvoiceScreens.xml I did not notice it was also generating the AccountOrganizationAndClass list.
This fixes it by renaming GetInvoiceItemTypes.groovy to GetAccountOrganizationAndClass.groovy and removing the now useless invoiceItemTypes list inside it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1547742 13f79535-47bb-0310-9956-ffa450edef68
Missed to commit GetAccountOrganizationAndClass.groovy in previous commit

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1547745 13f79535-47bb-0310-9956-ffa450edef68
Improved error message in GenericEntity.java - no functional change. The improved message should help developers solve the problem causing the exception.

This has been discussed before, but I will mention it again for instruction: GenericEntity instances that are kept in the entity cache are shared among multiple threads. Therefore, they must be immutable. If you get a GenericEntity instance from the cache and you want to modify it, you must clone it first.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1547790 13f79535-47bb-0310-9956-ffa450edef68
A patch from Christian Carlow for "HTML embedded in entity fields is rendered as text rather than HTML elements when using FTL" https://issues.apache.org/jira/browse/OFBIZ-5376

StringUtil.wrapString is now employed as it is on the order items section of the order creation review page.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1548143 13f79535-47bb-0310-9956-ffa450edef68
In r1533839 (related to https://issues.apache.org/jira/browse/OFBIZ-4794 "Set different ports for testing in a CI environment (e.g. Jenkins)"
Which will mostly be used to simultaneously run official demos without having to create patches, I forgot the portOffset for websites and url.properties ports values.
This fixes this point. I also did in it RequestHandler class though the getDefaultServerRootUrl() method is now deprecated.
To be consistent with r1547186 I will backport in R13.07

People should be aware that this will change the ports values of websites and url.properties ports values which in some cases could be an unwanted side effect. 
Anyway the portOffset feature is not destined to be used in production environments where websites and url.properties ports values are often changed purposely

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1549015 13f79535-47bb-0310-9956-ffa450edef68
No functional change: removes trailing spaces

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1549017 13f79535-47bb-0310-9956-ffa450edef68
No functional changes.
Not a big deal(because it should be very rarely changed during a session + with cache cleared) but I did not want to have final here. I tried this "save action" in Eclipse (on private variable) but finally decided to remove it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1549026 13f79535-47bb-0310-9956-ffa450edef68
A, directly sent to me, Olivier Heintz's patch which completes the work done by Adrian at r1546891:
>>> Moved web access authorization code from the Flat Grey visual
>>> theme to LoginWorker.java. This change needs to be copied to
>>> other visual themes as well.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1549981 13f79535-47bb-0310-9956-ffa450edef68
Fixes a typo

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550117 13f79535-47bb-0310-9956-ffa450edef68
A patch from Gareth Carter for "htmlFormMacroLibrary.ftl renderNextPrev does not calculate number of pages correctly" https://issues.apache.org/jira/browse/OFBIZ-5422

There are 2 issues with the existing code.
1 - floor is applied to viewSize only not the computed value
2 - if the listSize divides with viewSize evenly, you'll get one extra
eg
24/2=12 - no of pages = 13
24/5=4.8 - no of pages = 5

Change to correctly calculate the number of pages using ceiling rather than floor

To repoduce this I went into find party screen, search for all and manually set the view size (I had to click next and change the VIEW_SIZE parameter in the url).

In my description I mention 24/2=12 and 24/5=4.8,
24 is number of parties I had
2/5 is the view size

It does not matter what the item size is (as long as its more than 0), you just have to make sure listSize divides by viewSize evenly. In my case 24/2 divided evenly and which should have have given 12 pages but gave 13.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550201 13f79535-47bb-0310-9956-ffa450edef68
A patch from Christian Carlow for "Cancelled ship groups show incorrect quantities on edit order items page" https://issues.apache.org/jira/browse/OFBIZ-5405

Cancelled ship groups show incorrect quantities on the edit order items page.  I cancelled a ship group with a quantity of 2 for an order item but the quantity was still set to 2 when entering edit mode again.  Because its not set to 0 or blank, all cancelled ship groups must manually be set to one of those values in order for the quantity not to be added back after updating the order items.

This patch resolves the problem. It calculates the ship group quantity with OrderItemShipGroupAssoc.quantity - OrderItemShipGroupAssoc.cancelQuantity in editorderitems.ftl



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550255 13f79535-47bb-0310-9956-ffa450edef68
No functional changes
This removes a tab introduced with Christian Carlow's patch for "Cancelled ship groups show incorrect quantities on edit order items page" OFBIZ-5405
It also puts the quantity check box near the quantity to avoid any confusion and modify the related label to clarify (English and French only), incidentally this removes a tab introduced with Thaï labels

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550258 13f79535-47bb-0310-9956-ffa450edef68
A patch from Pierre Smits for "Improving Dutch references in AccountingEntityLabels.xml" https://issues.apache.org/jira/browse/OFBIZ-5407

jleroux: there are also few English labels changes and a new TaxAuthorityRateType.description.EXCISE_TAX labels with much languages

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550378 13f79535-47bb-0310-9956-ffa450edef68
I checked with Pierre this was a wrong C/P from above

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550380 13f79535-47bb-0310-9956-ffa450edef68
No functional changes, code improvements
Fixes some dead code entries
Automatically adds some override annotations


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550429 13f79535-47bb-0310-9956-ffa450edef68
No functional change. Removes useless check

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