Between test and production you might have a QS stage (same than production but not real production). You can't always make silent deployments (also called dark launches) in production...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1571994 13f79535-47bb-0310-9956-ffa450edef68
qa is a better name here, I'm used to the German translation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1571996 13f79535-47bb-0310-9956-ffa450edef68
Upgraded lucene component to the latest Lucene release 4.7.0



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1572483 13f79535-47bb-0310-9956-ffa450edef68
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

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1573161 13f79535-47bb-0310-9956-ffa450edef68
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

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1573498 13f79535-47bb-0310-9956-ffa450edef68
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>();


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1573552 13f79535-47bb-0310-9956-ffa450edef68
Reverts r1573552
I have applied the wrong patch :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1573553 13f79535-47bb-0310-9956-ffa450edef68
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




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1573639 13f79535-47bb-0310-9956-ffa450edef68
While at it (OFBIZ-4953) replaces a deprecated delegator.removeAll()

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1573646 13f79535-47bb-0310-9956-ffa450edef68
While at it (OFBIZ-4953), considering the current effort to remove Javolution use when possible, I have replaced  few
  FastList.<EntityExpr>newInstance(); 
by 
  new ArrayList<EntityExpr>();



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1573647 13f79535-47bb-0310-9956-ffa450edef68
adding budget services, screens and forms

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1573884 13f79535-47bb-0310-9956-ffa450edef68
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

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

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1574088 13f79535-47bb-0310-9956-ffa450edef68
Thanks to Pierre on dev ML, reverts a wrong commit (was already OK, misread)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1574127 13f79535-47bb-0310-9956-ffa450edef68
Running OFBiz with start-batch, stopping it then or checking its status was missing, this completes these aspects.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1574201 13f79535-47bb-0310-9956-ffa450edef68
some missing files from commit 1573884

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1574400 13f79535-47bb-0310-9956-ffa450edef68
Completes descriptions of ant targets which have portoffset parameter
Completes code in Config.java for start-debug only (adds "start-debug" to pick start.properties when portoffset is used). 
The rest of the changes is only refactoring to have the replacement to pick start.properties only in getInstance()

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1574404 13f79535-47bb-0310-9956-ffa450edef68
Fixes a bug reported by Rong Nguyen "Error when first login and change password" https://issues.apache.org/jira/browse/OFBIZ-5564

Scenario:
 1. Load-seed
 2. Create-admin-user
 3. Access: /catalog/control/main
 4. Login
 5. Change password for the first use
 
After password change, web browser redirect user to /catalog/control/main with an error

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1575508 13f79535-47bb-0310-9956-ffa450edef68
GenericEntity.java bug fix, updated the unit tests.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1575589 13f79535-47bb-0310-9956-ffa450edef68
Added missing index.jsp files required to enable redirection to control/main for the webapplications overriden by specialpurpose components; this fixes the issues reported in the mailing list by Deepak Dixit and by Vyom Jain.


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