Commit Graph
80 Commits
Author SHA1 Message Date
Jacques Le Roux bee1b11831 Fixed: Terms are not shown correctly on the Invoice overview (OFBIZ-12139)
When we have multiple Payment (Net Days) terms on the invoice say
20% in 15Days (FIN_PAY_NETDAYS_1)
80% in 30Days (FIN_PAY_NETDAYS_2)

The terms section shows incorrect term data as shown in the screenshot.

Thanks: Nameet Jain for report and fix, Jacopo for confirmation
2021-01-18 20:19:21 +01:00
Jacques Le Roux 4ff22b46dc Improved: Convert getInvoicePaymentInfoListByDueDateOffset service from mini-lang to groovy DSL (OFBIZ-11486)
Thanks: Devanshu Vyas for report, Nitish Mishra for the patch
2020-08-09 20:14:10 +02:00
Jacques Le Roux cc61673198 Improved: Convert cancelCheckRunPayments service from mini-lang to groovy DSL (OFBIZ-11494)
Thanks: Devanshu Vyas for report, Yogesh Naroliya for the patch
2020-08-09 20:07:51 +02:00
Pawan Verma 034e03abf4 Improved: Inconsistent String Comparisons(OFBIZ-9254)
There are some inconsistencies in the code for string comparison statusId.equals(PRUN_COMPLETED) whereas it should be written as PRUN_COMPLETED.equals(statusId) cause the former can throw NullPointerException if the variable found to be NULL.

Thanks: Devanshu for your contribution.
2020-07-30 17:01:54 +05:30
Jacques Le Roux 2b04118690 Revert "Improved: Convert voidPayment service from mini-lang to groovy DSL (OFBIZ-11487)"
This reverts commit faa59b325f.

It introduced 3 errors in testIntegration, in:
testGlPostingOnCancelCheckRun
testGlPostingsOnVoidPayment
testVoidPayment
2020-07-25 16:06:34 +02:00
Jacques Le Roux faa59b325f Improved: Convert voidPayment service from mini-lang to groovy DSL (OFBIZ-11487)
Thanks: Sourabh Punyani
2020-07-25 10:33:17 +02:00
Jacques Le Roux 7c4a117448 Improved: Convert getPaymentGroupReconciliationId service from mini-lang to groovy DSL (OFBIZ-11496)
Thanks: Devanshu Vyas for report and Rohit Koushal for the patch

Improved: Convert createPaymentAndApplication service from mini-lang to groovy DSL (OFBIZ-11484)
Thanks: Devanshu Vyas for report and Anushi Gupta for the patch

Sorry due to a bad handling there are 2 commits in one (squashed)
2020-07-09 14:18:05 +02:00
Priya Sharma 18b21c1e94 [Improved] Convert getInvoicePaymentInfoList service from mini-lang to groovy DSL (#148)
(OFBIZ-11485)

Done following:
- removed the mini-lang implementation of the service
- updated the service definition to point the groovy service
- added the groovy implementation of the service
2020-07-04 14:57:53 +05:30
Pawan Verma 6de4b73074 Improved: Convert getPayments service from mini-lang to groovy DSL(OFBIZ-11495)
Thanks: Devanshu for the report and Yogesh for the patch.
2020-07-01 16:13:33 +05:30
Pawan Verma 20ba868b7d Improved: Convert cancelPaymentBatch service from mini-lang to groovy DSL(OFBIZ-11489)
Thanks: Devanshu for report, Kirti for patch and Jacques for the review.
2020-07-01 15:48:49 +05:30
Jacques Le Roux 5880859c7c Implemented: Convert voidPayment service from mini-lang to groovy DSL (OFBIZ-11487)
Thanks: Devanshu Vyas for report and Sourabh Punyani for implementation
2020-07-01 12:05:22 +02:00
Priya SharmaandPriya Sharma 5a144c0bed Improved: Use GroovyBaseScript's makeValue utility methods in each Groovy files (OFBIZ-11779)
Co-authored-by: Priya Sharma <priya.sharma@hotwaxsystems.com>
2020-06-28 01:24:32 +05:30
Jacques Le Roux f421af33a3 Improved: Convert createFinAccoutnTransFromPayment service from mini-lang to groovy DSL (OFBIZ-11492)
Thanks: Devanshu Vyas  for report, Anushi Gupta for the patch
2020-06-27 12:06:46 +02:00
Priya SharmaandPriya Sharma 15aec7e8f7 WIP: [Improved]: Use GroovyBaseScript's logging utility methods instead of using Debug (OFBIZ-11762) (#185)
* [Improved]: Use GroovyBaseScript's logging utility methods instead of using Debug
- Replaced the debug.log methods with the respective groovy utility method
- Enhanced the GroovyBaseScript to entertain the fetch the current class name as the module name for logging
- Overloaded the logError method to entertain throwbale object for better logging
- Removed unused import statements and module variables.

(OFBIZ-11762)

* [Removed]: Extra line spaces. (OFBIZ-11762)

* [Revert]: Unwanted changes. (OFBIZ-11762)

* [Added] Same changes to these files. (OFBIZ-11762)

Co-authored-by: Priya Sharma <priya.sharma@example.com>
2020-06-06 10:17:23 +02:00
c8a7c7dd23 Fixed: Create Payment service throws an exception when receiving payment on order (OFBIZ-11754) (#166)
* [Fixed] Create Payment service throws exception when receiving payment on order
- Since the MODULE variable could not be found, the service was throwing error
- Instead used the groovy method directly to print the log instead, which has access to the module variable implicitly.
- Removed the unused import as Debug class is not longer needed here.

(OFBIZ-11754)

* [Improved] The content groovy services to avoid the error in case we try to log a detail, since the module variable is not found. (OFBIZ-11754)

* Update ContentServices.groovy

* [Improved] Added error logs instead of info logs for service excpetions logging. (OFBIZ-11754)

Co-authored-by: Priya Sharma <priya.sharma@example.com>
Co-authored-by: Suraj Khurana <64310724+surajkhurana@users.noreply.github.com>
2020-05-30 11:53:53 +02:00
Suraj Khurana 15bcc92dd1 Improved: Converted updatePayment service from mini-lang to groovy.
(OFBIZ-11480)
Thanks Devanshu Vyas for reporting and Priya Sharma for the patch.
2020-05-23 17:48:54 +05:30
Suraj Khurana 9e194b0e9a Improved: Converted createPaymentAndApplicationForParty service from mini-lang to groovy
(OFBIZ-11491)
Thanks Devanshu Vyas for reporting and Sourabh Punyani for providing the patch.
2020-05-23 15:57:21 +05:30
Suraj Khurana 21a8bfaef7 Improved: Converted massChangePaymentStatus service from mini-lang to groovy.
(OFBIZ-11498)
Thanks Devanshu Vyas for reporting and Rushikesh Mawal for initial patch.
2020-05-23 15:23:13 +05:30
Suraj Khurana c21683e30b Improved: Converted createPaymentContent, updatePaymentContent services from mini-lang to groovy. (#155)
(OFBIZ-11501)(OFBIZ-11502)
Thanks Devanshu Vyas for reporting and Sourabh Punyani for providing the patch.
2020-05-23 12:38:07 +05:30
Suraj Khurana 89016fa71e Improved: Converted getPaymentRunningTotal service from mini-lang to groovy DSL
(OFBIZ-11488)
Thanks Nitish Mishra for the patch and Devanshu Vyas for reporting and review.
2020-05-23 10:27:50 +05:30
Jacques Le Roux aef9382a9c Implemented: Convert createPayment service from mini-lang to groovy DSL
(OFBIZ-11479)

Better code with Groovy truth

Thanks: Pawan Verma
2020-04-09 14:27:16 +02:00
Jacques Le Roux b8848355d1 Implemented: Convert createPayment service from mini-lang to groovy DSL
(OFBIZ-11479)

jleroux: I have only changed the MODULE name (and uppercased it)

Thanks: Priya Sharma
2020-04-09 11:13:09 +02:00
Aditya Sharma 46e9638424 Fixed: redundant license text
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867745 13f79535-47bb-0310-9956-ffa450edef68
2019-09-30 06:41:03 +00:00
Mathieu Lirzin 9b68a55d64 Improved: Compile groovy integration tests
(OFBIZ-11165)

Since there is no need for dynamic reload for integration tests,
it is better to compile Groovy tests.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1865786 13f79535-47bb-0310-9956-ffa450edef68
2019-08-23 18:00:01 +00:00
Pawan Verma 47dae50622 Fixed: Issue of agreement overview does not show names of parties.
(OFBIZ-10900)
Thanks Pierre Smits for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1861849 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 11:48:52 +00:00
Mridul Pathak b61dacdf59 Improved: Unit test case for service - getPayments.
(OFBIZ-9092)

Thanks Deepak Nigam for reporting and providing initial patch and Yogesh Naroliya for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1861829 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 09:57:53 +00:00
Jacques Le Roux 08f0b84462 Improved: no functional change, adds missing license headers
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1860902 13f79535-47bb-0310-9956-ffa450edef68
2019-06-09 13:08:08 +00:00
Jacques Le Roux 28e119027c Improved: Use Groovy Truth instead of UtilValidate Class in Groovy
(OFBIZ-11064)

As we all know, Groovy is a powerful language with great built-in functions. 
Groovy Truth[1] is one of them, which is not used properly in our code base. 
We have used UtilValidate Class to validate arguments for Empty or NotEmpty, 
which can easily be done in groovy with built-in functionality[1].
 
Current Code: if (UtilValidate.isNotEmpty(locations)) { ... }
Groovy Built-in Code: if (locations) { ... }
 
[1] - http://groovy-lang.org/semantics.html#Groovy-Truth
 
We need to careful for some points while we change this:
Like:
maxRetry = 0
if (!maxRetry)
{  // Not set, use a default  maxRetry = -1 }

Because groovy evaluates zero to be false, it wouldn't be possible to set
maxRetry to zero.  So it's best not to use groovy truth for null-checks on
numbers in some cases. 
 
Thanks: Pawan Verma

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1860051 13f79535-47bb-0310-9956-ffa450edef68
2019-05-26 10:36:16 +00:00
Suraj Khurana 84f795d2e0 Improved: Unit test case for service - quickSendPayment.
(OFBIZ-9086)
Thanks Deepak Nigam for reporting the ticket and Anushi Gupta for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858283 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 15:34:37 +00:00
Suraj Khurana 46140993a1 Improved: Unit test case for service - setPaymentStatus.
(OFBIZ-9084)
Thanks Deepak Nigam for reporting and Anushi Gupta for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858267 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 12:02:22 +00:00
Suraj Khurana 3993d23bf8 Improved: Unit test case for service - createInvoiceContent.
(OFBIZ-8932)
Thanks Deepak Nigam for reporting and Vivek Singh Bisen for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858260 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 09:49:00 +00:00
Suraj Khurana d6fc9b2359 Added: Unit test case for service - createAcctgTrans.
(OFBIZ-1463)
Thanks Deepak Nigam for reporting and Yogesh Naroliya for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1855077 13f79535-47bb-0310-9956-ffa450edef68
2019-03-09 05:07:52 +00:00
Suraj Khurana 612165f982 Fixed: Corrected typo in last commit.
(OFBIZ-9115)
Thanks Michael Brohl for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851179 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 15:55:29 +00:00
Suraj Khurana be6b60a8f6 Added:Unit test case for service - updatePaymentGatewayConfig.
(OFBIZ-9115)
Thanks Deepak Nigam for reporting and Yogesh Naroliya for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851154 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 08:39:11 +00:00
Suraj Khurana 5283691156 Added:Unit test case for service - createPayment.
(OFBIZ-9083)
Thanks Deepak Nigam for reporting and Yogesh Naroliya for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851148 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 08:14:18 +00:00
Deepak Dixit 42d0e01cbc Improved: Convert createBudget service to entity-auto
(OFBIZ-10715)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1849024 13f79535-47bb-0310-9956-ffa450edef68
2018-12-16 12:21:52 +00:00
Nicolas Malin acfe87067e Improved: Convert InvoiceServices.xml mini lang to groovy
(OFBIZ-9986)
Convert services getNextInvoiceId, invoiceSequenceEnforced and invoiceSequenceRestart from minilang to groovy.
This is a subtask of OFBIZ-9350 Deprecate Mini Lang

Thanks to Leila Mekika for this issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1839778 13f79535-47bb-0310-9956-ffa450edef68
2018-08-31 17:29:55 +00:00
Deepak Dixit a4da06cb56 Fixed: Not able to delete PartyRate
(OFBIZ-10483)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1835964 13f79535-47bb-0310-9956-ffa450edef68
2018-07-15 10:47:55 +00:00
Akash Jain b792635558 Fixed: Not able to expire the rate amount and an error is displayed in Workeffort (OFBIZ-10114)
Thanks, Rubia Elza Joshep and Chandrashekhar Dhakad for your contibution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1835887 13f79535-47bb-0310-9956-ffa450edef68
2018-07-14 09:02:51 +00:00
Nicolas Malin 55c64af90d Improved: Resolve shipping address from Invoice
(OFBIZ-10249)
In some country (like european) you need to indicate on your sales invoice where you ship the finish good product related.
To help this case, I added a new worker function (InvoiceWorker.getShippingAddress) to found information from an invoice and improve the generic EditInvoice.groovy and the invoice ftl template to display it as example.
To homogenize postal address displaying with order I use the subscreen PartyScreens.xml#postalAddressPdfFormatter on the invoice ftl template

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1835028 13f79535-47bb-0310-9956-ffa450edef68
2018-07-03 21:58:32 +00:00
Nicolas Malin b48d0cadc5 revert revision 1830301 that contains mix improvement, i will recommit them correclty
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1830302 13f79535-47bb-0310-9956-ffa450edef68
2018-04-27 07:26:33 +00:00
Nicolas Malin 2695743cae Fixed: ConfigXMLReader - Events are not executed in the order defined
(OFBIZ-10369)
The events contained in the controller configuration for first-visit, pre-post processor and before-after login are executed in arbitrary order rather than the defined order.
If we define an event configuration as follow:

    <after-login>
        <event name=keepCartUpdated type=java path=org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents invoke=keepCartUpdated/>
        <event name=restoreAutoSaveList type=java path=org.apache.ofbiz.order.shoppinglist.ShoppingListEvents invoke=restoreAutoSaveList/>
        <event name=saveCartToAutoSaveList type=java path=org.apache.ofbiz.order.shoppinglist.ShoppingListEvents invoke=saveCartToAutoSaveList/>
    </after-login>

We wait that OFBIz run keepCartUpdated, restoreAutoSaveList and after saveCartToAutoSaveList event but the HashMap who organise them return arbitrary order and can return saveCartToAutoSaveList, keepCartUpdated and restoreAutoSaveList. Convert the HashMap to LinkedHashMap help to keep the loaded order.

Thanks to Vikas Mayur for solve this issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1830301 13f79535-47bb-0310-9956-ffa450edef68
2018-04-27 07:21:47 +00:00
Deepak Dixit 7e19de9966 Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029)
Applied slightly modified patch, rearrange import properly, 
Thanks Suraj Khurana for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818003 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 12:03:17 +00:00
Deepak Dixit 63258e90f8 Reverted r#1817989, workign fine locally, reverted for now will check and commit again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817998 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 10:42:32 +00:00
Deepak Dixit d1f85a7e5d Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029)
Applied slightly modified patch, rearrange import properly, 
Thanks Suraj Khurana for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817989 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 09:21:33 +00:00
Nicolas Malin 526d09eb47 Improved: Migrate BudgetServiceTest from minilang to groovy
With the issue "Convert BudgetServices.xml mini lang to groovy" (OFBIZ-9985)
and issue "Implement Groovy test in testtools" (OFBIZ-9996)
I converted the related test AutoAcctgBudgetTests from minilang to groovy.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1816645 13f79535-47bb-0310-9956-ffa450edef68
2017-11-29 19:18:51 +00:00
Nicolas Malin 904c3d1fd9 Improved: Convert BudgetServices.xml mini lang to groovy (OFBIZ-9985)
Just migrate BudgetServices.xml to groovy file version related to OFBIZ-9350 Deprecate Mini Lang
Thanks to Leila Mekika for resolve this issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1816482 13f79535-47bb-0310-9956-ffa450edef68
2017-11-27 18:04:08 +00:00
Akash Jain b18fdf7f7d Fixed: Issue while removing RateAmount Record, applied patch from jira issue (OFBIZ-9904)
Thanks, Parakh Maheshwari and Suraj Khurana for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1813608 13f79535-47bb-0310-9956-ffa450edef68
2017-10-28 11:11:19 +00:00
Jacques Le Roux 15deb25aae No functional change, fixes wrong ASL2 headers I introduced recently
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812235 13f79535-47bb-0310-9956-ffa450edef68
2017-10-15 21:02:52 +00:00
Jacques Le Roux 2382cd9cbd No functional change, these files were missing the ASL2 header
I stop here, please help at https://ci.apache.org/projects/ofbiz/rat-output.html

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812225 13f79535-47bb-0310-9956-ffa450edef68
2017-10-15 17:40:59 +00:00