Thu, 22 Oct 2015 16:04:57 +0200[Product Services] Merged Services branch
Aaron Calero <aaron.calero@openbravo.com> [Thu, 22 Oct 2015 16:04:57 +0200] rev 28628
[Product Services] Merged Services branch

Thu, 22 Oct 2015 13:33:46 +0200[Product Services] Merged Services branch
Aaron Calero <aaron.calero@openbravo.com> [Thu, 22 Oct 2015 13:33:46 +0200] rev 28627
[Product Services] Merged Services branch

Wed, 21 Oct 2015 12:39:33 +0200[Product Services] remove temporary read only logic in Price List field in Service Price Rule Ranges
Unai Martirena <unai.martirena@openbravo.com> [Wed, 21 Oct 2015 12:39:33 +0200] rev 28626
[Product Services] remove temporary read only logic in Price List field in Service Price Rule Ranges

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 28625
Merge from but-dev

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 28624
[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 28623
[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.

Mon, 31 Aug 2015 13:50:46 +0200Merge from but-dev
Aaron Calero <aaron.calero@openbravo.com> [Mon, 31 Aug 2015 13:50:46 +0200] rev 28622
Merge from but-dev

Mon, 27 Jul 2015 15:37:31 +0200[Product Service] Exclude Service order lines in Related Orderlines pick&edit
Unai Martirena <unai.martirena@openbravo.com> [Mon, 27 Jul 2015 15:37:31 +0200] rev 28621
[Product Service] Exclude Service order lines in Related Orderlines pick&edit

Wed, 22 Jul 2015 12:35:25 +0200[Product Services] Adds same fields to tab than for P&E (included product categories)
Eduardo Argal Guibert <eduardo.argal@openbravo.com> [Wed, 22 Jul 2015 12:35:25 +0200] rev 28620
[Product Services] Adds same fields to tab than for P&E (included product categories)

Tue, 21 Jul 2015 13:36:14 +0200[Product service] Adds missing fields for included products tab and P&E
Eduardo Argal Guibert <eduardo.argal@openbravo.com> [Tue, 21 Jul 2015 13:36:14 +0200] rev 28619
[Product service] Adds missing fields for included products tab and P&E