"Applied fix from trunk for revision: 1559814" 
------------------------------------------------------------------------
r1559814 | jleroux | 2014-01-20 20:38:45 +0100 (lun. 20 janv. 2014) | 38 lignes

A patch from Michael Ende for "SimpleMethod parameters doesnt work with prefix" https://issues.apache.org/jira/browse/OFBIZ-5371

I experienced some problems when a form submitted parameters with prefix directly to a SimpleMethod (through the controller request). 
In this case the prefix is not stripped from the parameter name. The patch updates the method ModelService.java:makePrefixMap().

The idea of the prefixMap is: 
If you have some fields like packageweight_1(value=55), packageweight_2(value=65) ... in a form and in a service you need a map called packageweight with the following key values 

packageweight{1=55;2=56;...}

The Problem is that the function makePrefixMap doesn't replace the Prefix.

For Example:
On the "Complete" button of the Facility->Shipment screen we call an event and not the completePack service directly.
The event checks some user rights and after that he call the completePack service. If we call the service from an event there throws an NumberFormatException because the packeweight-PrefixMap contains the prefixes.

This is my event description:
 <simple-method method-name="completePackCheckPermission"
        short-description="Check if this user has permission to create a picklist role"
        login-required="true">
        <check-permission permission="LOGISTICS_CREATE">
            <alt-permission permission="LOGISTICS_ADMIN"/>
            <fail-property resource="EcommerceLogisticsErrorUiLabels" property="NoPermissionForUsage" />
        </check-permission>
        <check-errors />

        <session-to-field field="packingSession"/>
        <set field="parameters.packingSession" from-field="packingSession"/>

        <set-service-fields service-name="completePack" to-map="serviceParameters"
            map="parameters" />
        <call-service service-name="completePack" in-map-name="serviceParameters" />
        <return />
    </simple-method>

jleroux: I'm not quite sure there are no side-effects, but I was not able to find one. So I will wait some time before backporting...


------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release11.04@1564407 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1566273  " (conflict handled by hand)
------------------------------------------------------------------------
r1566273 | jleroux | 2014-02-09 12:12:11 +0100 (dim. 09 févr. 2014) | 5 lignes

A patch from  Chris Lombardi  for "Void item, quantity update, and discounts don't work for configurable items" https://issues.apache.org/jira/browse/OFBIZ-5535

Void item, quantity update and discounts work off of the sku in the pos.  I fixed it to use the cart index so these operations will work when there are multiple configurations per sku in the cart.


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


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release11.04@1566277 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1569078" 
------------------------------------------------------------------------
r1569078 | jleroux | 2014-02-17 19:36:55 +0100 (lun. 17 févr. 2014) | 2 lignes

Prevents a possible misconfiguration spotted on trunk demo:
Expression blog.contentName is undefined on line 31, column 116 in component://ecommerce/webapp/ecommerce/blog/blogs.ftl. The problematic instruction: ---------- ==> ${blog.contentName} [on line 31, column 114 in 
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release11.04@1569080 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1571219" 
------------------------------------------------------------------------
r1571219 | jleroux | 2014-02-24 11:33:12 +0100 (lun. 24 févr. 2014) | 10 lignes

After reverting r1571198 (there was too much unwanted changes due to my "Save Actions" setting in Eclipse) doing it again with the only changes really wanted

A slightly modified patch from Praveen Agrawal for "The getFeatureIdQtyMap function doesn't include the DISTINGUISHING_FEAT into the featureMap" https://issues.apache.org/jira/browse/OFBIZ-5544

The getFeatureIdQtyMap function in ShoppingCartItem.java doesn't include the DISTINGUISHING_FEAT in featureMap so if we want to calculate the Shipping amount based on Distinguishing feature, this method doesn't return the Distinguishing Feature in Feature Map. If we add DISTINGUISHING_FEAT as productFeatureApplTypeId in filterExprs then the feature map would contain the Distinguishing feature in addition to Standard and Required Feature.

Also in ShoppingCartItem.java, putAdditionalProductFeatureAndAppl method, i think the OrderAdjustment should only be included when the amount is not null.

jleroux: When the amount is null it's now not added in the adjustement (I moved that in the block above where the amount is already tested for null). But the OrderAdjustment is still created because a recurringAmount could still exist . I just added a warning for when both amounts are null. We could decide to not create an adjustement when there are no amounts at all. But I preferred a warning, because it's a weird situation and people could prefer to be aware...

------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release11.04@1571227 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1573161  " 
------------------------------------------------------------------------
r1573161 | jleroux | 2014-03-01 13:15:33 +0100 (sam. 01 mars 2014) | 14 lignes

A patch from Leila Mekika for "Problems in single form when use-when and position are used together" https://issues.apache.org/jira/browse/OFBIZ-5552

The service "renderSingleFormString" check the previous field position to see if the current field must be displayed after the previous field or on a new line. 

When the previous field has a use-when condition that is not valid, it remains as the currentFormField and the next field is compared with this "not rendered" field. If the position of this previous field is the same as the current field, the current is displayed on the next line.


To reproduce, add in a single form the three fields below :

<field position="1" name="first"><display description="first"/></field>
<field position="2" name="second" use-when="true"><display description="second"/></field>
<field position="2" name="second" use-when="false"><display description="second"/></field>

The field second is rendered on a new line
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release11.04@1573164 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1573498  " 
------------------------------------------------------------------------
r1573498 | jleroux | 2014-03-03 10:49:34 +0100 (lun. 03 mars 2014) | 3 lignes

Revert r1573161 (A patch from Leila Mekika for "Problems in single form when use-when and position are used together" https://issues.apache.org/jira/browse/OFBIZ-5552)

This had some side effects, like hiding the top part of the product edit screen
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release11.04@1573502 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1573639 " 
------------------------------------------------------------------------
r1573639 | jleroux | 2014-03-03 18:58:54 +0100 (lun. 03 mars 2014) | 23 lignes

A patch from Deepak Dixit for "Order item status change issue." https://issues.apache.org/jira/browse/OFBIZ-4953

Steps to regenerate issue:
- Crate an SO/PO with more then one line item.
- Partially ship/received any one order item.
- After partial ship/receive order should be in approve status, one order item in in completed status and another one is in Approved status.
- Change order status to hold.
- Now again approve order.
- After approve all order order except Completed/cancelled item should go in Approved status.
But as per the current behavior completed order item also change to approved status.

Here is the updated patch, this include the cancel received item flow. ITEM_REJECTED status change will be handled by StatusValidChange flow.

jleroux: 
considering the current effort to remove Javolution use when possible, I have replaced 
  FastList.<EntityExpr>newInstance(); 
by 
  new ArrayList<EntityExpr>();

I formatted to use {} around one line code



------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release11.04@1573642 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1574019  " 
------------------------------------------------------------------------
r1574019 | jleroux | 2014-03-04 11:37:01 +0100 (mar. 04 mars 2014) | 16 lignes

A patch from Leila Mekika for "Problems in single form when use-when and position are used together" https://issues.apache.org/jira/browse/OFBIZ-5552

The service "renderSingleFormString" check the previous field position to see if the current field must be displayed after the previous field or on a new line. 

When the previous field has a use-when condition that is not valid, it remains as the currentFormField and the next field is compared with this "not rendered" field. If the position of this previous field is the same as the current field, the current is displayed on the next line.


To reproduce, add in a single form the three fields below :

<field position="1" name="first"><display description="first"/></field>
<field position="2" name="second" use-when="true"><display description="second"/></field>
<field position="2" name="second" use-when="false"><display description="second"/></field>

The field second is rendered on a new line

jleroux: this second version works correctly
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release11.04@1574022 13f79535-47bb-0310-9956-ffa450edef68