Commit Graph
626 Commits
Author SHA1 Message Date
Jacopo Cappellato 40757f357b Pretty big enhancements for the accounting processes and demo data:
1) completely refactored the trial balance report: now it is based on GLAccountHistory and no more on GlAccountOrganization records; the main advantage is that now it it possible to run the report per different financial time periods
2) big enhancements to the demo data: data was incomplete or wrong and this was affecting reports and the financial time period closing process
3) several fixes for the financial time period process
More fixes and enhancements will come, but now the closing process works fine and the financial reports make sense.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885256 13f79535-47bb-0310-9956-ffa450edef68
2009-11-29 18:32:31 +00:00
Ashish Vijaywargiya 30f2038726 Applied patch from jira issue OFBIZ-3263 - Add bulk status change action on AR find invoice screen, also add ability to print bulk invoices.
Provide following features on screen : https://demo.ofbiz.org/ar/control/FindArInvoices (AR > Find Invoice)
1). Ability to change bulk invoice status.
2). Display invoice running total same as purchase invoice list form of AP.
3). Ability to print sales invoices in bulk.

This patch covers following thing : -
1) Implementation of mentioned functionality.
2) Data for entity UomConversionDated.
3) Improvement in service createAcctgTransForSalesInvoice . 

Thanks Awdesh, Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884572 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 14:58:17 +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 2df5f76d26 Applied patch from jira issue OFBIZ-3236 - Add new field - Closing balance to Reconciliation Screen.
At https://localhost:8443/accounting/control/ViewGlReconciliationWithTransaction?glReconciliationId=9000&finAccountId=SC_CHECKING

    * Add a new field to represent Closing balance of Reconciliation. This will sum of Opening Balance(default 0) + Reconciled Balance (default 0).
    * Also rearrange rows showing information. It is as follows -
          o OLD :
            Gl Reconciliation Name
            Reconciled Balance
            Status
            Reconciled Date
            Opening Balance
          o NEW :
            Gl Reconciliation Name
            Status
            Reconciled Date
            Opening Balance
            Reconciled Balance
            Closing Balance

Thanks Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883601 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 06:23:22 +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
Ashish Vijaywargiya 7aaea71ed8 Applied patch from jira issue - OFBIZ-3235 - List Reconciliations under Financial Account must bee associated to the Finanacial Account.
At - https://demo.ofbiz.org/accounting/control/FindFinAccountReconciliations?finAccountId=SC_CHECKING
At above page, currently all Reconciliation are displaying, but it should display only those Reconciliation which are associated to the 
selected FinAccount.

Thanks Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883588 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 05:32:26 +00:00
Jacopo Cappellato 22df920f51 Small layout improvements to the PDF version of the Balance Sheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883461 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:55:47 +00:00
Anil Patel 914591615d [OFBIZ-3251] Patch to fix Format the FinAccountTransAssociatedWithPayment section in the PaymentOverview screen. Thanks Aswath Satrasala for patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883410 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 17:02:08 +00:00
Bilgin Ismet Ibryam 9190cdeb89 Renamed AgreementWorkEffortAppl entity to AgreementWorkEffortApplic in order to change relation types so that assigning WorkEfforts to Agreements is possible w/o specifying an agreementItemSeqId.
Added a migrateAgreementWorkEffortAppl service to migrate existing data to the new entity.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883140 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 20:17:38 +00:00
Bruno Busco 342e9cb614 Accounting application
Moved TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
This makes better the rendering of themes such as Dropping Crumbs.

Removed several redundant <section><widget> tags also

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883139 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 20:14:11 +00:00
Bruno Busco e4c40b9a3c Moved several TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
Having the TabBar menu in the "pre-body" seems to be the right pattern (already present in several screens) that should always be followed.
This change allows a much better rendering of the Dropping Crumbs while having a very little TabBar menu shift in other themes.
All other screens will be changed accordingly.
This commit also fixes OFBIZ-3240

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883020 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 00:39:41 +00:00
Jacques Le Roux 4094fe09ad Fix a possible conflict (MODE is a SQL reserved word). Thanks to Adrian on dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882337 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 22:28:56 +00:00
Jacques Le Roux 65601eeccd A patch from Abdullah Shaikh "SagePay payment gateway integrated" (https://issues.apache.org/jira/browse/OFBIZ-3180) - OFBIZ-3180
SagePay payment gateway integrated. All the gateway parameters are configurable using the Payment gateway configuration, also the transaction types that are available in sagepay are configurable.

I moved the httpclient httpcore jars to base/lib (also new jcip-annotations-1.0.jar)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882103 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 11:01:29 +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
Ashish Vijaywargiya 2a7ac0293a Applied patch from jira issue OFBIZ-3209 - Modify AR/AP main screen to be a portal page.
Modify AR/AP main screen to be a portal page. Show list of "Past Due Invoices" and "Invoices Due Soon" in different portlets in AR/AP.

Thanks Anurag for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880795 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 15:27:11 +00:00
Jacques Le Roux 39d105f92f Reverted changes 836044 following Adrian's issue report in https://issues.apache.org/jira/browse/OFBIZ-3206 "Recent Markup Changes Break Layout"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880658 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 08:27:36 +00:00
Bruno Busco f6fe95d163 Reverted changes 836143 and 836137 following Adrian's issue report in https://issues.apache.org/jira/browse/OFBIZ-3206 "Recent Markup Changes Break Layout"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880628 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 06:49:10 +00:00
Bruno Busco 1bba0e374e Moved TabBar menus to tabbar decorator-section for Invoices and Payments screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836143 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 08:41:35 +00:00
Jacques Le Roux 5fc931c191 A patch from Bruno Busco "A new droppingcrumbs theme" (https://issues.apache.org/jira/browse/OFBIZ-3156) - OFBIZ-3156
An updated patch to be used to show correctly the tabbars with this theme.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836044 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 22:47:44 +00:00
Anil Patel 2d9f0497bf Bulk print Invoices.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835709 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 02:16:54 +00:00
Anil Patel 7af265dd3a Screenlets for Quick view into invoices past due and invoices coming due soon.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835622 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 22:55:35 +00:00
Ashish Vijaywargiya 0685b12452 Applied patch from Parimal Gain - Getting error in create PartyAccounting Preference record.
To reproduce the issue perform following steps -

    * Select Organizations at https://localhost:8443/accounting/control/PartyAcctgPreference (say Testing Team 1)
    * After selection at next page fill form by required fields.
    * Submit form by click on "Add" button.
    * You will get error message here.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835359 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 12:07:25 +00:00
Scott Gray dec48968aa Removed a stack of unnecessary currency formatting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835313 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 09:25:52 +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
Hans Bakker da9bc51bf9 allow 'safe' html in invoice description and message
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835204 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 02:57:05 +00:00
Anil Patel 8a99498832 Adding finAccountName and ownerParty to finAcount form.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835202 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 02:38:38 +00:00
Anil Patel 310ef32b14 Fixed type reported by Adam, also changed event from focus to onChange.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835038 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 19:58:04 +00:00
Anil Patel 0ef1031b3c Reorganized acctgtransentry form into two columns. removed attribute setting that don't apply to single type form.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834689 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 21:45:55 +00:00
Anil Patel 90492f6f54 updated menu name to simple and generic. Updated screens using it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834623 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 19:33:57 +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 52e7a3ad66 Removed extra container around labels. Apply h1 (or h2, h3) style to label instead.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834376 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 07:38:24 +00:00
Anil Patel f20d6df304 Moved call to getPartyAccountingPreferences from PartyAcctgPreference screen to form. This is much more flexible.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834359 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 06:07:21 +00:00
Anil Patel 330c88d9e9 Arranged AcctgTrans view in two columns. Corrected spelling for productId.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834334 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 04:18:44 +00:00
Anil Patel 3a26508dea Reformatting, no functional changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834327 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 03:34:52 +00:00
Anil Patel cf19810478 removed field-group. Form is looking lot better without them.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834324 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 03:31:32 +00:00
Anil Patel d84e045585 Improve Invoice Terms rendering. Using UiLables and Currency formatting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834251 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 21:55:45 +00:00
Anil Patel 7edd7e8170 Split AcctgTrans form fields into two column.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834009 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 10:36:47 +00:00
Anil Patel 5719289bde Update paymentgroupmember list. Now its consistent with pdf version.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834000 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 09:04:25 +00:00
Anil Patel 5c87c50f28 Adding PaymentAndTypeAndCreditCard. Allows to filter payments by credit card type.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833980 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 06:49:18 +00:00
Anil Patel 4d1a2e1a59 Re-fit find options form into two column layout.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833741 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 20:00:43 +00:00
Anil Patel 5b91053be6 Show PaymentMethod description and PaymentMethodId. in Payment Header.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833642 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 07:33:11 +00:00
Anil Patel 61b6711a00 Renamed CommonAdminDecorator to CommonGlSetupDecorator, new name is close to the purpose. Added commonGlSetupDecoratorLocation context parameter. Allows easy way to override decorator in derived applications.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833638 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 07:11:31 +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
Bilgin Ismet Ibryam 8d98177970 Added missing permission check to an ajax screen.
Removed a wrong parameter name.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832919 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 23:54:36 +00:00
Anil Patel e69b9bc5a2 Removed duplicate definition of CommonPartyDecorator. Added partyDecoratorLocation parameter to ar/ap web.xml file so they can find CommonPartyDecorator.
This issues was discussed on list after r829392 commit in response to patch on OFBIZ-3080.
 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831920 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 15:32:39 +00:00
Anil Patel 8ca9954e5f When creating AP payment use PaymentMethod of organizationParty. FinAccount Transactions are created by fetching finAccountId from PaymentMethod.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831638 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 04:28:33 +00:00
Anil Patel 6589d8a4e2 Updated Check Run process to use PaymentMethod of paying organizationParty instead of FinAccount. finAccountId is now fetched from PaymentMethod and finAccount Transaction is created.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831637 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 04:08:22 +00:00
Ashish Vijaywargiya 6f05e4881c Applied patch from jira issue OFBIZ-3088 - Getting error on the console: Error parsing '${uiLabelMap.}'.
Getting error on the console after hitting following url :
https://localhost:8443/accounting/control/AdminMain?organizationPartyId=Company

Error:
2009-10-26 11:44:57,186 (http-0.0.0.0-8443-4) [FlexibleStringExpander.java:405:ERROR] Error evaluating expression: javax.el.ELException: Error parsing '${uiLabelMap.}': syntax error at position 13, encountered '}', expected <IDENTIFIER>
2009-10-26 11:44:57,191 (http-0.0.0.0-8443-4) [FlexibleStringExpander.java:405:ERROR] Error evaluating expression: javax.el.ELException: Error parsing '${uiLabelMap.}': syntax error at position 13, encountered '}', expected <IDENTIFIER>
2009-10-26 11:44:57,195 (http-0.0.0.0-8443-4) [FlexibleStringExpander.java:405:ERROR] Error evaluating expression: javax.el.ELException: Error parsing '${uiLabelMap.}': syntax error at position 13, encountered '}', expected <IDENTIFIER>
2009-10-26 11:44:57,199 (http-0.0.0.0-8443-4) [FlexibleStringExpander.java:405:ERROR] Error evaluating expression: javax.el.ELException: Error parsing '${uiLabelMap.}': syntax error at position 13, encountered '}', expected <IDENTIFIER>
2009-10-26 11:44:57,203 (http-0.0.0.0-8443-4) [FlexibleStringExpander.java:405:ERROR] Error evaluating expression: javax.el.ELException: Error parsing '${uiLabelMap.}': syntax error at position 13, encountered '}', expected <IDENTIFIER>
2009-10-26 11:44:57,206 (http-0.0.0.0-8443-4) [FlexibleStringExpander.java:405:ERROR] Error evaluating expression: javax.el.ELException: Error parsing '${uiLabelMap.}': syntax error at position 13, encountered '}', expected <IDENTIFIER>
2009-10-26 11:44:57,209 (http-0.0.0.0-8

Thanks Brajesh / Rishi for your contribution.
 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829794 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 13:42:55 +00:00