Fri, 25 Sep 2015 13:44:32 +0200Merge from but-dev
Unai Martirena <unai.martirena@openbravo.com> [Fri, 25 Sep 2015 13:44:32 +0200] rev 28507
Merge from but-dev

Fri, 25 Sep 2015 14:32:13 +0200Related to issue 30812: Improve the functions.
Naroa Iriarte <naroa.iriarte@openbravo.com> [Fri, 25 Sep 2015 14:32:13 +0200] rev 28506
Related to issue 30812: Improve the functions.

The function filterDialogCallback of the "ob-formitem-tree-filter.js" is improved.
This function calls the "updateCriterion" function which updates the criterion of
the tree filter deleting the old criterion and adding the new criterion.
The crieteria of the rest of the columns in the grid is taken into account.

Thu, 24 Sep 2015 15:50:19 +0200Fixed issue 30812:Allow multiple filtering using tree reference.
Naroa Iriarte <naroa.iriarte@openbravo.com> [Thu, 24 Sep 2015 15:50:19 +0200] rev 28505
Fixed issue 30812:Allow multiple filtering using tree reference.

It was not allowed the multiple filtering using a tree reference in a
pick and execute window's grid.

The ob-formitem-tree-filter.js has been changed for being able to do this.
The problem was in the "filterDialogCallback" funtion in the "this.grid.parentElement.setFilterEditorCriteria(criteria)"
It was not working fine in every case.
It was neccesary to change the criteria for having the following: It was neccesary to delete
the old criteria of the tree filter, taking into account the new criteria of the tree filter
and taking into account the criteria of the rest of the grid of the pick and Execute window.

The new function, "setCurrentCriterion" is the one that updates the criteria of the tree filter, it deletes the
old criteria of the filter and gets the new criteria of the tree filter.

Fri, 18 Sep 2015 10:07:05 +0200Related to Bug 29949: Create new table for CC Warehouses instead of OrgWarehouse
Unai Martirena <unai.martirena@openbravo.com> [Fri, 18 Sep 2015 10:07:05 +0200] rev 28504
Related to Bug 29949: Create new table for CC Warehouses instead of OrgWarehouse

Thu, 17 Sep 2015 16:27:47 +0200[Product Services] Avoid compilation errors in Services tests
Unai Martirena <unai.martirena@openbravo.com> [Thu, 17 Sep 2015 16:27:47 +0200] rev 28503
[Product Services] Avoid compilation errors in Services tests

Thu, 17 Sep 2015 16:20:28 +0200[Product Services] Changes on Service Price Calculation
Unai Martirena <unai.martirena@openbravo.com> [Thu, 17 Sep 2015 16:20:28 +0200] rev 28502
[Product Services] Changes on Service Price Calculation

1) Implement 'After Discounts' check box in Service Price Rule header for Service Price Rules of type 'Ranges'.
2) Calculate the price of a service related to a product based on the unit price of the product if the service is 'As per product'. For 'Unique Quantity' services keep calculating the price based on total amount of related lines.

Thu, 10 Sep 2015 19:14:51 +0200Related to Issue 29949: Implement Core CC Warehouse Functionality
Unai Martirena <unai.martirena@openbravo.com> [Thu, 10 Sep 2015 19:14:51 +0200] rev 28501
Related to Issue 29949: Implement Core CC Warehouse Functionality

Wed, 09 Sep 2015 09:41:18 +0200Fix merge issue from hgvol
Unai Martirena <unai.martirena@openbravo.com> [Wed, 09 Sep 2015 09:41:18 +0200] rev 28500
Fix merge issue from hgvol

Tue, 08 Sep 2015 16:37:48 +0200Merged from hgvol
Unai Martirena <unai.martirena@openbravo.com> [Tue, 08 Sep 2015 16:37:48 +0200] rev 28499
Merged from hgvol

Tue, 08 Sep 2015 09:26:34 +0200Merged heads
Martin Taal <martin.taal@openbravo.com> [Tue, 08 Sep 2015 09:26:34 +0200] rev 28498
Merged heads