Commit Graph

197 Commits

Author SHA1 Message Date
Carlos Ruiz c69070876f Merge development (717d3f6bb6a2) into zk7 branch 2014-06-03 18:28:40 -05:00
Carlos Ruiz 49d477c2d5 Merge development (717d3f6bb6a2) into zk7 branch 2014-06-03 17:58:27 -05:00
Carlos Ruiz 3d53cf43db IDEMPIERE-236 bring hardcoded MSysConfig keys and order 2014-05-29 16:31:14 -05:00
Heng Sin Low fa6541ff10 Merge development ( 10289 ) into zk7 ( 10252 ) branch 2014-04-03 09:17:58 +08:00
Heng Sin Low 9e5826b772 IDEMPIERE-1635 Upgrade to zk7. Update platform to Gemini Web 2.2.2, Tomcat 7.0.35 and Eclipse 4.3 ( Kepler ). 2014-04-03 01:31:20 +08:00
Carlos Ruiz d75a1cb722 hg merge release-2.0 (merge release2 into development) 2014-03-26 21:26:40 -05:00
Carlos Ruiz 854076ee2c hg merge release-2.0 (merge release2 into development) 2014-05-07 22:04:48 -05:00
Carlos Ruiz 9f24e8a85b IDEMPIERE-1927 MAccount.get creating deadlocks because it doesn't have trx 2014-05-02 16:19:10 -05:00
Carlos Ruiz a980daf1d8 IDEMPIERE-1852 Translation: Accounting Fact Reconcilation (manual) 2014-03-24 20:21:05 -05:00
Carlos Ruiz 5583a606c2 hg merge release-2.0 (merge release2 into development) 2014-03-07 22:20:51 -05:00
Carlos Ruiz 71db6871df IDEMPIERE-1581 tree maintenance translation missing / thanks to Sergio Oropeza for the patch 2014-03-07 21:03:35 -05:00
Elaine Tan 118c4f74ef IDEMPIERE-1776 Payment Allocation: Allow user to apply payment to credit memo 2014-02-28 10:55:14 +08:00
Elaine Tan 7ca2cbc167 IDEMPIERE-1787 1003797 Payment allocation completed but did not associate the payment to selected invoices - throw exception when 'Allocation not balanced' instead of logging as severe log 2014-03-04 17:07:45 +08:00
Carlos Ruiz c2737073e6 IDEMPIERE-1045 Improve info Window implementation to enable the definition of related info which will be rendered as tabs at the bottom of the content Pane / thanks to Anthony Sossah (xolali) for the contribution and red1 for the peer review and integration 2014-01-26 17:10:29 -05:00
Carlos Ruiz 7506668fb6 hg merge release-1.0c (merge release1 into release2) 2013-12-30 21:42:30 -05:00
Heng Sin Low 22bb2ab999 1003599 Payment Allocation: Allow user to enter applied amount that's more than the payment's open amount. Fixed applied amount calculation for payment with negative balance. 2013-12-30 17:47:52 +08:00
Heng Sin Low 83bf6f7e36 Merged release-1.0c into release-2.0 2013-12-05 18:10:32 +08:00
Heng Sin Low 1a33572fa9 1003599 Payment Allocation: Allow user to enter applied amount that's more than the payment's open amount. 2013-12-05 10:30:46 +08:00
Carlos Ruiz 4f1aa96b14 hg merge release-1.0c (merge release1 into release2) 2013-11-25 19:22:58 -05:00
Thomas Bayen 24477333d3 IDEMPIERE-1557 swing: translation import does not work 2013-11-25 19:16:25 -05:00
Carlos Ruiz 499cb715bd hg merge release-1.0c (merge release1 into release2) 2013-11-21 16:35:43 -05:00
Heng Sin Low bb6607d553 IDEMPIERE-1561 Update product version to 2.0.0. 2013-11-21 14:32:17 +08:00
Carlos Ruiz f701e71d88 IDEMPIERE-1496 Customer RMA and Vendor RMA Create From dialog missing translation / based on patch from Flemming Birch 2013-11-20 09:46:51 -05:00
Carlos Ruiz fb3e9c3732 IDEMPIERE-1452 Translation Export doesnt export field Comment and Help 2013-10-18 10:19:23 -05:00
Elaine Tan 9eeedfa909 IDEMPIERE-1158: Allow Create Lines From on Invoice (Customer) - Fix NullPointerException in CreateFrom 2013-10-24 12:11:02 +08:00
Heng Sin Low 11041a4a4d 1002617 IDEMPIERE-1158: Allow Create Lines From on Invoice (Customer). 2013-10-11 14:33:49 +08:00
Carlos Ruiz 1ab0741364 IDEMPIERE-1270 PaymentFormOnCredit is not translating payment terms / based on patch from Naim Berisha 2013-09-05 18:01:05 -05:00
Richard Morales 83cfb7fdda IDEMPIERE-1025 Improve translation for custom tables 2013-08-05 18:01:48 -05:00
Elaine Tan 2345c88481 IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window - maintain the old public method signature 2013-08-05 17:50:17 +08:00
Elaine Tan fb95f9fca8 IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window 2013-08-05 15:59:20 +08:00
Elaine Tan a33c9c0817 IDEMPIERE-860 Review Payment Processors - include credit card validation 2013-07-22 18:13:12 +08:00
Richard Morales 68223ee9af IDEMPIERE-1127 The Name of the workflow node is not translated 2013-07-06 17:44:39 -05:00
Carlos Ruiz 47377261b3 IDEMPIERE-1104 Payments all get the same accounting date as the reconciling bank statement regardless of transaction date / IDEMPIERE-480 2013-06-26 13:21:20 -05:00
Carlos Ruiz ab31459efb IDEMPIERE-1096 CreateFromStatement not working with currency conversion 2013-06-21 18:57:54 -05:00
Carlos Ruiz fb4dfe08bd IDEMPIERE-1006 Improve transaction and busy dialog for merge window 2013-06-01 10:52:05 -05:00
Richard Morales b2c2245e83 IDEMPIERE-892 in window generate charge, not work create new record 2013-05-04 14:52:54 -05:00
Carlos Ruiz 87de4029eb IDEMPIERE-889 See Order from other organization in generate invoices 2013-05-01 10:39:29 -05:00
Elaine Tan 66cb186a98 IDEMPIERE-862 Create lines from MPS Lines function is not working - fix java.math.BigDecimal cannot be cast to java.lang.Integer 2013-04-25 11:53:48 +08:00
Juliana Corredor 964d9e7c52 IDEMPIERE-690 No Validation in Create Invoice Credit Memo for Customer RMA 2013-04-20 18:13:40 -05:00
Elaine Tan 305a23403a IDEMPIERE-860 Review Payment Processors
- improve the error message when a payment processor model is not found
- clear the result columns when copy from a payment transaction record
- fix the use of database transaction in payment transaction
2013-04-18 19:37:23 +08:00
Elaine Tan f7af4d1e20 IDEMPIERE-862 Create lines from MPS Lines function is not working 2013-04-17 18:23:21 +08:00
Elaine Tan 4100d6ba55 Merge with db85c1fe66ddd64b9cca06d84f822d5f2985b81e 2013-04-17 13:01:34 +08:00
Carlos Ruiz f408fbc6d3 IDEMPIERE-166 Rebranding of logo and product name 2013-04-16 19:28:55 -05:00
Elaine Tan 9c8f5b7363 IDEMPIERE-860 Review Payment Processors 2013-04-16 15:54:27 +08:00
Elaine Tan 46937f4018 IDEMPIERE-853 Improvement to Deposit Batch functionality 2013-04-12 11:44:15 +08:00
Carlos Ruiz 01a9897cc1 IDEMPIERE-455 Discover and fix FindBugs problems / DMI_BIGDECIMAL_CONSTRUCTED_FROM_DOUBLE / Improve some calculations for BigDecimal 2013-04-09 18:09:44 -05:00
Carlos Ruiz 6b108cff55 IDEMPIERE-455 Discover and fix FindBugs problems / DMI_BIGDECIMAL_CONSTRUCTED_FROM_DOUBLE / Improve some calculations for BigDecimal 2013-04-09 17:48:34 -05:00
Richard Morales e4476ec95c IDEMPIERE-455 Discover and fix FindBugs problems / DMI_BIGDECIMAL_CONSTRUCTED_FROM_DOUBLE 2013-04-09 15:49:25 -05:00
Heng Sin Low 4f0c58a751 IDEMPIERE-834 Zk: Improvement to payment Allocation form. 2013-04-08 15:39:05 +08:00
Carlos Ruiz 5a5712fb71 IDEMPIERE-812 Improve statistics for reports 2013-03-28 20:03:57 -05:00
Carlos Ruiz 45318ef957 IDEMPIERE-764 Some tablenames starts with X whereas they have centralized IDs / X_DepositBatch X_DepositBatchLine 2013-03-18 15:35:58 -05:00
Carlos Ruiz b167a4c7df IDEMPIERE-638 Check log level before calling logging method 2013-03-15 16:16:28 -05:00
Carlos Ruiz ac93bd4473 IDEMPIERE-638 Check log level before calling logging method / log.info / Thanks to Richard Morales 2013-02-27 20:58:38 -05:00
Carlos Ruiz b223b3a20c IDEMPIERE-638 Check log level before calling logging method / fix missing parenthesis / Thanks to Richard Morales 2013-02-26 17:24:09 -05:00
Richard Morales ce7938424e IDEMPIERE-638 Check log level before calling logging method / log.fine 2013-02-25 19:00:59 -05:00
Richard Morales ada4a0f749 IDEMPIERE-638 Check log level before calling logging method / log.finer 2013-02-25 14:08:35 -05:00
Richard Morales a6b7473ff4 IDEMPIERE-638 Check log level before calling logging method / log.finest 2013-02-25 14:00:29 -05:00
Richard Morales e0b18312f8 IDEMPIERE-638 Check log level before calling logging method / log.config 2013-02-25 12:29:10 -05:00
Richard Morales 427e8e08f2 IDEMPIERE-638 Check log level before calling logging method / s_log.info logger.config+info 2013-02-22 15:59:05 -05:00
Richard Morales 65a9dc9adc IDEMPIERE-568 Review proper closing of JDBC statements and resultsets 2013-02-20 20:31:16 -05:00
Richard Morales f737c1fc87 IDEMPIERE-568 Review proper closing of JDBC statements and resultsets 2013-02-19 18:17:37 -05:00
Richard Morales 9b0c13b9f5 IDEMPIERE-568 Review proper closing of JDBC statements and resultsets 2013-02-19 16:08:13 -05:00
Richard Morales 7838f1bf04 IDEMPIERE-568 Review proper closing of JDBC statements and resultsets 2013-02-15 19:26:22 -05:00
Heng Sin Low f4da72ef50 IDEMPIERE-359 Add OSGi Service support for existing extension point. 1) Separate osgi service and equinox extension locator API. Service.locator() for OSGi service and EquinoxExtensionLocator.instance() for equinox extension. 2) Use OSGi service for all singleton component ( all factories and most services ) and equinox extension for others ( UI object, Process instance and PIPO handlers). 2013-02-13 16:15:43 +08:00
Elaine Tan 9f5de63894 Ticket #1001569: Move receipts into batch from QS to Idempiere - minor fix 2013-01-31 18:46:49 +08:00
Elaine Tan 145c0005cc Ticket #1001569: Move receipts into batch from QS to Idempiere - adjustment to the 'Create From Batch' code design 2013-01-31 16:47:17 +08:00
Elaine Tan d50e43d850 Ticket #1001569: Move receipts into batch from QS to Idempiere 2013-01-29 14:38:39 +08:00
Heng Sin Low 7cc4052caf IDEMPIERE-325 Complete AD based info window ( AD_InfoWindow ) implementation. Ported existing info product panel to the new ad_infowindow implementation. 2013-01-23 18:20:49 +08:00
Elaine Tan 8add04b700 Ticket #1001770: RMA improvements - add callouts to populate the data when shipment/receipt line, product or charge field changed 2013-01-22 20:21:21 +08:00
Elaine Tan c3288cdd41 Ticket #1001770: RMA improvements - support optional shipment/receipt line in rma line 2013-01-21 19:45:11 +08:00
Elaine Tan 7bc1e373c9 Change "CreateFrom" factory to use OSGi service 2013-01-18 19:14:02 +08:00
Heng Sin Low 1a096ff10a Merge 3ec3918730fd 2012-12-28 00:30:38 +08:00
Elaine Tan d33e6319c9 Ticket #1001758: FedEx & UPS 2012-12-21 18:48:41 +08:00
Carlos Ruiz 2e5fb7c33f IDEMPIERE-217 Allocate Payment to Charge 2012-12-17 14:42:46 -05:00
Richard Morales ae3990ce11 IDEMPIERE-455 Discover and fix FindBugs problems / Eclipse warning -> not used 2012-12-13 18:41:45 -05:00
Richard Morales 5662475b92 IDEMPIERE-455 Discover and fix FindBugs problems / Pattern SIC_INNER_SHOULD_BE_STATIC 2012-12-11 19:47:25 -05:00
Richard Morales 2035b8c7d3 IDEMPIERE-455 Discover and fix FindBugs problems / Pattern SS_SHOULD_BE_STATIC 2012-12-11 19:21:13 -05:00
Richard Morales 1e30b56290 IDEMPIERE-455 Discover and fix FindBugs problems / Eclipse Warning : Is never used 2012-12-06 15:00:04 -05:00
Richard Morales a486d1317c IDEMPIERE-308 Performance: Replace use of StringBuffer and String concatenation with StringBuilder / findbugs fb-contrib pattern LSYC_LOCAL_SYNCHRONIZED_COLLECTION 2012-12-05 12:09:37 -05:00
Richard Morales 529089a426 IDEMPIERE-183 Fixed generic type warning 2012-12-04 11:24:23 -05:00
Elaine Tan 778d4ba228 IDEMPIERE-462 Ticket #1001503: Credit Cards Online - Fix the database transaction used to save payment transaction and online trx history records, encrpyt credit card number and cvv, fix the allocation when perform credit payment transaction for AR credit memo. 2012-12-04 12:42:01 +08:00
Heng Sin Low b6fd81b23c IDEMPIERE-514 Match Invoice not created automatically for multiple receipts on single purchase order line 2012-12-03 18:18:09 +08:00
Carlos Ruiz 5c4de4a93a IDEMPIERE-393 Setup wizards / Peer review 2012-11-28 01:05:41 -05:00
David Peñuela 7fa15475a8 IDEMPIERE-393 Setup wizards 2012-11-27 22:54:38 -05:00
Carlos Ruiz 0ba86d5da4 IDEMPIERE-385 Resolve M_Storage locking and data consistency / Show storage totals on Info Product Panel 2012-11-21 17:19:33 -05:00
Carlos Ruiz c93620b3c9 IDEMPIERE-385 Resolve M_Storage locking and data consistency / Code refinements 2012-11-20 17:30:44 -05:00
Owner.Owner-PC 5732700f46 fix code related with MStorage.add() method 2012-10-16 14:06:19 +07:00
Owner.Owner-PC 2a4b62f683 commit initial work on IDEMPIERE-385 2012-10-16 13:46:20 +07:00
Elaine Tan 17aeb199ef Merge with ade8e366cf54154e97af42addf956d38229c553c 2012-11-16 18:08:19 +08:00
Elaine Tan bec8fac40c Ticket #1001611: Adjust Payment Processor Options for Tenant 2012-11-16 17:40:17 +08:00
Juan David Arboleda 34267029f4 IDEMPIERE-457 Tab Editor (to ease positioning of fields) 2012-11-14 16:32:44 -05:00
Carlos Ruiz b98d84e788 IDEMPIERE-457 Tab Editor (to ease positioning of fields) / Team work with Juan Arboleda 2012-11-12 18:09:48 -05:00
Elaine Tan ad5d338dfd Merge with c7817574afdfe577790aaa5144f192cf953dcda4 2012-11-08 18:28:56 +08:00
Elaine Tan 816f897f06 IDEMPIERE-392 Redesign payment button - revert previous change, use factory approach 2012-11-08 18:21:38 +08:00
Heng Sin Low 3d865703f1 IDEMPIERE-493 Add validation for matching. Fixed layout and refresh issue. 2012-11-08 13:26:30 +08:00
Heng Sin Low 614a431e0b Merge with eb737df095c2fdeac36e42b1786173d066d95757 2012-11-08 07:50:40 +08:00
Heng Sin Low ba27cda7cf IDEMPIERE-493 Add validation for matching 2012-11-08 07:50:01 +08:00
Elaine Tan d68ddd64dd IDEMPIERE-392 Redesign payment button - use OSGI service driven instead of hard-coded static to register payment form for each payment rule 2012-11-07 17:59:08 +08:00
Heng Sin Low 2dfa60b73e IDEMPIERE-359 Add OSGi Service support for existing extension point 2012-11-06 11:39:23 +08:00
Elaine Tan 442fd422a1 IDEMPIERE-462 Ticket #1001503: Credit Cards Online - support online sales, authorization, delay capture and void payment 2012-11-01 20:23:20 +08:00