Tue, 22 Dec 2015 14:04:40 +0000CI: merge back from main
RM packaging bot <staff.rm@openbravo.com> [Tue, 22 Dec 2015 14:04:40 +0000] rev 28159
CI: merge back from main

Tue, 22 Dec 2015 13:51:07 +0000CI: update AD_MODULE to version 28157
RM packaging bot <staff.rm@openbravo.com> [Tue, 22 Dec 2015 13:51:07 +0000] rev 28158
CI: update AD_MODULE to version 28157

Tue, 22 Dec 2015 09:29:10 +0100fixed bug 31758: error uploading attachments/images rendering OB in a frame
Asier Lostalé <asier.lostale@openbravo.com> [Tue, 22 Dec 2015 09:29:10 +0100] rev 28157
fixed bug 31758: error uploading attachments/images rendering OB in a frame

Whent trying to upload attachments/images in an application rendered in a frame,
JS errors were thrown.

This was caused because callback script for those actions assumed top was the
container for Openbravo, but when in a frame, top is the topmost frameset.

Fixed by checking if top is OB, and if not using parent instead.

Mon, 21 Dec 2015 19:19:21 +0000CI: merge back from main
RM packaging bot <staff.rm@openbravo.com> [Mon, 21 Dec 2015 19:19:21 +0000] rev 28156
CI: merge back from main

Mon, 21 Dec 2015 19:05:46 +0000CI: update AD_MODULE to version 28154
RM packaging bot <staff.rm@openbravo.com> [Mon, 21 Dec 2015 19:05:46 +0000] rev 28155
CI: update AD_MODULE to version 28154

Fri, 18 Dec 2015 14:17:11 +0100fixed issue 31749: The warning message is not correct.
Naroa Iriarte <naroa.iriarte@openbravo.com> [Fri, 18 Dec 2015 14:17:11 +0100] rev 28154
fixed issue 31749: The warning message is not correct.

When a warning message had to be shown when saving a record, it was not the proper message.
It showed "Saving failed" text appended to the original warning message.
That was not correct because it was possible to save the record.
To fix this the "setMessage" function of the "ob-messagebar.js" has been changed.
Now, it appends the "Saving failed" message only if the message type is an error.

Thu, 17 Dec 2015 16:47:54 +0000CI: merge back from main
RM packaging bot <staff.rm@openbravo.com> [Thu, 17 Dec 2015 16:47:54 +0000] rev 28153
CI: merge back from main

Tue, 01 Dec 2015 18:20:18 +0100Fixes issue 31470: UniqueValidCombination modulescript is deactivating accounts
Alvaro Ferraz <alvaro.ferraz@openbravo.com> [Tue, 01 Dec 2015 18:20:18 +0100] rev 28152
Fixes issue 31470: UniqueValidCombination modulescript is deactivating accounts

Add group by c_acctschema_id in selectDuplicates and updateValidCombinationDeactivateDuplicated queries in UniqueValidCombination modulescript.

Thu, 17 Dec 2015 13:23:14 +0100Related to issue 31701: code review improvements
Víctor Martínez Romanos <victor.martinez@openbravo.com> [Thu, 17 Dec 2015 13:23:14 +0100] rev 28151
Related to issue 31701: code review improvements

When reactivating an order, do not consider payments in Awaiting Payment status as payments really linked to the order. This is a way to ensure reactivation of orders already linked to a voided invoice is possible, because since #30971 a 0 amount payment is automatically when voiding an invoice.
So the flow in that case will be to manually reactivate that payment, and then reactivate the order.

Updated copyright year.

Tue, 15 Dec 2015 12:57:28 -0500Fixes Issue 31701 It is not posible to modify order's payments ....
Nono <f.carballo@nectus.com> [Tue, 15 Dec 2015 12:57:28 -0500] rev 28150
Fixes Issue 31701 It is not posible to modify order's payments ....
The C_ORDER_TRG2 trigger was updated to take into account sales invoices
with document status 'VO' when updating.