details: https://code.openbravo.com/erp/devel/main/rev/83852991f0eb changeset: 30073:83852991f0eb user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Sep 15 14:46:40 2016 +0000 summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/8af09e7a1548 changeset: 30074:8af09e7a1548 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Thu Jan 29 18:51:43 2015 +0100 summary: [Cancel and Replace] Buttons, Process Definition & Temporal Order Creation 1 details: https://code.openbravo.com/erp/devel/main/rev/1e10429b75a7 changeset: 30075:1e10429b75a7 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Fri Jan 30 14:59:56 2015 +0100 summary: [Cancel and Replace] Buttons, Process Definition & Temporal Order Creation 2 details: https://code.openbravo.com/erp/devel/main/rev/f08a8def2738 changeset: 30076:f08a8def2738 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Mon Feb 02 18:56:23 2015 +0100 summary: [Cancel and Replace] Orders Creation & Display logic bugfix details: https://code.openbravo.com/erp/devel/main/rev/e6bbf0f03d0f changeset: 30077:e6bbf0f03d0f user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Tue Feb 03 18:41:24 2015 +0100 summary: [Cancel and Replace] Button Display logic details: https://code.openbravo.com/erp/devel/main/rev/522dcb7388b3 changeset: 30078:522dcb7388b3 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Tue Feb 03 19:04:07 2015 +0100 summary: [Cancel and Replace] Button Display logic bugfix details: https://code.openbravo.com/erp/devel/main/rev/a192ef5f36cf changeset: 30079:a192ef5f36cf user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Thu Feb 05 18:06:52 2015 +0100 summary: Shipments Creation 1 details: https://code.openbravo.com/erp/devel/main/rev/d901e835656c changeset: 30080:d901e835656c user: Guillermo Gil <guillermo.gil <at> openbravo.com> date: Fri Feb 06 09:37:32 2015 +0100 summary: [Cancel and Replace] Added missing elements details: https://code.openbravo.com/erp/devel/main/rev/4e92a3334965 changeset: 30081:4e92a3334965 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Fri Feb 06 11:51:22 2015 +0100 summary: [Cancel and Replace] Shipments Creation 2 details: https://code.openbravo.com/erp/devel/main/rev/bd2ceea184a4 changeset: 30082:bd2ceea184a4 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Mon Feb 09 09:41:12 2015 +0100 summary: [Cancel and Replace] General Bugfix & Booked status for replacement order details: https://code.openbravo.com/erp/devel/main/rev/3f6a5d103ec2 changeset: 30083:3f6a5d103ec2 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Mon Feb 09 18:43:25 2015 +0100 summary: [Cancel and Replace] Display logic bugfix & Payments Creation 1 details: https://code.openbravo.com/erp/devel/main/rev/584f9fe40a7b changeset: 30084:584f9fe40a7b user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Tue Feb 10 13:17:57 2015 +0100 summary: [Cancel and Replace] Payments Creation 2 details: https://code.openbravo.com/erp/devel/main/rev/782cfd159e33 changeset: 30085:782cfd159e33 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Tue Feb 10 17:04:03 2015 +0100 summary: [Cancel and Replace] Shipment Bugfix details: https://code.openbravo.com/erp/devel/main/rev/7a11be799202 changeset: 30086:7a11be799202 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Tue Feb 10 17:49:31 2015 +0100 summary: [Cancel and Replace] Standard Order Document Type modification details: https://code.openbravo.com/erp/devel/main/rev/f5d6ca0c2ce9 changeset: 30087:f5d6ca0c2ce9 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Tue Feb 10 17:53:36 2015 +0100 summary: [Cancel and Replace] Standard Order Document Type modification commented out details: https://code.openbravo.com/erp/devel/main/rev/4cb0ceef0bc6 changeset: 30088:4cb0ceef0bc6 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Tue Feb 10 19:11:10 2015 +0100 summary: [Cancel and Replace] Partial Payments Creation details: https://code.openbravo.com/erp/devel/main/rev/56c1af2d5801 changeset: 30089:56c1af2d5801 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Wed Feb 11 11:05:38 2015 +0100 summary: [Cancel and Replace] Code Review details: https://code.openbravo.com/erp/devel/main/rev/0461cea77faa changeset: 30090:0461cea77faa user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Wed Feb 11 18:54:09 2015 +0100 summary: [Cancel and Replace] Partial Payments Creation 2 details: https://code.openbravo.com/erp/devel/main/rev/7978bc34c4ac changeset: 30091:7978bc34c4ac user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Thu Feb 12 12:58:25 2015 +0100 summary: [Cancel and Replace] General Bugfix details: https://code.openbravo.com/erp/devel/main/rev/2fa7a918b66c changeset: 30092:2fa7a918b66c user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Thu Feb 12 17:52:20 2015 +0100 summary: [Cancel and Replace] Pop Up Remove details: https://code.openbravo.com/erp/devel/main/rev/4b82dd9b2051 changeset: 30093:4b82dd9b2051 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Thu Feb 12 17:56:17 2015 +0100 summary: [Cancel and Replace] Pop Up Remove 2 details: https://code.openbravo.com/erp/devel/main/rev/c5083042901f changeset: 30094:c5083042901f user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Fri Feb 13 10:27:40 2015 +0100 summary: [Cancel and Replace] Payments amount fix details: https://code.openbravo.com/erp/devel/main/rev/eb96b77363fe changeset: 30095:eb96b77363fe user: Guillermo Gil <guillermo.gil <at> openbravo.com> date: Fri Mar 06 13:28:51 2015 +0100 summary: [Cancel and Replace] Set payment amounto to zero details: https://code.openbravo.com/erp/devel/main/rev/c50b5ea7be91 changeset: 30096:c50b5ea7be91 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Tue Apr 14 09:36:26 2015 +0200 summary: [Cancel and Replace] Bugfix details: https://code.openbravo.com/erp/devel/main/rev/994f735e26d7 changeset: 30097:994f735e26d7 user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Wed Apr 15 10:18:10 2015 +0200 summary: [Cancel and Replace] Bugfix 2 details: https://code.openbravo.com/erp/devel/main/rev/c77791e9b186 changeset: 30098:c77791e9b186 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Jul 11 18:08:46 2016 +0200 summary: [Cancel and Replace] Merge from but-dev details: https://code.openbravo.com/erp/devel/main/rev/f8ca8e01f3ff changeset: 30099:f8ca8e01f3ff user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Oct 07 12:03:10 2015 +0200 summary: [Cancel and Replace] New Utils class to implement refactored Confirm Cancel & Replace logic details: https://code.openbravo.com/erp/devel/main/rev/49b2b57ce0ec changeset: 30100:49b2b57ce0ec user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Oct 07 12:14:07 2015 +0200 summary: [Cancel and Replace] Add CancelAndReplaceNoNetShipment property list option details: https://code.openbravo.com/erp/devel/main/rev/d804ce20ed76 changeset: 30101:d804ce20ed76 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Oct 07 12:14:37 2015 +0200 summary: [Cancel and Replace] Add Is cancelled and replaced column to Sales Order details: https://code.openbravo.com/erp/devel/main/rev/63c09a97fbdd changeset: 30102:63c09a97fbdd user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Oct 07 16:22:36 2015 +0200 summary: [Cancel and Replace] Implement netting shipment for new order, dont re-assign old shipment details: https://code.openbravo.com/erp/devel/main/rev/c3b903332251 changeset: 30103:c3b903332251 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Oct 08 20:05:19 2015 +0200 summary: [Cancel and Replace] Implement C&R to be able to call from OrderLoader in Web POS details: https://code.openbravo.com/erp/devel/main/rev/1588125cc4ae changeset: 30104:1588125cc4ae user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Oct 09 09:38:03 2015 +0200 summary: [Cancel and Replace] Set properly delivered quantity to orderlines details: https://code.openbravo.com/erp/devel/main/rev/62c0870a9d3d changeset: 30105:62c0870a9d3d user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Oct 13 10:22:44 2015 +0200 summary: [Cancel and Replace] Refactor in get orderline list method details: https://code.openbravo.com/erp/devel/main/rev/aba11005dee9 changeset: 30106:aba11005dee9 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Oct 13 11:00:34 2015 +0200 summary: [Cancel and Replace] Fix issue with auxiliary input in Oracle details: https://code.openbravo.com/erp/devel/main/rev/67bd23ef644a changeset: 30107:67bd23ef644a user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Oct 14 17:27:26 2015 +0200 summary: [Cancel and replace] Add cancelOrder method to utils details: https://code.openbravo.com/erp/devel/main/rev/b6ba854844f8 changeset: 30108:b6ba854844f8 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Oct 15 16:44:56 2015 +0200 summary: [Cancel and Replace] Pay completely Cancelled order when original order has no payments details: https://code.openbravo.com/erp/devel/main/rev/735f0904506b changeset: 30109:735f0904506b user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Oct 15 18:28:05 2015 +0200 summary: [Cancel and Replace] Display Cancelled and Replaced field in Sales Order details: https://code.openbravo.com/erp/devel/main/rev/79c9391cb918 changeset: 30110:79c9391cb918 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Oct 20 12:50:21 2015 +0200 summary: [Cancel and Replace] show proper messages when cancelling and replacing a Sales Order details: https://code.openbravo.com/erp/devel/main/rev/ba149a0779ba changeset: 30111:ba149a0779ba user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Oct 20 13:03:37 2015 +0200 summary: [Cancel and Replace] Change Cancelled and Replaced column name to Is Cancelled details: https://code.openbravo.com/erp/devel/main/rev/e4830d46880e changeset: 30112:e4830d46880e user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Oct 20 13:23:48 2015 +0200 summary: [Cancel and Replace] Add proper messages details: https://code.openbravo.com/erp/devel/main/rev/3c7d07a6d4a0 changeset: 30113:3c7d07a6d4a0 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Oct 21 16:20:50 2015 +0200 summary: [Cancel and Replace] Fixes and changes in Cancel and Replace utility * Changes to support the functionality in the backend * Changes to support the functionality when using it from Web POS but having triggers disabled details: https://code.openbravo.com/erp/devel/main/rev/d542e92eac47 changeset: 30114:d542e92eac47 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Oct 27 18:47:32 2015 +0100 summary: [Cancel and Replace] Remove duplicated line details: https://code.openbravo.com/erp/devel/main/rev/04c2e05725b3 changeset: 30115:04c2e05725b3 user: Adrián Romero <adrianromero <at> openbravo.com> date: Tue Nov 10 10:20:01 2015 +0100 summary: Fixed cancel and replace layaways creation date. details: https://code.openbravo.com/erp/devel/main/rev/f74977259f3c changeset: 30116:f74977259f3c user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Nov 12 11:51:24 2015 +0100 summary: [Cancel and Replace] The inverse payment must only create one payment schedule detail details: https://code.openbravo.com/erp/devel/main/rev/d651f3f93bce changeset: 30117:d651f3f93bce user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue Dec 15 16:39:50 2015 +0100 summary: [Cancel and Replace] Cancel layaway refactored. Now, cancel layaway creates in backend exactly the same payments created in Web POS. details: https://code.openbravo.com/erp/devel/main/rev/bfdecefeb735 changeset: 30118:bfdecefeb735 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue Dec 15 17:52:57 2015 +0100 summary: [Cancel and Replace] Fixed bug with the payment created to complete the inverse pay. Now the payment is equal to the negative of the outstanding, not the amount. details: https://code.openbravo.com/erp/devel/main/rev/f259d6b3ce9a changeset: 30119:f259d6b3ce9a user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed Dec 23 10:29:19 2015 +0100 summary: [Cancel and Replace] Cancel layaway process implemented for partially delivered. The infraestructure is implemented, but it doesn't work because the partially delivered tickets are not treated correctly in Web POS. details: https://code.openbravo.com/erp/devel/main/rev/a799b2b68a16 changeset: 30120:a799b2b68a16 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Dec 28 13:41:55 2015 +0100 summary: [Cancel and Replace] Get properly negative documentno coming from Web POS details: https://code.openbravo.com/erp/devel/main/rev/d747286f38b2 changeset: 30121:d747286f38b2 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue Jan 12 18:53:41 2016 +0100 summary: [Cancel and Replace] Fixed issue when creating order lines during cancel and replace process. There was an error with negative order's orderlines. details: https://code.openbravo.com/erp/devel/main/rev/19285b2c52da changeset: 30122:19285b2c52da user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed Jan 13 12:19:48 2016 +0100 summary: [Cancel and Replace] Fixed issue with negative order ordered quantity and delivered quantity details: https://code.openbravo.com/erp/devel/main/rev/ed1ac7db249b changeset: 30123:ed1ac7db249b user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Jan 14 18:19:00 2016 +0100 summary: [Cancel and Replace] Inverse order and it transactions now have the cashupId value set details: https://code.openbravo.com/erp/devel/main/rev/0cd1315329fd changeset: 30124:0cd1315329fd user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Jan 14 19:04:19 2016 +0100 summary: [Cancel and Replace] Fixed error with transaction's cashupId attribute when using C&R details: https://code.openbravo.com/erp/devel/main/rev/4aad7415975a changeset: 30125:4aad7415975a user: Asier Martirena <asier.martirena <at> openbravo.com> date: Fri Jan 15 12:08:00 2016 +0100 summary: [Cancel and Replace] Solved problem with dependencies. > Hook created to solve it. details: https://code.openbravo.com/erp/devel/main/rev/464b0192a01f changeset: 30126:464b0192a01f user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Jan 18 18:42:17 2016 +0100 summary: [Cancel and Replace] Fix solved in amount and outstanding amount in cancel layaway details: https://code.openbravo.com/erp/devel/main/rev/a47a30c78618 changeset: 30127:a47a30c78618 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Jan 25 18:19:41 2016 +0100 summary: [Cancel and Replace] Fixed issue with cancel layaway without partial payments details: https://code.openbravo.com/erp/devel/main/rev/8344e88e2e18 changeset: 30128:8344e88e2e18 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Feb 15 19:07:19 2016 +0100 summary: [Cancel and Replace] In C&R process triggers are enabled when processing payments details: https://code.openbravo.com/erp/devel/main/rev/fbcd4a996e37 changeset: 30129:fbcd4a996e37 user: Prakash M <prakash <at> qualiantech.com> date: Wed Mar 23 17:50:35 2016 +0530 summary: Fixes Issue 779 : Created index in order details: https://code.openbravo.com/erp/devel/main/rev/7a5d06c7755e changeset: 30130:7a5d06c7755e user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Apr 04 15:54:47 2016 +0200 summary: [Cancel and Replace] Modified methods calls to not use deprecated methods details: https://code.openbravo.com/erp/devel/main/rev/264f30c234a7 changeset: 30131:264f30c234a7 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Apr 21 13:40:48 2016 +0200 summary: [Cancel and Replace] Backed out changeset 1d9f1d65930b details: https://code.openbravo.com/erp/devel/main/rev/5d49412840f2 changeset: 30132:5d49412840f2 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Fri Apr 22 15:46:45 2016 +0200 summary: Added the possibility to associate shipment lines to the new lines instead of old ones. details: https://code.openbravo.com/erp/devel/main/rev/12e6b89c79c1 changeset: 30133:12e6b89c79c1 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Mon Apr 25 11:58:05 2016 +0200 summary: [Cancel and Replace] Always ensure that reservations are released and created details: https://code.openbravo.com/erp/devel/main/rev/ae62d6affbd0 changeset: 30134:ae62d6affbd0 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 03 12:44:28 2016 +0200 summary: [Cancel And Replace] When creating the final order, if the outstanding is 0 the payments are not set (are set in the invoice) details: https://code.openbravo.com/erp/devel/main/rev/cb9a7760006e changeset: 30135:cb9a7760006e user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 03 13:09:43 2016 +0200 summary: [Cancel and Replace] Fixed errors in CancelAndReplace class. Triggers must be only enabled and disabled if they were previously disabled. 'obposAppCashup' property is only set if the process comes from Web POS details: https://code.openbravo.com/erp/devel/main/rev/d6fbb75aa671 changeset: 30136:d6fbb75aa671 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 03 17:06:53 2016 +0200 summary: [Cancel and Replace] Check if triggers are disabled before enabling them details: https://code.openbravo.com/erp/devel/main/rev/78460cd15bde changeset: 30137:78460cd15bde user: Silambarasan Sekar <silambarasan <at> qualiantech.com> date: Wed May 11 14:21:14 2016 +0530 summary: [Cancel and Replace] Hook for Cancel and Replace Order. details: https://code.openbravo.com/erp/devel/main/rev/5305f3415ca6 changeset: 30138:5305f3415ca6 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 17 13:08:54 2016 +0200 summary: [Cancel and Replace] The amount of the new detais must be the amount of the old details, not the amount of the old payment details: https://code.openbravo.com/erp/devel/main/rev/06f6b2e9f583 changeset: 30139:06f6b2e9f583 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 17 18:28:48 2016 +0200 summary: [Cancel and Replace] In C&R, the paid amount in the new ticket is set in only one payment detail, even if there are multiple details details: https://code.openbravo.com/erp/devel/main/rev/d930ed86f90b changeset: 30140:d930ed86f90b user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed May 18 11:36:19 2016 +0200 summary: [Cancel and Replace] Removed code that works with transactions. Those transactions doesn't exist, because the payment of amount 0 doesn't generate transactions details: https://code.openbravo.com/erp/devel/main/rev/e17e11c41d7e changeset: 30141:e17e11c41d7e user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed May 18 12:19:34 2016 +0200 summary: [Cancel and Replace] When loading the payment schedule details, select only those that have payment detail details: https://code.openbravo.com/erp/devel/main/rev/fb0458c40e49 changeset: 30142:fb0458c40e49 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed May 18 12:56:28 2016 +0200 summary: [Cancel and Replace] The discounts of the original order are copied in the new order details: https://code.openbravo.com/erp/devel/main/rev/27ad2f485fe9 changeset: 30143:27ad2f485fe9 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Fri May 20 09:33:30 2016 +0200 summary: [Cancel and Replace] Modified hook to add new parameter details: https://code.openbravo.com/erp/devel/main/rev/57cb9df4fd5a changeset: 30144:57cb9df4fd5a user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed May 25 11:06:40 2016 +0200 summary: [Cancel and Replace] Fixed problem with reservation. A reservation mustn't be created if the delivered amount is the total amount. details: https://code.openbravo.com/erp/devel/main/rev/2c7769b7da69 changeset: 30145:2c7769b7da69 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu May 26 13:20:22 2016 +0200 summary: [Cancel & Replace] In C&R, the inverse order must have discounts with negative sign details: https://code.openbravo.com/erp/devel/main/rev/c458800a56aa changeset: 30146:c458800a56aa user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon May 30 16:21:24 2016 +0200 summary: [Cancel & Replace] Add inverseOrder and jsonorder as parameters to cancel and replace hook details: https://code.openbravo.com/erp/devel/main/rev/d5a0ee3467f3 changeset: 30147:d5a0ee3467f3 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Jun 06 18:33:22 2016 +0200 summary: [Cancel and Replace] The inverse order must have the avtive user in 'createdBy' field details: https://code.openbravo.com/erp/devel/main/rev/037f595a6719 changeset: 30148:037f595a6719 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Jun 13 15:27:36 2016 +0200 summary: [Cancel Layaway] Create new payments only if outstanding amount is not Zero details: https://code.openbravo.com/erp/devel/main/rev/b104c71adea2 changeset: 30149:b104c71adea2 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Jun 14 10:04:48 2016 +0200 summary: [Cancel and Replace] Add Replacement Order field in Sales Order window details: https://code.openbravo.com/erp/devel/main/rev/cc3b144e6bf1 changeset: 30150:cc3b144e6bf1 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Jun 16 17:44:02 2016 +0200 summary: [Cancel and Replace] Fix issue where creating reservations for the new order When new lines are created for a not fully paid layaway, the delivered quantity is still null so it should be taken into account details: https://code.openbravo.com/erp/devel/main/rev/848cd7591a5c changeset: 30151:848cd7591a5c user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Jun 27 12:50:37 2016 +0200 summary: [Cancel and Replace] Fixed problems when doing a cancel and replace in backend. The financial account and was not correctly taken. In C&R, the finishOrderPayments method mustn't be called if previously was any paymentScheduleDetail details: https://code.openbravo.com/erp/devel/main/rev/ea3862df750d changeset: 30152:ea3862df750d user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Jul 11 18:39:35 2016 +0200 summary: [Cancel and Replace] Remove duplicated code details: https://code.openbravo.com/erp/devel/main/rev/3b59fa380d58 changeset: 30153:3b59fa380d58 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Jun 27 16:09:24 2016 +0200 summary: [Cancel and Replace] Code cleaned details: https://code.openbravo.com/erp/devel/main/rev/11eabd171378 changeset: 30154:11eabd171378 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue Jun 28 12:08:17 2016 +0200 summary: [Cancel and Replace] When doing a C&R, the new documents generated doesn't use the sequence to calculate the docNo details: https://code.openbravo.com/erp/devel/main/rev/714ed6c659fc changeset: 30155:714ed6c659fc user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Jun 29 11:47:02 2016 +0200 summary: [Cancel and Replace] Log an error in the log file details: https://code.openbravo.com/erp/devel/main/rev/e1ca4fac9c42 changeset: 30156:e1ca4fac9c42 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Jun 30 09:52:02 2016 +0200 summary: [Cancel and Replace] In Sales Order/Invoice, Financial Account and Payment Method are not shown for details with payment of quantity 0. Also, in cancelled orders, the delivery status is shown as 0% for cancelled orders. details: https://code.openbravo.com/erp/devel/main/rev/8bb68e09085f changeset: 30157:8bb68e09085f user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Jun 30 12:42:23 2016 +0200 summary: [Cancel and Replace] New event handler to change the documentNo for payments of amount 0. Also compilation problems solved. details: https://code.openbravo.com/erp/devel/main/rev/756e9efde895 changeset: 30158:756e9efde895 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Jul 11 18:59:36 2016 +0200 summary: [Cancel and Replace] Fixed error generated during the merge details: https://code.openbravo.com/erp/devel/main/rev/0a38193ac37a changeset: 30159:0a38193ac37a user: Asier Martirena <asier.martirena <at> openbravo.com> date: Fri Jul 15 14:26:46 2016 +0200 summary: [Cancel and Replace] Solved problems with to pass try. Data needed to be exported details: https://code.openbravo.com/erp/devel/main/rev/94133ddd6100 changeset: 30160:94133ddd6100 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Fri Jul 15 15:07:05 2016 +0200 summary: [Cancel and Replace] Fixed problem with the negative document number taken from POS details: https://code.openbravo.com/erp/devel/main/rev/c7ef6e6466d8 changeset: 30161:c7ef6e6466d8 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Jul 21 10:39:39 2016 +0200 summary: [Cancel and Replace] Inverse order doesn't have to store the time in orderered date details: https://code.openbravo.com/erp/devel/main/rev/3b22c5a9d0db changeset: 30162:3b22c5a9d0db user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Jul 21 15:45:46 2016 +0200 summary: [Cancel and Replace] Fixed problem that used to set *R* twice to some netting payments details: https://code.openbravo.com/erp/devel/main/rev/19c3c4d02cd4 changeset: 30163:19c3c4d02cd4 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Jul 21 15:49:20 2016 +0200 summary: [Cancel and Replace] License added to FINPaymentEventHandler.java class details: https://code.openbravo.com/erp/devel/main/rev/fdcf66a76c82 changeset: 30164:fdcf66a76c82 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue Jul 26 16:45:36 2016 +0200 summary: [Cancel and Replace] The default payment type is taken using directly the setDefaultType method, not from the json details: https://code.openbravo.com/erp/devel/main/rev/e69e48966ff3 changeset: 30165:e69e48966ff3 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue Jul 26 16:47:06 2016 +0200 summary: [Cancel and Replace] Changes in AD_Column after doing a Synchronize terminologies details: https://code.openbravo.com/erp/devel/main/rev/e28151334fc9 changeset: 30166:e28151334fc9 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue Jul 26 19:03:01 2016 +0200 summary: [Cancel and Replace] Backed out changeset fdcf66a76c82 details: https://code.openbravo.com/erp/devel/main/rev/7709d539903a changeset: 30167:7709d539903a user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue Jul 26 19:07:17 2016 +0200 summary: [Cancel and Replace] 'Cancel and Replace' and 'Confirm Cancel and Replace' are now Standard Definition process, not Manual processes details: https://code.openbravo.com/erp/devel/main/rev/d3ff08290cb1 changeset: 30168:d3ff08290cb1 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed Jul 27 08:45:32 2016 +0200 summary: [Cancel and Replace] Changed 'Cancelled' for 'Canceled' in elements and messages details: https://code.openbravo.com/erp/devel/main/rev/3c6f8127288e changeset: 30169:3c6f8127288e user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed Jul 27 09:36:15 2016 +0200 summary: [Cancel and Replace] Fixed problem with inverse orders delivery and invoice status. The delivery and invoice status must be 0. details: https://code.openbravo.com/erp/devel/main/rev/5d61bf959c1d changeset: 30170:5d61bf959c1d user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed Jul 27 13:47:34 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/272fe3caf900 changeset: 30171:272fe3caf900 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Jul 28 10:21:04 2016 +0200 summary: [Cancel and Replace] Commit done to pass try details: https://code.openbravo.com/erp/devel/main/rev/7c2c817cd9d6 changeset: 30172:7c2c817cd9d6 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Aug 01 09:42:23 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/8d94d526638b changeset: 30173:8d94d526638b user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Aug 04 09:36:04 2016 +0200 summary: Remove rollback and close from Cancel and Replace Utils Another fix: When creating material transaction lines for netting shipment in cancelAndReplaceOrder method, when the product has an attribute set and 'Is Required at Least One Value' property of the attribute set is 'Y' set a fake AttributeSetInstance to avoid an error thrown in the trigger details: https://code.openbravo.com/erp/devel/main/rev/c13fb6245d8b changeset: 30174:c13fb6245d8b user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Aug 09 09:09:06 2016 +0200 summary: [Cancel and Replace] Add createReplacementOrder method in CancelAndReplaceUtils.java details: https://code.openbravo.com/erp/devel/main/rev/2a8b2f94f5f4 changeset: 30175:2a8b2f94f5f4 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 10 13:50:27 2016 +0200 summary: [Cancel and Replace] Fix some fields names and positions details: https://code.openbravo.com/erp/devel/main/rev/6b9a8cf77abe changeset: 30176:6b9a8cf77abe user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 10 13:51:22 2016 +0200 summary: [Cancel and Replace] Don't allow to change order lines qty of cancellation orders when originals are delivered details: https://code.openbravo.com/erp/devel/main/rev/7ff6131056ab changeset: 30177:7ff6131056ab user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Aug 11 10:27:58 2016 +0200 summary: [Cancel and Replace] Execute CancelAndReplaceUtils.cancelAndReplaceOrder in admin mode details: https://code.openbravo.com/erp/devel/main/rev/bb5335459128 changeset: 30178:bb5335459128 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Aug 12 10:48:52 2016 +0200 summary: [Cancel and Replace] Only remove *R* from no Zero payments to those that have *R* at the end details: https://code.openbravo.com/erp/devel/main/rev/13bee550ccc4 changeset: 30179:13bee550ccc4 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 17 09:09:00 2016 +0200 summary: [Cancel Replace] Refactor createPayments to simplify code Also changes to attend payment schedule details summed amounts instead of payment schedule amounts in order to take into account payments 'Awaiting Execution' details: https://code.openbravo.com/erp/devel/main/rev/2a66aa403b86 changeset: 30180:2a66aa403b86 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Fri Aug 19 09:13:04 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/7730f521339b changeset: 30181:7730f521339b user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Aug 18 16:58:19 2016 +0200 summary: [Cancel and Replace] Add a validation to avoid executing Cancel and Replace for POS and Warehouse Orders details: https://code.openbravo.com/erp/devel/main/rev/2aad0ac150ad changeset: 30182:2aad0ac150ad user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Aug 19 09:48:45 2016 +0200 summary: [Cancel and Replace] remove setMaxResults(1) details: https://code.openbravo.com/erp/devel/main/rev/c9f8cf762a75 changeset: 30183:c9f8cf762a75 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Aug 22 13:34:30 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/e8ef5dd50e27 changeset: 30184:e8ef5dd50e27 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Aug 22 14:52:08 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/99610d6f6c0e changeset: 30185:99610d6f6c0e user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 24 14:14:33 2016 +0200 summary: [Cancel and Replace] Fixed issue when Associating old shipment to new receipt details: https://code.openbravo.com/erp/devel/main/rev/4a59c9b49600 changeset: 30186:4a59c9b49600 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 24 14:18:18 2016 +0200 summary: [Cancel and Replace] Add Cancel and Replace JUnit tests details: https://code.openbravo.com/erp/devel/main/rev/eff5490a5bcd changeset: 30187:eff5490a5bcd user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed Aug 24 14:40:35 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/8e0c951b08ba changeset: 30188:8e0c951b08ba user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed Aug 24 15:21:35 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/d432187ea304 changeset: 30189:d432187ea304 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Aug 25 10:57:37 2016 +0200 summary: [Cancel and Replace] Fixed problem when moving shipments from orders when using Web POS. The delivered quantity is updated in OrderLoader class. details: https://code.openbravo.com/erp/devel/main/rev/eb1c2b099970 changeset: 30190:eb1c2b099970 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Aug 25 11:55:19 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/84e5a0648338 changeset: 30191:84e5a0648338 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Fri Aug 26 18:28:45 2016 +0200 summary: [Cancel and Replace] Fixed error with the netting payments documentNo details: https://code.openbravo.com/erp/devel/main/rev/bbc966959235 changeset: 30192:bbc966959235 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Fri Aug 26 18:29:50 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/e34fdcb1b6d9 changeset: 30193:e34fdcb1b6d9 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Aug 29 08:51:12 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/e3d66eaa40b5 changeset: 30194:e3d66eaa40b5 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Aug 29 09:04:52 2016 +0200 summary: [Cancel and Replace] Replace OrderLineEventHandler with Client Event Handler Action details: https://code.openbravo.com/erp/devel/main/rev/e1953b2dd6ed changeset: 30195:e1953b2dd6ed user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Aug 29 09:40:23 2016 +0200 summary: [Cancel and Replace] Display Cancel and Replace and Confirm Cancel and Replace button only fo Standard Orders details: https://code.openbravo.com/erp/devel/main/rev/5203d3155da4 changeset: 30196:5203d3155da4 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Aug 29 10:09:19 2016 +0200 summary: [Cancel and Replace] Set as Read Only some fields when cancelling a Sales Order details: https://code.openbravo.com/erp/devel/main/rev/713fe4f1659e changeset: 30197:713fe4f1659e user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Aug 29 13:05:17 2016 +0200 summary: [Cancel and Replace] Remove unnecessary AD_ELEMENT's details: https://code.openbravo.com/erp/devel/main/rev/253b82cd1db9 changeset: 30198:253b82cd1db9 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Aug 29 15:13:16 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/60f9bd7c00f4 changeset: 30199:60f9bd7c00f4 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Aug 30 09:00:49 2016 +0200 summary: [Cancel and Replace] Remove duplicated FIN_Utility.getFinancialAccountPaymentMethodByOrganization method details: https://code.openbravo.com/erp/devel/main/rev/0b793413852a changeset: 30200:0b793413852a user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Aug 30 15:26:43 2016 +0200 summary: [Cancel and Replace] Remove some foreign keys to avoid performance issues when deleting records Foreign keys from C_ORDER and C_ORDERLINE tables have been deleted to avoid performance issues. New checks have been added in C_ORDER and C_ORDERLINE triggers to maintain database consistency details: https://code.openbravo.com/erp/devel/main/rev/f3cfbd269dc5 changeset: 30201:f3cfbd269dc5 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Aug 30 15:54:04 2016 +0200 summary: [Cancel and Replace] Several Name, Description and Help texts improved details: https://code.openbravo.com/erp/devel/main/rev/4745c197439e changeset: 30202:4745c197439e user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Aug 30 15:57:24 2016 +0200 summary: [Cancel and Replace] Remove eclipse warning details: https://code.openbravo.com/erp/devel/main/rev/fd616a12abab changeset: 30203:fd616a12abab user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Aug 30 16:20:18 2016 +0200 summary: [Cancel and Replace] Little fix on C_ORDLINE_CHK_RESTRICTIONS_TRG details: https://code.openbravo.com/erp/devel/main/rev/ce37c8af9fe3 changeset: 30204:ce37c8af9fe3 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Aug 30 16:27:15 2016 +0200 summary: [Cancel and Replace] Some comments improved details: https://code.openbravo.com/erp/devel/main/rev/09b96e6059af changeset: 30205:09b96e6059af user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Aug 30 16:29:08 2016 +0200 summary: [Cancel and Replace] Copyright of several files updated details: https://code.openbravo.com/erp/devel/main/rev/c15d6819ca4c changeset: 30206:c15d6819ca4c user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 08:23:05 2016 +0200 summary: [Cancel and Replace] Use global variable cancelLayawayPaymentsHook in CancelLayawayPaymentsHookCaller details: https://code.openbravo.com/erp/devel/main/rev/0c5b207378db changeset: 30207:0c5b207378db user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 08:39:37 2016 +0200 summary: [Cancel and Replace] Make protected executeHooks method private inside CancelAndReplaceOrderHookCaller details: https://code.openbravo.com/erp/devel/main/rev/6d5abe8a700e changeset: 30208:6d5abe8a700e user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 08:42:17 2016 +0200 summary: [Cancel and Replace] Backout 713fe4f1659e revision. Breaks dbconsistency details: https://code.openbravo.com/erp/devel/main/rev/c42ad5f0b1cc changeset: 30209:c42ad5f0b1cc user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 09:52:23 2016 +0200 summary: [Cancel and Replace] Add missing javadoc details: https://code.openbravo.com/erp/devel/main/rev/53b73dcf8ded changeset: 30210:53b73dcf8ded user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed Aug 31 10:05:34 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/3fc4611be35a changeset: 30211:3fc4611be35a user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 10:04:43 2016 +0200 summary: [Cancel and Replace] Declare *R* String used in inverse sales orders documentno as constant details: https://code.openbravo.com/erp/devel/main/rev/c2c85ba96b34 changeset: 30212:c2c85ba96b34 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 11:35:51 2016 +0200 summary: [Cancel and Replace] Fixes in FinPaymentEventHandler 1) Remove duplicated code 2) If the new document number size is greater than 30, truncate it to 30 characters details: https://code.openbravo.com/erp/devel/main/rev/6791f83048e6 changeset: 30213:6791f83048e6 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 12:09:45 2016 +0200 summary: [Cancel and Replace] Remove unnecessary global variables details: https://code.openbravo.com/erp/devel/main/rev/51787c6ceca7 changeset: 30214:51787c6ceca7 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 12:19:06 2016 +0200 summary: [Cancel and Replace] Instanciate BigDecimal with String details: https://code.openbravo.com/erp/devel/main/rev/c56253a63eac changeset: 30215:c56253a63eac user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed Aug 31 13:31:37 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/ff5c49dd5e58 changeset: 30216:ff5c49dd5e58 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 14:30:35 2016 +0200 summary: [Cancel and Replace] Clear session each time a Scroller is used details: https://code.openbravo.com/erp/devel/main/rev/d7e1d5ad6b8c changeset: 30217:d7e1d5ad6b8c user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 15:09:11 2016 +0200 summary: [Cancel and Replace] Add missing javadocs details: https://code.openbravo.com/erp/devel/main/rev/a24c50ba4775 changeset: 30218:a24c50ba4775 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 15:19:00 2016 +0200 summary: [Cancel and Replace] Make some methods private in CancelAndReplaceUtils utils method details: https://code.openbravo.com/erp/devel/main/rev/5c79923a1520 changeset: 30219:5c79923a1520 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 15:23:03 2016 +0200 summary: [Cancel and Replace] Fixed a mistake details: https://code.openbravo.com/erp/devel/main/rev/44132b160e7e changeset: 30220:44132b160e7e user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 15:40:49 2016 +0200 summary: [Cancel and Replace] Get cancel and replace preferences values outside order lines loop and extract them to separate methods details: https://code.openbravo.com/erp/devel/main/rev/04f2ce4b40c7 changeset: 30221:04f2ce4b40c7 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Aug 31 15:49:27 2016 +0200 summary: [Cancel and Replace] Remove duplicated code details: https://code.openbravo.com/erp/devel/main/rev/c9b74a2ed01f changeset: 30222:c9b74a2ed01f user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 08:20:39 2016 +0200 summary: [Cancel and Replace] Added sampledata details: https://code.openbravo.com/erp/devel/main/rev/c97fe266d7ad changeset: 30223:c97fe266d7ad user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 08:28:37 2016 +0200 summary: [Cancel and Replace] Added Sampledata for Cancel and Replace automated tests details: https://code.openbravo.com/erp/devel/main/rev/a4d6398d7ec9 changeset: 30224:a4d6398d7ec9 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 09:01:54 2016 +0200 summary: [Cancel and Replace] Change some method's name to be more clear details: https://code.openbravo.com/erp/devel/main/rev/355a237afcc3 changeset: 30225:355a237afcc3 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 09:41:05 2016 +0200 summary: [Cancel and Replace] Refactor a query using scrollable results details: https://code.openbravo.com/erp/devel/main/rev/ef2490df80c3 changeset: 30226:ef2490df80c3 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 10:01:04 2016 +0200 summary: [Cancel and Replace] Obtain properly document type for Netting Shipment details: https://code.openbravo.com/erp/devel/main/rev/288ed51d164c changeset: 30227:288ed51d164c user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 10:08:02 2016 +0200 summary: [Cancel and Replace] Remove unnecessary params on some methods details: https://code.openbravo.com/erp/devel/main/rev/991ad1af1930 changeset: 30228:991ad1af1930 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 10:21:01 2016 +0200 summary: [Cancel and replace] Add missing javadoc. Don't pass an unnecessary parameter. Declare inside method details: https://code.openbravo.com/erp/devel/main/rev/9ae030b3a26b changeset: 30229:9ae030b3a26b user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 10:39:15 2016 +0200 summary: [Cancel and Replace] Split processShipment method in to two processes and add javadoc details: https://code.openbravo.com/erp/devel/main/rev/1c70775f7b8f changeset: 30230:1c70775f7b8f user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 10:52:46 2016 +0200 summary: [Cancel and Replace] create getPaymentScheduleOfOrder method and remove duplicated code details: https://code.openbravo.com/erp/devel/main/rev/86efa040514e changeset: 30231:86efa040514e user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Sep 01 11:03:40 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/ff72f72ce4bb changeset: 30232:ff72f72ce4bb user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 11:52:15 2016 +0200 summary: [Cancel and Replace] Fix issue in C_ORDER and C_ORDERLINE triggers validations details: https://code.openbravo.com/erp/devel/main/rev/839c6f978120 changeset: 30233:839c6f978120 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 12:13:35 2016 +0200 summary: [Cancel and Replace] Come changes in createPayments functionality 1) Truncate properly payments description to columns size. 2) give proper name and documentation to createPayment method. 3) Rename some confusing variables. details: https://code.openbravo.com/erp/devel/main/rev/fd8cf4da14bc changeset: 30234:fd8cf4da14bc user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 12:24:11 2016 +0200 summary: [Cancel and Replace] Code review changes 1) Set proper method name to getOrderDocumentNoLabel. 2) Remove getDocumentNo method from cancelandreplaceutils class and use directly FIN_Utility getDocumentNo method. 3) Add some constants details: https://code.openbravo.com/erp/devel/main/rev/1d2c9b256176 changeset: 30235:1d2c9b256176 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Sep 01 12:51:17 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/d9630f628990 changeset: 30236:d9630f628990 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 13:09:45 2016 +0200 summary: [Cancel and Replace] Code review for reservations flow 1) Attend to 'Enable Stock Reservations' preference when checking reservations for order lines. 2) Remove duplicated code adding a new private method. details: https://code.openbravo.com/erp/devel/main/rev/8bf919cbf6a1 changeset: 30237:8bf919cbf6a1 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu Sep 01 15:13:58 2016 +0200 summary: [Cancel and Replace] C_DocTypeTarget_ID parameter must be blank if has not value, not null details: https://code.openbravo.com/erp/devel/main/rev/4b5f4e708df5 changeset: 30238:4b5f4e708df5 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 15:20:17 2016 +0200 summary: [Cancel and Replace] Fix issue while setting truncated description details: https://code.openbravo.com/erp/devel/main/rev/7c475bad4b85 changeset: 30239:7c475bad4b85 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 16:01:26 2016 +0200 summary: [Cancel and Replace] Fixed Sample Data details: https://code.openbravo.com/erp/devel/main/rev/cd072aa9d0f9 changeset: 30240:cd072aa9d0f9 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 16:46:29 2016 +0200 summary: [Cancel and Replace] While querying for pending amount to pay in Old Order filter by those records without payment detail details: https://code.openbravo.com/erp/devel/main/rev/dbfccc6b1149 changeset: 30241:dbfccc6b1149 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 01 18:52:07 2016 +0200 summary: [Cancel and Replace] Use ReservationUtils.processReserve method close old order reservations details: https://code.openbravo.com/erp/devel/main/rev/538882225ee8 changeset: 30242:538882225ee8 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Sep 02 08:25:23 2016 +0200 summary: [Cancel and Replace] Create new reservations only if replacement order exists details: https://code.openbravo.com/erp/devel/main/rev/0529b1eb6c54 changeset: 30243:0529b1eb6c54 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Sep 02 09:41:19 2016 +0200 summary: [Cancel and Replace] Remove useless paramaters of a method details: https://code.openbravo.com/erp/devel/main/rev/3591bc51593c changeset: 30244:3591bc51593c user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Sep 02 09:45:57 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/315c875a933e changeset: 30245:315c875a933e user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Sep 02 11:19:46 2016 +0200 summary: [Cancel and Replace] Get payment method and financial account coming from Web POS as Strings details: https://code.openbravo.com/erp/devel/main/rev/af626901b1b3 changeset: 30246:af626901b1b3 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Sep 02 12:29:53 2016 +0200 summary: [Cancel and Replace] Fix equals instruction. Compare strings instead objects details: https://code.openbravo.com/erp/devel/main/rev/7d55eb789ecd changeset: 30247:7d55eb789ecd user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Sep 02 14:12:19 2016 +0200 summary: [Cancel and Replace] Skip discount type lines when creating replacement order details: https://code.openbravo.com/erp/devel/main/rev/8b8d370ee8c9 changeset: 30248:8b8d370ee8c9 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Sep 05 10:22:20 2016 +0200 summary: [Cancel and Replace] Fixed issue while creating payment schedule detail. Add correct amount details: https://code.openbravo.com/erp/devel/main/rev/45f39d9f546d changeset: 30249:45f39d9f546d user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Sep 05 10:32:50 2016 +0200 summary: [Cancel and Replace] Add missing Business Partner in payment schedule details for netting payment+ details: https://code.openbravo.com/erp/devel/main/rev/d57b4e9bc1f2 changeset: 30250:d57b4e9bc1f2 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Sep 05 10:36:45 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/87f9d2e67a8e changeset: 30251:87f9d2e67a8e user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Sep 05 11:51:18 2016 +0200 summary: [Cancel and Replace] Remove unnecessary OBDal.getInstance().flush() details: https://code.openbravo.com/erp/devel/main/rev/2d9193c28f62 changeset: 30252:2d9193c28f62 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Sep 05 13:01:25 2016 +0200 summary: [Cancel and Replace] Remove commented lines details: https://code.openbravo.com/erp/devel/main/rev/5594b0ee5442 changeset: 30253:5594b0ee5442 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Sep 05 13:14:48 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/bce7b3a4d6e7 changeset: 30254:bce7b3a4d6e7 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Sep 05 18:28:26 2016 +0200 summary: [Cancel and Replace] Make messages translatable details: https://code.openbravo.com/erp/devel/main/rev/0602a7eb74cf changeset: 30255:0602a7eb74cf user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Sep 05 18:32:29 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/74542b62a4e3 changeset: 30256:74542b62a4e3 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Sep 06 08:30:20 2016 +0200 summary: [Cancel and Replace] Skip some foreign key validations in export database details: https://code.openbravo.com/erp/devel/main/rev/4a1b924db03f changeset: 30257:4a1b924db03f user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Sep 06 08:30:35 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/53113109915c changeset: 30258:53113109915c user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Sep 06 08:36:05 2016 +0200 summary: [Cancel and Replace] Fix a mistake details: https://code.openbravo.com/erp/devel/main/rev/b088f2b2644a changeset: 30259:b088f2b2644a user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Sep 07 08:48:08 2016 +0200 summary: [Cancel and Replace] Added two new columns in FIN_PAYMENT_DETAIL_V with corresponding fields This two new columns will display the financial account and the payment method of the payment. If the total amount of the payment is 0, the column will be empty details: https://code.openbravo.com/erp/devel/main/rev/a117f3a06513 changeset: 30260:a117f3a06513 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Sep 07 09:38:27 2016 +0200 summary: [Cancel and Replace] Removed Openbravo @author details: https://code.openbravo.com/erp/devel/main/rev/2fa6be699ee2 changeset: 30261:2fa6be699ee2 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Sep 07 09:43:11 2016 +0200 summary: [Cancel and Replace] Don't clear session in the first iteration with scrollable results details: https://code.openbravo.com/erp/devel/main/rev/f53651bee383 changeset: 30262:f53651bee383 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Sep 07 09:48:11 2016 +0200 summary: [Cancel and Replace] Fix on ad_message details: https://code.openbravo.com/erp/devel/main/rev/b195855d734d changeset: 30263:b195855d734d user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Sep 07 09:52:04 2016 +0200 summary: [Cancel and Replace] Use constant variable for a Material Shipment docbasetype details: https://code.openbravo.com/erp/devel/main/rev/0f139a773295 changeset: 30264:0f139a773295 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Sep 07 09:57:37 2016 +0200 summary: [Cancel and Replace] Comment added details: https://code.openbravo.com/erp/devel/main/rev/72025462e80d changeset: 30265:72025462e80d user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Sep 07 10:16:22 2016 +0200 summary: [Cancel and Replace] Fix on C_ORDLINE_CHK_RESTRICTIONS_TRG.xml. Avoid executing a query in some cases details: https://code.openbravo.com/erp/devel/main/rev/bc1ce4e09644 changeset: 30266:bc1ce4e09644 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Sep 07 10:52:45 2016 +0200 summary: [Cancel and Replace] Added a method to add foreign keys to be exluced in export.database validation details: https://code.openbravo.com/erp/devel/main/rev/405ad499f32d changeset: 30267:405ad499f32d user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Sep 07 11:14:25 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/f3fcd073456d changeset: 30268:f3fcd073456d user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Sep 07 17:09:09 2016 +0200 summary: [Cancel and Replace] Fix issue with cancel and replace document numbers details: https://code.openbravo.com/erp/devel/main/rev/c7d899bdacdb changeset: 30269:c7d899bdacdb user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 08 12:32:10 2016 +0200 summary: [Cancel and Replace] Set *R* to payments of Amount 0 if credit used is also 0 details: https://code.openbravo.com/erp/devel/main/rev/eb09ce840ba8 changeset: 30270:eb09ce840ba8 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 08 18:08:14 2016 +0200 summary: [Cancel and Replace] Deliver in new order what it was delivered in old order if there are no cancel and replace prefs active details: https://code.openbravo.com/erp/devel/main/rev/066303859ed9 changeset: 30271:066303859ed9 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 08 19:27:47 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/ae88fb35da90 changeset: 30272:ae88fb35da90 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Sep 09 12:26:56 2016 +0200 summary: [Cancel and Replace] Fix issue with discounts details: https://code.openbravo.com/erp/devel/main/rev/65da5ec35951 changeset: 30273:65da5ec35951 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Sep 09 12:31:30 2016 +0200 summary: [Cancel and Replace] Don't display cancellation orders (*R*) in Copy from Order orders popupç details: https://code.openbravo.com/erp/devel/main/rev/460fafd21833 changeset: 30274:460fafd21833 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Sep 09 13:25:43 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/42eb34c09327 changeset: 30275:42eb34c09327 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Sep 09 17:53:31 2016 +0200 summary: [Cancel and Replace] Don't create unnecessary payment schedule detail for paid original order details: https://code.openbravo.com/erp/devel/main/rev/42beaa7d0581 changeset: 30276:42beaa7d0581 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Sep 09 18:38:39 2016 +0200 summary: [Cancel and Replace] Refactor createOrUdpatePayment method to remove duplicated code details: https://code.openbravo.com/erp/devel/main/rev/7277b6cfab26 changeset: 30277:7277b6cfab26 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Sun Sep 11 16:25:27 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/54b63a6b9bcc changeset: 30278:54b63a6b9bcc user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Sep 12 19:25:38 2016 +0200 summary: [Cancel and Replace] Don't display cancellation orders in Create Lines From Form neither in Create Invoices from Orders details: https://code.openbravo.com/erp/devel/main/rev/37cd5003aae8 changeset: 30279:37cd5003aae8 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Sep 13 08:26:30 2016 +0200 summary: [Cancel and Replace] Merge from PI details: https://code.openbravo.com/erp/devel/main/rev/54c6eaa4b993 changeset: 30280:54c6eaa4b993 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Sep 13 12:10:11 2016 +0200 summary: [Cancel and Replace] Backout 54b63a6b9bcc revision details: https://code.openbravo.com/erp/devel/main/rev/f9a877cdb7bc changeset: 30281:f9a877cdb7bc user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Sep 13 13:45:49 2016 +0200 summary: [Cancel and Replace] Fix issue while original order is delivered in more than one shipment details: https://code.openbravo.com/erp/devel/main/rev/51a0be490987 changeset: 30282:51a0be490987 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Sep 13 13:46:21 2016 +0200 summary: [Cancel and Replace] Set Invoiced Quantity of inverse order line to Zero details: https://code.openbravo.com/erp/devel/main/rev/3e02893034f8 changeset: 30283:3e02893034f8 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Sep 13 17:56:23 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/b8330d5d42a0 changeset: 30284:b8330d5d42a0 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Sep 14 13:36:49 2016 +0200 summary: [Cancel and Replace] Don't create automatically reservations for new order in Openbravo backend details: https://code.openbravo.com/erp/devel/main/rev/095e4ff887b5 changeset: 30285:095e4ff887b5 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Sep 14 13:37:45 2016 +0200 summary: [Cancel and Replace] Add 'Enable Cancel and Replace' preference in order to activate C&R in Openbravo backend details: https://code.openbravo.com/erp/devel/main/rev/df28f074cc4a changeset: 30286:df28f074cc4a user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Sep 15 16:56:55 2016 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/main/rev/e5fb94b24cfc changeset: 30287:e5fb94b24cfc user: Atul Gaware <atul.gaware <at> openbravo.com> date: Wed Sep 14 15:36:20 2016 +0530 summary: Fixes issue 33859: Wrong Total Gross Amount in orders and invoices Wrong Total Gross Amount in orders and invoices as the changes made in tax tab records do not recalculate it. For Purchase Order and Sales Order, Tax tab is made read only so only record are created, modified and deleted only through order lines. Manual insertion, updation and deletion is not possible. In case of Sales Invoice and Purchase Invoices, records created by invoice line are marked with recalculate flag = Yes. Read Only logic based on this flag does not allow user to modify fields tax, tax amount and taxable amount of invoice tax records. Event handler restricts user to delete invoice tax records with recalculate flag = Yes. To avoid event handlers interference with ReorderCascadingChildDeletionsHandler.java, on Invoice deletetion, before deleting invoice tax records, flag recalculate is set = No details: https://code.openbravo.com/erp/devel/main/rev/df9155c88ab2 changeset: 30288:df9155c88ab2 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Sep 08 16:36:16 2016 +0200 summary: Fixes Issue 24191. Improves performance for Accounting Background Process. Adds Index in FIN_FINACC_TRANSACTION Table. Modifies query in AcctServer_data to properly limit the results returned. Modifies query in AcctServer_data to remove the order clause. Persist information about Accounting Schemas in Java code so it is no longer necessary to access the Database everytime to retrive that information. details: https://code.openbravo.com/erp/devel/main/rev/682415bc0aa9 changeset: 30289:682415bc0aa9 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue Sep 13 18:24:02 2016 +0200 summary: Related to issue 24191: Code review improvements - Move AcctSchemaStructureProvider.java to same folder as OrganizationStructureProvider.java. - Rename acctSchemaSP variable to acctSchemaProvider in OBContext.java. - Remove unused data variable in AcctSchema.java. - Add commentary to explain why we send limit manually to xsql query in AcctServer.java. - Do not send numberRegisters parameter to AcctServerData.select as we are already sending the limit. - Undo changes in AcctServerData.periodOpen method and create new AcctServerData.selectPeriodOpen method to avoid a functional API change. details: https://code.openbravo.com/erp/devel/main/rev/09f464ff5bde changeset: 30290:09f464ff5bde user: Mark <markmm82 <at> gmail.com> date: Tue Sep 13 11:43:16 2016 -0400 summary: Fixes issue 33879: Avoid error when closing reservation from Stock Reservation Avoided exception when the quantity of reservation stock lines have null value. When the ManageReservationActionHandler processed the stock reservation it stores the realesed quantity with ZERO value instead of null. details: https://code.openbravo.com/erp/devel/main/rev/61036197bbae changeset: 30291:61036197bbae user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Thu Sep 15 14:04:47 2016 +0200 summary: Related to issue 33879: Code review improvements details: https://code.openbravo.com/erp/devel/main/rev/676e26599466 changeset: 30292:676e26599466 user: Mark <markmm82 <at> gmail.com> date: Thu Sep 15 12:14:10 2016 -0400 summary: Fixes issue 33838: Correct Stock Reservation when created from a closed order When voiding a shipment related to a reserved order, if order is closed, new reservation will not be created (in case order was fully shipped) and existing reservation will not be updated (in case order was partially shipped). Besides, when closing an order, related reservation will be also closed. details: https://code.openbravo.com/erp/devel/main/rev/dcaf5195237a changeset: 30293:dcaf5195237a user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Wed Sep 14 13:39:12 2016 +0200 summary: Fixed issue 33989. Removed slow query getting Organization Ledger. The method to get the default General Ledget was using a query that filtered and sorted the results using ad_isorgincluded procedure. In case of having a large number of organizations this query was slow. The method is now using the OrganizationStructureProvider to get the parent organization List of the required org to search the default General Ledger. details: https://code.openbravo.com/erp/devel/main/rev/018192ddfcb3 changeset: 30294:018192ddfcb3 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Mon Sep 19 11:14:46 2016 +0200 summary: Related to issue 33989: Code review improvements - Avoid setting admin mode in getOrgLedgerRecursive() and getClientLedger() methods as it is already done in getOrgLedger() method in OBLedgerUtils class. - Retrieve first, general ledger of login organization in LoginUtils class. If no result is retrieved, we will retrieve general ledger of rest of context organizations. details: https://code.openbravo.com/erp/devel/main/rev/17da7ad0ad62 changeset: 30295:17da7ad0ad62 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Sep 19 14:10:25 2016 +0000 summary: CI: update AD_MODULE to version 30294 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 170 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml | 56 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 134 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 3 + modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java | 4 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 22 +- referencedata/sampledata/QA_Testing/AD_PINSTANCE.xml | 17 + referencedata/sampledata/QA_Testing/AD_SEQUENCE.xml | 44 +- referencedata/sampledata/QA_Testing/C_ORDER.xml | 296 ++- referencedata/sampledata/QA_Testing/C_ORDERLINE.xml | 189 + referencedata/sampledata/QA_Testing/C_ORDERLINETAX.xml | 136 + referencedata/sampledata/QA_Testing/C_ORDERTAX.xml | 128 + referencedata/sampledata/QA_Testing/FIN_PAYMENT.xml | 45 +- referencedata/sampledata/QA_Testing/FIN_PAYMENT_DETAIL.xml | 32 + referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULE.xml | 361 +- referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULEDETAIL.xml | 90 + referencedata/sampledata/QA_Testing/M_INOUT.xml | 78 +- referencedata/sampledata/QA_Testing/M_STORAGE_PENDING.xml | 17 + src-db/database/model/functions/C_ORDER_POST1.xml | 1 + src-db/database/model/functions/M_INOUT_POST.xml | 9 +- src-db/database/model/tables/C_ORDER.xml | 25 + src-db/database/model/tables/C_ORDERLINE.xml | 4 + src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml | 3 + src-db/database/model/triggers/C_ORDER_CHK_RESTRINCTIONS_TRG.xml | 3 + src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml | 11 +- src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml | 2 +- src-db/database/sourcedata/AD_COLUMN.xml | 306 ++- src-db/database/sourcedata/AD_ELEMENT.xml | 98 + src-db/database/sourcedata/AD_FIELD.xml | 208 +- src-db/database/sourcedata/AD_MESSAGE.xml | 108 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REF_LIST.xml | 45 + src-db/database/sourcedata/AD_TAB.xml | 4 +- src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 37 + src-test/src/org/openbravo/test/AllAntTaskTests.java | 6 +- src-test/src/org/openbravo/test/cancelandreplace/CancelAndReplaceTest.java | 472 +++ src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData.java | 288 ++ src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData1.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData10.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData11.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData2.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData3.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData4.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData5.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData6.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData7.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData8.java | 55 + src-test/src/org/openbravo/test/cancelandreplace/data/CancelAndReplaceTestData9.java | 55 + src/org/openbravo/base/secureApp/LoginUtils.java | 29 +- src/org/openbravo/common/actionhandler/CancelAndReplaceGetCancelledOrderLine.java | 46 + src/org/openbravo/common/actionhandler/CancelAndReplaceSalesOrder.java | 116 + src/org/openbravo/common/actionhandler/ConfirmCancelAndReplaceSalesOrder.java | 62 + src/org/openbravo/common/actionhandler/ManagePrereservationActionHandler.java | 3 +- src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java | 1 + src/org/openbravo/dal/core/OBContext.java | 21 + src/org/openbravo/dal/security/AcctSchemaStructureProvider.java | 75 + src/org/openbravo/erpCommon/ad_forms/AcctSchema.java | 15 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 17 +- src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 30 +- src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceOrderHook.java | 54 + src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceOrderHookCaller.java | 72 + src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 1268 ++++++++++ src/org/openbravo/erpCommon/businessUtility/CancelLayawayPaymentsHook.java | 42 + src/org/openbravo/erpCommon/businessUtility/CancelLayawayPaymentsHookCaller.java | 65 + src/org/openbravo/erpCommon/info/SalesOrder_data.xsql | 2 + src/org/openbravo/erpCommon/utility/OBLedgerUtils.java | 92 +- src/org/openbravo/event/FINPaymentEventHandler.java | 91 + src/org/openbravo/event/InvoiceTaxEventHandler.java | 51 + src/org/openbravo/event/OrderLineEventHandler.java | 3 +- src/org/openbravo/service/system/DatabaseValidator.java | 15 +- web/js/cancelAndReplace.js | 50 + 115 files changed, 6054 insertions(+), 377 deletions(-) diffs (truncated from 9163 to 300 lines): diff -r 9504e92f9553 -r 17da7ad0ad62 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Thu Sep 15 14:32:48 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Mon Sep 19 14:10:25 2016 +0000 @@ -111,6 +111,52 @@ <!--038E6E9140CB4924B22060672E2847A2--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> <!--038E6E9140CB4924B22060672E2847A2--></AD_COLUMN> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--><AD_COLUMN> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_COLUMN_ID><![CDATA[03EBACA2EF974E3F9E58A6FE8EF8AECB]]></AD_COLUMN_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <NAME><![CDATA[EM_APRM_FinancialAccount]]></NAME> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <DESCRIPTION><![CDATA[Financial Account in sales invoice details]]></DESCRIPTION> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <HELP><![CDATA[Financial Account in sales invoice details]]></HELP> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <COLUMNNAME><![CDATA[EM_APRM_FinancialAccount]]></COLUMNNAME> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_REFERENCE_VALUE_ID><![CDATA[03D336BF39A7455C8FD64CBCCFB4FC1C]]></AD_REFERENCE_VALUE_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISKEY><![CDATA[N]]></ISKEY> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <SEQNO><![CDATA[290]]></SEQNO> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_ELEMENT_ID><![CDATA[D62D89A819A840B3978E4434C9B66C86]]></AD_ELEMENT_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <SQLLOGIC><![CDATA[(select + case p.amount + when 0 then null + else p.fin_financial_account_id + end + from fin_payment_detail pd + join fin_payment p on p.fin_payment_id=pd.fin_payment_id + where pd.fin_payment_detail_id=fin_payment_detail_id)]]></SQLLOGIC> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--></AD_COLUMN> + <!--046498C716474A6EAAEA0CA26E09C69D--><AD_COLUMN> <!--046498C716474A6EAAEA0CA26E09C69D--> <AD_COLUMN_ID><![CDATA[046498C716474A6EAAEA0CA26E09C69D]]></AD_COLUMN_ID> <!--046498C716474A6EAAEA0CA26E09C69D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2645,6 +2691,45 @@ <!--46BDDEB8C59C4ADA9C4C9D837A10CD45--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> <!--46BDDEB8C59C4ADA9C4C9D837A10CD45--></AD_COLUMN> +<!--47DC39551EA14F5E861296054B731B26--><AD_COLUMN> +<!--47DC39551EA14F5E861296054B731B26--> <AD_COLUMN_ID><![CDATA[47DC39551EA14F5E861296054B731B26]]></AD_COLUMN_ID> +<!--47DC39551EA14F5E861296054B731B26--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--47DC39551EA14F5E861296054B731B26--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--47DC39551EA14F5E861296054B731B26--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--47DC39551EA14F5E861296054B731B26--> <NAME><![CDATA[EM_APRM_Displayed_Acc_ID]]></NAME> +<!--47DC39551EA14F5E861296054B731B26--> <DESCRIPTION><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION> +<!--47DC39551EA14F5E861296054B731B26--> <HELP><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP> +<!--47DC39551EA14F5E861296054B731B26--> <COLUMNNAME><![CDATA[EM_APRM_Displayed_Acc_ID]]></COLUMNNAME> +<!--47DC39551EA14F5E861296054B731B26--> <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID> +<!--47DC39551EA14F5E861296054B731B26--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID> +<!--47DC39551EA14F5E861296054B731B26--> <AD_REFERENCE_VALUE_ID><![CDATA[03D336BF39A7455C8FD64CBCCFB4FC1C]]></AD_REFERENCE_VALUE_ID> +<!--47DC39551EA14F5E861296054B731B26--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--47DC39551EA14F5E861296054B731B26--> <ISKEY><![CDATA[N]]></ISKEY> +<!--47DC39551EA14F5E861296054B731B26--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--47DC39551EA14F5E861296054B731B26--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--47DC39551EA14F5E861296054B731B26--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--47DC39551EA14F5E861296054B731B26--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--47DC39551EA14F5E861296054B731B26--> <SEQNO><![CDATA[470]]></SEQNO> +<!--47DC39551EA14F5E861296054B731B26--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--47DC39551EA14F5E861296054B731B26--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--47DC39551EA14F5E861296054B731B26--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--47DC39551EA14F5E861296054B731B26--> <AD_ELEMENT_ID><![CDATA[124C4AAA06BA4D939D862BEE389AB4DA]]></AD_ELEMENT_ID> +<!--47DC39551EA14F5E861296054B731B26--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--47DC39551EA14F5E861296054B731B26--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--47DC39551EA14F5E861296054B731B26--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--47DC39551EA14F5E861296054B731B26--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--47DC39551EA14F5E861296054B731B26--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--47DC39551EA14F5E861296054B731B26--> <POSITION><![CDATA[41]]></POSITION> +<!--47DC39551EA14F5E861296054B731B26--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--47DC39551EA14F5E861296054B731B26--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--47DC39551EA14F5E861296054B731B26--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--47DC39551EA14F5E861296054B731B26--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--47DC39551EA14F5E861296054B731B26--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--47DC39551EA14F5E861296054B731B26--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--47DC39551EA14F5E861296054B731B26--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> +<!--47DC39551EA14F5E861296054B731B26--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +<!--47DC39551EA14F5E861296054B731B26--></AD_COLUMN> + <!--49BEE6AEC60D4C61922B2B2DB42D7918--><AD_COLUMN> <!--49BEE6AEC60D4C61922B2B2DB42D7918--> <AD_COLUMN_ID><![CDATA[49BEE6AEC60D4C61922B2B2DB42D7918]]></AD_COLUMN_ID> <!--49BEE6AEC60D4C61922B2B2DB42D7918--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -11006,6 +11091,45 @@ <!--C72EC790B2EF4BEEA2A843D30770B85D--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> <!--C72EC790B2EF4BEEA2A843D30770B85D--></AD_COLUMN> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--><AD_COLUMN> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <AD_COLUMN_ID><![CDATA[C8B98FF8B51C43F7B12E8C448B0A2725]]></AD_COLUMN_ID> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <NAME><![CDATA[EM_APRM_Displayed_Paymmeth_ID]]></NAME> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <DESCRIPTION><![CDATA[Displayed Payment Method field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <HELP><![CDATA[Displayed Payment Method field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <COLUMNNAME><![CDATA[EM_APRM_Displayed_Paymmeth_ID]]></COLUMNNAME> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <AD_REFERENCE_VALUE_ID><![CDATA[F378D8FAEF9441F29D3974ADE211BF98]]></AD_REFERENCE_VALUE_ID> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISKEY><![CDATA[N]]></ISKEY> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <SEQNO><![CDATA[460]]></SEQNO> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <AD_ELEMENT_ID><![CDATA[D0F4319D572E49398FD01216BA9DE4EF]]></AD_ELEMENT_ID> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <POSITION><![CDATA[40]]></POSITION> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +<!--C8B98FF8B51C43F7B12E8C448B0A2725--></AD_COLUMN> + <!--C9FD369BECE545828033CC49CAB85D9D--><AD_COLUMN> <!--C9FD369BECE545828033CC49CAB85D9D--> <AD_COLUMN_ID><![CDATA[C9FD369BECE545828033CC49CAB85D9D]]></AD_COLUMN_ID> <!--C9FD369BECE545828033CC49CAB85D9D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -11657,6 +11781,52 @@ <!--E6DB13E1516947B7A8DC5741D58A7AB2--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> <!--E6DB13E1516947B7A8DC5741D58A7AB2--></AD_COLUMN> +<!--E73D535A7F9D4494AF132A66AE861168--><AD_COLUMN> +<!--E73D535A7F9D4494AF132A66AE861168--> <AD_COLUMN_ID><![CDATA[E73D535A7F9D4494AF132A66AE861168]]></AD_COLUMN_ID> +<!--E73D535A7F9D4494AF132A66AE861168--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--E73D535A7F9D4494AF132A66AE861168--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--E73D535A7F9D4494AF132A66AE861168--> <NAME><![CDATA[EM_APRM_PaymentMethod]]></NAME> +<!--E73D535A7F9D4494AF132A66AE861168--> <DESCRIPTION><![CDATA[Payment Method in Sales Invoice]]></DESCRIPTION> +<!--E73D535A7F9D4494AF132A66AE861168--> <HELP><![CDATA[Payment Method in Sales Invoice]]></HELP> +<!--E73D535A7F9D4494AF132A66AE861168--> <COLUMNNAME><![CDATA[EM_APRM_PaymentMethod]]></COLUMNNAME> +<!--E73D535A7F9D4494AF132A66AE861168--> <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID> +<!--E73D535A7F9D4494AF132A66AE861168--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID> +<!--E73D535A7F9D4494AF132A66AE861168--> <AD_REFERENCE_VALUE_ID><![CDATA[E664E415582A483DBBC91DEF256FB9E6]]></AD_REFERENCE_VALUE_ID> +<!--E73D535A7F9D4494AF132A66AE861168--> <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISKEY><![CDATA[N]]></ISKEY> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--E73D535A7F9D4494AF132A66AE861168--> <SEQNO><![CDATA[300]]></SEQNO> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--E73D535A7F9D4494AF132A66AE861168--> <AD_ELEMENT_ID><![CDATA[2622EC9C32614ED692A415EC3F3DC3EF]]></AD_ELEMENT_ID> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--E73D535A7F9D4494AF132A66AE861168--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--E73D535A7F9D4494AF132A66AE861168--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--E73D535A7F9D4494AF132A66AE861168--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--E73D535A7F9D4494AF132A66AE861168--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--E73D535A7F9D4494AF132A66AE861168--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--E73D535A7F9D4494AF132A66AE861168--> <SQLLOGIC><![CDATA[(select + case p.amount + when 0 then null + else p.fin_paymentmethod_id + end + from fin_payment_detail pd + join fin_payment p on p.fin_payment_id = pd.fin_payment_id + where pd.fin_payment_detail_id = fin_payment_detail_id)]]></SQLLOGIC> +<!--E73D535A7F9D4494AF132A66AE861168--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--E73D535A7F9D4494AF132A66AE861168--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> +<!--E73D535A7F9D4494AF132A66AE861168--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +<!--E73D535A7F9D4494AF132A66AE861168--></AD_COLUMN> + <!--E88F9871B4184489A5B188A589FB8543--><AD_COLUMN> <!--E88F9871B4184489A5B188A589FB8543--> <AD_COLUMN_ID><![CDATA[E88F9871B4184489A5B188A589FB8543]]></AD_COLUMN_ID> <!--E88F9871B4184489A5B188A589FB8543--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 9504e92f9553 -r 17da7ad0ad62 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml Thu Sep 15 14:32:48 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml Mon Sep 19 14:10:25 2016 +0000 @@ -50,6 +50,20 @@ <!--0CF797887AC9494F9C250A6B6EB5D60D--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--0CF797887AC9494F9C250A6B6EB5D60D--></AD_ELEMENT> +<!--124C4AAA06BA4D939D862BEE389AB4DA--><AD_ELEMENT> +<!--124C4AAA06BA4D939D862BEE389AB4DA--> <AD_ELEMENT_ID><![CDATA[124C4AAA06BA4D939D862BEE389AB4DA]]></AD_ELEMENT_ID> +<!--124C4AAA06BA4D939D862BEE389AB4DA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--124C4AAA06BA4D939D862BEE389AB4DA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--124C4AAA06BA4D939D862BEE389AB4DA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--124C4AAA06BA4D939D862BEE389AB4DA--> <COLUMNNAME><![CDATA[EM_APRM_Displayed_Acc_ID]]></COLUMNNAME> +<!--124C4AAA06BA4D939D862BEE389AB4DA--> <NAME><![CDATA[Financial Account]]></NAME> +<!--124C4AAA06BA4D939D862BEE389AB4DA--> <PRINTNAME><![CDATA[Financial Account]]></PRINTNAME> +<!--124C4AAA06BA4D939D862BEE389AB4DA--> <DESCRIPTION><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION> +<!--124C4AAA06BA4D939D862BEE389AB4DA--> <HELP><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP> +<!--124C4AAA06BA4D939D862BEE389AB4DA--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--124C4AAA06BA4D939D862BEE389AB4DA--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +<!--124C4AAA06BA4D939D862BEE389AB4DA--></AD_ELEMENT> + <!--1C8028555014460F81C6ACC811CA74E2--><AD_ELEMENT> <!--1C8028555014460F81C6ACC811CA74E2--> <AD_ELEMENT_ID><![CDATA[1C8028555014460F81C6ACC811CA74E2]]></AD_ELEMENT_ID> <!--1C8028555014460F81C6ACC811CA74E2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -86,6 +100,20 @@ <!--256AB5C3D6144B2C9884CF0FA4D81911--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--256AB5C3D6144B2C9884CF0FA4D81911--></AD_ELEMENT> +<!--2622EC9C32614ED692A415EC3F3DC3EF--><AD_ELEMENT> +<!--2622EC9C32614ED692A415EC3F3DC3EF--> <AD_ELEMENT_ID><![CDATA[2622EC9C32614ED692A415EC3F3DC3EF]]></AD_ELEMENT_ID> +<!--2622EC9C32614ED692A415EC3F3DC3EF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--2622EC9C32614ED692A415EC3F3DC3EF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--2622EC9C32614ED692A415EC3F3DC3EF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2622EC9C32614ED692A415EC3F3DC3EF--> <COLUMNNAME><![CDATA[EM_APRM_PaymentMethod]]></COLUMNNAME> +<!--2622EC9C32614ED692A415EC3F3DC3EF--> <NAME><![CDATA[Payment Method]]></NAME> +<!--2622EC9C32614ED692A415EC3F3DC3EF--> <PRINTNAME><![CDATA[Payment Method]]></PRINTNAME> +<!--2622EC9C32614ED692A415EC3F3DC3EF--> <DESCRIPTION><![CDATA[Payment Method in Sales Invoice]]></DESCRIPTION> +<!--2622EC9C32614ED692A415EC3F3DC3EF--> <HELP><![CDATA[Payment Method in Sales Invoice]]></HELP> +<!--2622EC9C32614ED692A415EC3F3DC3EF--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--2622EC9C32614ED692A415EC3F3DC3EF--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +<!--2622EC9C32614ED692A415EC3F3DC3EF--></AD_ELEMENT> + <!--2C70D5BAFED340D68C564DA5C3F15A7E--><AD_ELEMENT> <!--2C70D5BAFED340D68C564DA5C3F15A7E--> <AD_ELEMENT_ID><![CDATA[2C70D5BAFED340D68C564DA5C3F15A7E]]></AD_ELEMENT_ID> <!--2C70D5BAFED340D68C564DA5C3F15A7E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1420,6 +1448,20 @@ <!--CCB29A49EE4048A2BF99EBF2FC0C0241--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--CCB29A49EE4048A2BF99EBF2FC0C0241--></AD_ELEMENT> +<!--D0F4319D572E49398FD01216BA9DE4EF--><AD_ELEMENT> +<!--D0F4319D572E49398FD01216BA9DE4EF--> <AD_ELEMENT_ID><![CDATA[D0F4319D572E49398FD01216BA9DE4EF]]></AD_ELEMENT_ID> +<!--D0F4319D572E49398FD01216BA9DE4EF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--D0F4319D572E49398FD01216BA9DE4EF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--D0F4319D572E49398FD01216BA9DE4EF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--D0F4319D572E49398FD01216BA9DE4EF--> <COLUMNNAME><![CDATA[EM_APRM_Displayed_Paymmeth_ID]]></COLUMNNAME> +<!--D0F4319D572E49398FD01216BA9DE4EF--> <NAME><![CDATA[Payment Method]]></NAME> +<!--D0F4319D572E49398FD01216BA9DE4EF--> <PRINTNAME><![CDATA[Payment Method]]></PRINTNAME> +<!--D0F4319D572E49398FD01216BA9DE4EF--> <DESCRIPTION><![CDATA[Displayed Payment Method field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION> +<!--D0F4319D572E49398FD01216BA9DE4EF--> <HELP><![CDATA[Displayed Payment Method field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP> +<!--D0F4319D572E49398FD01216BA9DE4EF--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--D0F4319D572E49398FD01216BA9DE4EF--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +<!--D0F4319D572E49398FD01216BA9DE4EF--></AD_ELEMENT> + <!--D2AC3F75FCDC4BC187A1F492C46D68D1--><AD_ELEMENT> <!--D2AC3F75FCDC4BC187A1F492C46D68D1--> <AD_ELEMENT_ID><![CDATA[D2AC3F75FCDC4BC187A1F492C46D68D1]]></AD_ELEMENT_ID> <!--D2AC3F75FCDC4BC187A1F492C46D68D1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1474,6 +1516,20 @@ <!--D521B46D67FA4014B71B52EE04B0492A--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--D521B46D67FA4014B71B52EE04B0492A--></AD_ELEMENT> +<!--D62D89A819A840B3978E4434C9B66C86--><AD_ELEMENT> +<!--D62D89A819A840B3978E4434C9B66C86--> <AD_ELEMENT_ID><![CDATA[D62D89A819A840B3978E4434C9B66C86]]></AD_ELEMENT_ID> +<!--D62D89A819A840B3978E4434C9B66C86--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--D62D89A819A840B3978E4434C9B66C86--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--D62D89A819A840B3978E4434C9B66C86--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--D62D89A819A840B3978E4434C9B66C86--> <COLUMNNAME><![CDATA[EM_APRM_FinancialAccount]]></COLUMNNAME> +<!--D62D89A819A840B3978E4434C9B66C86--> <NAME><![CDATA[Financial Account]]></NAME> +<!--D62D89A819A840B3978E4434C9B66C86--> <PRINTNAME><![CDATA[Financial Account]]></PRINTNAME> +<!--D62D89A819A840B3978E4434C9B66C86--> <DESCRIPTION><![CDATA[Financial Account in sales invoice details]]></DESCRIPTION> +<!--D62D89A819A840B3978E4434C9B66C86--> <HELP><![CDATA[Financial Account in sales invoice details]]></HELP> +<!--D62D89A819A840B3978E4434C9B66C86--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--D62D89A819A840B3978E4434C9B66C86--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +<!--D62D89A819A840B3978E4434C9B66C86--></AD_ELEMENT> + <!--D85187ABF8434C39A9A11EE8EFCF3DDE--><AD_ELEMENT> <!--D85187ABF8434C39A9A11EE8EFCF3DDE--> <AD_ELEMENT_ID><![CDATA[D85187ABF8434C39A9A11EE8EFCF3DDE]]></AD_ELEMENT_ID> <!--D85187ABF8434C39A9A11EE8EFCF3DDE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 9504e92f9553 -r 17da7ad0ad62 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Thu Sep 15 14:32:48 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Mon Sep 19 14:10:25 2016 +0000 @@ -3747,6 +3747,35 @@ <!--36A419B53C97486EAFE5FF25654058E4--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--36A419B53C97486EAFE5FF25654058E4--></AD_FIELD> +<!--36B58B2BEF8448CA9D384A70E08B9E0E--><AD_FIELD> +<!--36B58B2BEF8448CA9D384A70E08B9E0E--> <AD_FIELD_ID><![CDATA[36B58B2BEF8448CA9D384A70E08B9E0E]]></AD_FIELD_ID> +<!--36B58B2BEF8448CA9D384A70E08B9E0E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--36B58B2BEF8448CA9D384A70E08B9E0E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--36B58B2BEF8448CA9D384A70E08B9E0E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
