Commit Graph
85 Commits
Author SHA1 Message Date
Jacques Le Roux ec2b84341e Reverted: "Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)"
This reverts commit 17eb2e4cf7.

It does not work when using <<target="javascript:........>>
I could change those cases but it's easier and safer to simply revert back to
target-type!

Thanks: James for report
2020-12-18 11:08:32 +01:00
Jacques Le Roux 17eb2e4cf7 Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)
Same for sub-hyperlink
2020-12-11 16:52:04 +01:00
Jacques Le Roux c98def05a3 Fixed: EditExample always update status, because current Status not shown
(OFBIZ-11230)

In the EditExample Form, the drop-down is populates with the Valid change status 
only. So current status is not in the list and the status print in the drop-down 
is the next authorized. I want to modify exampleName or exampleType, I go to 
editExample and change what I want and validate. The problem is status is also 
changed!

There are 12 other same or similar cases. For the first of them (in FinAccount) 
there is the same bug: when I change FinAccount Name, status change too. If I 
add current="first-in-list" in the tag drop-down it works 

jleroux: Quote is a peculiar case due to OFBIZ-7337 which was a wrong fix
 
Thanks: Oliver for the analysis and the fix 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1868545 13f79535-47bb-0310-9956-ffa450edef68
2019-10-17 12:19:33 +00:00
Suraj Khurana ebb6d7c6fa Improved: In AddFinAccountTrans selectable glAccountId values are sorted on glAccountId.
(OFBIZ-10846)
Thanks Pierre Smits for reporting, Pawan Verma for the patch and Jacques Le Roux for comment.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858240 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 05:49:12 +00:00
Deepak Dixit d09255c0b7 Reverted: Minilang code readability and consistency improvements done at r#1768222, this commit reversed key and description of drop-down in the code.
(OFBIZ-9114)

Thanks  Wei Zhang for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1772880 13f79535-47bb-0310-9956-ffa450edef68
2016-12-06 12:37:42 +00:00
Divesh Dutta 70eb7ff508 Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8929) (OFBIZ-8930) (OFBIZ-8953) (OFBIZ-8965) (OFBIZ-8972) (OFBIZ-8986) (OFBIZ-8991) 

Thanks: Ankush Upadhyay, Anuj Jain, Abhijeet for your patches. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768222 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:34:00 +00:00
Divesh Dutta 738a12bec1 Improvement: Miniland code readability and consistency improvements
(OFBIZ-8744) (OFBIZ-8745) (OFBIZ-8746) (OFBIZ-8748) (OFBIZ-8829) (OFBIZ-8830) (OFBIZ-8907) (OFBIZ-8908) (OFBIZ-8924) (OFBIZ-8925) 

Thanks: Ankush Upadhyay , Sega patidar , Abhijeet Ashapure for your patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768219 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:14:04 +00:00
Divesh Dutta 556279917d Improved:Display from date with default to now timestamp and also add asterisk sign to all the forms where it is part of primary key in all the components.
(OFBIZ-7650) (OFBIZ-7651) (OFBIZ-7653) (OFBIZ-7660) (OFBIZ-7662) (OFBIZ-7665) (OFBIZ-7666) (OFBIZ-8028)(OFBIZ-8029) (OFBIZ-8255)

Thanks: Anuj Jain and Ratnesh for the pathes and Swapnil Shah for reporting the issues.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761192 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 11:02:39 +00:00
Pranay Pandey 47b5e12b82 Fix for: Pagination error in Accounting FinAccountForms.
(OFBIZ-8254)

Added paginate target to these forms for fixing the issue: ListFinAccountRoles, ListFinAccountAuths, ListDepositSlips, ListDepositSlipMember and ListFinAccountReconciliations.

Thanks: Chandan Khandelwal for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761127 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 06:48:00 +00:00
Deepak Dixit 834691742b (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Jacques Le Roux c8ba932772 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux 89212904bd Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux 4931db1ed9 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Nicolas Malin ce97afbf6b patch from Pierre Smits : Remove tooltip CommonNotModifRecreat from display fields (OFBIZ-6696), thanks for the screen clean Pierre
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1718970 13f79535-47bb-0310-9956-ffa450edef68
2015-12-09 21:24:44 +00:00
Nicolas Malin 895c9856b3 Cleaning forms code is needed after setting default-value in list-options and entity-options, patch related to OFBIZ-6524 and follows the resolution of OFBIZ-6490 and OFBIZ-6489. Thanks Gil Portenseigne for this effort
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686674 13f79535-47bb-0310-9956-ffa450edef68
2015-06-20 21:58:05 +00:00
Jacques Le Roux 3369dca046 Replaces title="${uiLabelMap.CommonEmptyHeader}" by title=" " where it's known to not be a problem. Here with links styled by widget-style="buttontext"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340373 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 08:45:18 +00:00
Erwan de Ferrieres e0033c6c5c Applying OFBIZ-3694 "Pass Accounting label to Common Label". The AccountingNoRecordFound is now CommonNoRecordFound
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@933890 13f79535-47bb-0310-9956-ffa450edef68
2010-04-14 09:19:52 +00:00
Ashish Vijaywargiya 88a092d2f9 Applied patch from jira issue OFBIZ-3320 - improvement in Find screen.
Fix title of buttons to Find, for all the find screens to maintain consistency. 

Thanks Chandan for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@889084 13f79535-47bb-0310-9956-ffa450edef68
2009-12-10 04:29:19 +00:00
Ashish Vijaywargiya ae9d9ff482 Applied patch from jira issue OFBIZ-3310 - Cancel Pyament Group issue - Can't cancel reconciled payment batch and issued payment check.
Steps to reproduce -
Issue : -1
1.Create few payments in AR .
2.Create a batch payment for newly created payments from screen https://localhost:28443/ar/control/batchPayments (where finAccountId=SC_CHECKING).
3.Go to Financial Account screen and click on transaction tab https://localhost:28443/accounting/control/FindFinAccountTrans?finAccountId=SC_CHECKING.
4.Select GlReconciliationId as "Not Assigned" and click on serach button.
5.Select newly created FinAccountTrans from checkbox.Then select GlReconciliationName from selectbox and click on button "Assign TO reconciliation".
6.This process will associate fin account transaction with reconciliation.
7.Now click on Reconciliation tab and select the FinAccountTransaction.
8.Reconcile the transaction by clicking on Reconcile button.
9.Now the status of reconciliation will be "Reconciled".
10.Status of transaction will be "Approved".
11.Now go to Payment Group or Deposit slip tab, the created payment group will appear with Cancel button in list form.

    * This is not correct.
    * User can not cancel reconciled deposit slip.
      Similiar changes will reflect on following screens : -
      1) https://localhost:8443/ar/control/FindArPaymentGroups
      2) https://localhost:8443/accounting/control/FindPaymentGroup
      3) https://localhost:28443/accounting/control/FindDepositSlips?finAccountId=SC_CHECKING&organizationPartyId=Company

Issue : -2
1) Now go to PurchaseInvoices screen https://localhost:28443/ap/control/FindPurchaseInvoices.
2) Click on search button and select Invoices using checkbox.
3) Select "Issue Check" from select box.
4)Click on Run button.
5)Performing this action fin account transaction will be created in Apporved status .
5) Now go to to https://localhost:28443/ap/control/FindApPaymentGroups screen the created payment group will appear with Cancel button in list form.

    * This is not correct.
    * User can not cancel issued check .

Similiar changes will reflect on following screens : -
1) https://localhost:28443/ap/control/FindApPaymentGroups
2) https://localhost:8443/accounting/control/FindPaymentGroup

Thanks Awdesh & Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@887520 13f79535-47bb-0310-9956-ffa450edef68
2009-12-05 09:04:53 +00:00
Ashish Vijaywargiya db98a7137d Applied patch from jira issue: OFBIZ-3291 - On PaymentGroup screens records are getting repeated and are not filtered on basis of PaymentGroupTypeId.
Thanks Surya & Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@886748 13f79535-47bb-0310-9956-ffa450edef68
2009-12-03 12:05:05 +00:00
Ashish Vijaywargiya 80d193a076 Applied patch from jira issue OFBIZ-3269 - Reconciliation Screen Enhancements.
In Financial Account At Reconciliation Screen (https://demo.ofbiz.org/accounting/control/EditFinAccountReconciliations?finAccountId=ABN_CHECKING), rename field name "Reconciled Date" by "Reconciliation Date".
A write a scheduled service(autoFinAccountReconciliation) which will call once in a day and get all of the reconciliation records whose reconciliation date is set in between current date.

Thanks Sumit & Awdesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885409 13f79535-47bb-0310-9956-ffa450edef68
2009-11-30 13:03:37 +00:00
Ashish Vijaywargiya e6e3877833 This patch contain following improvement : -
1) Added Lookup for "Gl Reconciliation Id"
2) Added Lookup for "Organization Party Id"
3) Added check to show ReconciledBalance only when GlReconciliation balance is "GLREC_RECONCILED"
4) Added field glAccountId in search criteria .
5) On screen "ViewGlReconciliationWithTransaction" Reconciliation Menu bar should come selected .

Thanks Awdesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884402 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 05:30:53 +00:00
Ashish Vijaywargiya 1a80ba8a09 Applied patch from jira OFBIZ-3241 - Cancel Payment Batch - Need to correct error message.
At https://demo.ofbiz.org/ar/control/FindArPaymentGroups
When try to cancel a payment batch which is associated to active reconciliation. Then it is showing success message that "Action is performed successfully", instead of this, it must show error message which inform user that Payment batch associated to Reconciliation can not be cancelled. It is needed to show right message.

Thanks Surya & Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883628 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 09:10:21 +00:00
Ashish Vijaywargiya 064a34c9ce Applied patch from jira issue OFBIZ-3238 - FinAccount Reconciliation Search Result Table - Add new column for Cancel Reconciliation.
At https://localhost:8443/accounting/control/FindFinAccountReconciliations?finAccountId=SC_CHECKING
In search results, add a column to "Cancel Reconciliation" In this column show "Cancel" button to cancel reconciliations which are in CREATED status.

Thanks Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883597 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 06:00:34 +00:00
Anil Patel 39e6724e67 [OFBIZ-3213] patch.
Improvements to PaymentGroup UI.
Fixed issue with List of deposit slips displaying under FinAccount tab are not associated to FinAccount.This list should contain only those deposit slips which are created for selected FinAccount.
Added ordering, Show deposit slips in search result in descending order of effective date.

Thanks Sumit Pandit for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881708 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 10:02:29 +00:00
Anil Patel 606d9facb9 Adding Find Bank Reconciliations screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835287 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 07:53:09 +00:00
Anil Patel 1e602479e8 Added style to paymentgroupmembers list header.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834620 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 19:24:23 +00:00
Hans Bakker 96d54615ca removed default-option='contains' because now set from widget.properties which is the current default
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834379 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 08:12:45 +00:00
Anil Patel e059f19611 [OFBIZ-3171] Patch. Minor looks enhancements to deposit slip screen. Removed Add payment group member screen for deposit slip because right way to do so is from Diposit screen in FinancialAccount.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833631 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 05:27:31 +00:00
Bruno Busco 4740d3a616 Part of OFBIZ-3067 - Menus and form widget files location
Accounting component
Moved forms from webapp to widget folder


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828868 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 21:57:30 +00:00
Jacques Le Roux b7a941d4f6 Revert r813307 on Adrian's request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813893 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 16:02:01 +00:00
Jacques Le Roux a7430a2fc2 A modified patch from Erwan de FERRIERES '"Automatic" sortable table headers" (https://issues.apache.org/jira/browse/OFBIZ-2921) - OFBIZ-2921
I was planning to wait longer, but I can't wait more. I have added a lot of small trivial changes in this patch and they are blocking me to go further on other issues...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813307 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:41:19 +00:00
Anil Patel cf6e700773 User can add openinig balance. Patch from OFBIZ-2918. Thanks Ratnesh for implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812946 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 13:23:32 +00:00
Ashish Vijaywargiya 7a28b8b75a Applied patch from jira issue OFBIZ-2877 - Add a new field nanmed - "statusId" to "GlReconciliation" entity.
Thanks Parimal & Sumit for the Contribution.

Please don't forget to update the info about migration on: http://docs.ofbiz.org/x/XxQ

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809984 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 11:51:29 +00:00
Scott Gray 12566c26b9 Wherever possible changed ELI queries to limit the result set to the actual rows required of the query, should improve time
and memory performance if a cursor isn't being used on large result sets quite a bit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808820 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 08:58:10 +00:00
Anil Patel d086571d4a If reconciliation is started then user cannot add new financial account transaction. Adding a service to check if a GlReconcilation is ready for completion (isGlReconciliationReconciled).
Manual FinancialAccount Transaction now default to CREATED status.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@806588 13f79535-47bb-0310-9956-ffa450edef68
2009-08-21 15:08:50 +00:00
Anil Patel ee49c47716 Create Gl transaction while creating financial transaction. Gl transaction is posted when finaccount transaction is reconciled.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@806276 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 17:51:30 +00:00
Anil Patel 13262d514b Order finaccounts in list by id.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@805767 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 11:56:57 +00:00
Anil Patel 7a0452c162 Status of finaccounttrans is not required.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@805475 13f79535-47bb-0310-9956-ffa450edef68
2009-08-18 16:09:07 +00:00
Ashish Vijaywargiya 7e7438d408 Misc. things are covered in this work:
1) Cancel and PDF button should not be displayed for expired payment group.
2) Fixed an error occurred at Payment Group Overview page, when it has not associated with any member.
3) Update Demo data for GLReconciliatation - assign correct glAccountId (previous - 111000, new - 111100).
4) At Reconciliation tab show  - reconciled balance  at same page, and update algorithm to calculate sum of transaction under reconciliation process. 

Thanks Sumit & Parimal for your contribution.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804866 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 05:29:05 +00:00
Anil Patel 943798a9b9 Add Missing Links for Id in accounting component. Patch from OFBIZ-2826. Thanks Arpit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803543 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 14:49:29 +00:00
Anil Patel 36f928bc42 Financial account reconcile enhancements. Patch from OFBIZ-2816. Thanks Parimal and Rishi for contribution.
Thanks Vince and Eva to help define requirements.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802849 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 16:32:42 +00:00
Anil Patel fcbc3095bf Tools reconcile financial account. Patch from OFBIZ-2816. Thanks Rishi, Sumit and Parimal for contribution. Also Thanks for Vince and Eva for help in designing tools.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802494 13f79535-47bb-0310-9956-ffa450edef68
2009-08-09 06:37:01 +00:00
Anil Patel d11d002355 If reconciliation is created from finaccount screen then its for finaccount, so default glAccountId from finaccount entity.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@800780 13f79535-47bb-0310-9956-ffa450edef68
2009-08-04 13:42:20 +00:00
Anil Patel 0f1f62b2f0 Adding more localization of screen labels. Thanks Arpit, Rishi and Hans for quick reminder.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@800414 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 15:09:23 +00:00
Anil Patel 7ca1a07d0a First version of Financial Account reconciliation tools. Patch from OFBIZ-2791. Thanks Rishi, Parimal, Sumit for implementation.
We got help from Jacopo, Vince and Eva in defining process and design. Thanks for helping build tools.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@800412 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 14:57:51 +00:00
Anil Patel fcd7462572 Added create new deposit payment and create new withdrawal payment option in Financial Account --> deposit/withdraw tab.
Patch from OFBIZ-2768. Thanks Rishi and Arpit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@800209 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 06:22:37 +00:00
Anil Patel a061d9bbaa Add Find/List of deposit slips for the bankaccount. Patch from OFBIZ-2770. Thanks Sumit, Awdesh.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@799191 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 07:16:37 +00:00
Anil Patel 4f94d0b8cc Adding noConditionFind flag to search screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@799181 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 06:33:39 +00:00
Anil Patel 8b084410d0 Expire instead of deleting PaymentGroupMembers.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798805 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 08:09:25 +00:00