Commit Graph
560 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 14d65fc10b Applied patch from jira issue OFBIZ-3242 - Add new feature to Bulk Print Invoices.
-- It Applies to findInvoices screen in AR and AP. User selects items from findInvoice search results. Selects Print action and clicks on Run. 

For now  only supported for purchase invoice, for sales invoice we will provide patch shortly.

Thanks Awdesh & Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883641 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 09:54:34 +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
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
Ashish Vijaywargiya 0ff0adf348 Applied patch from Mukesh Marathe to remove the error message from costcenter page after short duration.
Steps to reproduce:
Go to - https://localhost:8443/accounting/control/CostCenters

-- Enter the values for cost center 1, 2 and 3 so that the total is not equals to 100.
-- The error appears on click submit, now correct the values in respective fields so total is equals to 100.
-- On click on submit the values save in the DB, but error still shows on the page - remove error message after short duration.

Thanks Mukesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882535 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 12:28:10 +00:00
Jacques Le Roux eb2fdcdac9 Fix https://issues.apache.org/jira/browse/OFBIZ-3229 in a slightly different way
a) FixedAssetGeoLocation had its error response going to the wrong view "EditFacility" (which did not exist in this controller).
b) taxAuthorityVATReport was pointing to a view-map entry that was commented out; these are not used yet: WIP...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882326 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 22:10:06 +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 f104116283 Moved csv, pdf export view entries close to their corresponding screen view entries.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881029 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 23:01:00 +00:00
Anil Patel c988663d49 saving fromDate and thruDate in context for use in UI only if it came from UI.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881004 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 22:14:06 +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
Ashish Vijaywargiya bd608a43ce Fixed Typo - patch from Sumit Pandit (Thanks!)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836130 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 06:35:52 +00:00
Ashish Vijaywargiya b64228fab1 Applying patch from Sumit Pandit - Better UiLabels.
Thanks Sumit!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836128 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 05:53:38 +00:00
Anil Patel 1aef6f7dae Show reconciliation status on finaccount reconciliation screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835734 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 04:22:12 +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 965f37cbc3 Added new uiLabel for outstanding running total - patch from Awdesh.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835362 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 12:18:25 +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 4ca995c443 Removed sent status for ar payment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835216 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 03:58:29 +00:00
Jacopo Cappellato 0d3c666044 Added "invoice term" block to invoice PDF.
Slightly adjusted the layout of the "orders" block.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834836 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 10:37:14 +00:00
Hans Bakker 3872ac44e9 typo reported by jeremy
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834825 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 10:02:18 +00:00
Jacopo Cappellato 0deb15a7b0 Misc enhancements and cleanups to the invoice PDF report:
1) xsl-fo layout cleanup
2) suppressed the invoiceItemSeqId field from the output document
3) there are now two separate invoice item layouts for the items and and adjustments
4) improved code to retrieve the bill-to-party tax id, required by VAT rules only: now the tax id is retrieved only if in the invoice there are taxes of type VAT_TAX
5) added shipment date if available
6) as required by EU rules for VAT taxes, if there are VAT taxes in the invoice, then a break-down of the VAT amount payable per VAT rate is displayed at the bottom of the invoice

Now most of the mandatory information required by EU/VAT countries as described here:

http://ec.europa.eu/taxation_customs/taxation/vat/traders/invoicing_rules/article_1733_en.htm

are implemented.
Important: the information that are not relevant for "sales tax" invoices (e.g. US invoices) are not rendered if VAT taxes are not available in the invoice.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834486 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 14:49:44 +00:00
Anil Patel fb3242a2c5 Extend InvoiceAndType view, added StatusItem relation and InvoiceType desc alias.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833995 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 08:42:46 +00:00
Jacopo Cappellato f54e9985d1 Hidden the "Description" label if the invoice description is empty; also fixed a NPE check.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833918 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 19:37:05 +00:00
Jacopo Cappellato d3d84f0d2f Removed tax id field from postal address; the same field is already printed under the customer id in the top part of the invoice.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833917 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 19:35:31 +00:00
Anil Patel 74d9d9bf56 Adding mass payment status change to find screen. Also added few more details in payments list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833636 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 06:27:52 +00:00
Anil Patel aba9346bd2 [OFBIZ-3172] Patch to fix description in PaymentMethod field. Thanks Sumit for help.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833632 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 05:31:05 +00:00
Hans Bakker 3464adb949 to be applied value on payment application was without tax: OFBIZ-3057
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833324 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 09:03:59 +00:00
Anil Patel 9b82b0d624 Show more information like, parties, dates, description on all listed invoices.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833226 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 22:55:12 +00:00
Anil Patel 10175e24f5 Fixed up batchPayments to use PaymentAndTypePartyNameView. Added necessary relationship attributes to view entity. Minor looks updates as well for consistency.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832319 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 07:23:03 +00:00
Anil Patel d2c731d03b reformatting, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832313 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 06:46:59 +00:00
Anil Patel 9f76bc5dc3 Added view entity to fetch Payment, PaymentType desc, PaymentMethodType desc, status desc and Party names for display in UI. Fixed depositWithdrawPayment.ftl, now uses view.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832312 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 06:44:30 +00:00
Anil Patel c667cd47bb Use Run UiLabel from CommonUiLabels.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832295 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 04:03:57 +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 ebb7309ba1 Added bulk action for updating invoice status. Also cleaned up javascript code to take advantage of prototype library. Still remains to move javascript in separate file and also css trick to show button disabled when it is.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831648 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 07:22:50 +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
Jacques Le Roux aedeb6ca51 Changes method="POST" to method="post", from Scott's comment about XHTML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829660 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 21:38:47 +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
Ashish Vijaywargiya 3b1266a187 Applied patch from jira issue OFBIZ-3072 - Consistency on List Batch Payments.
https://demo.ofbiz.org/ar/control/batchPayments screen should have the actions in drop-down for the list as like https://demo.ofbiz.org/control/findInvoices

Thanks Chirag for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828661 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 11:27:48 +00:00
Anil Patel b6bad46fd5 Adding Demo Credit Card type Financial Account for Corporate Credit Card. Removed constraints from Menus, constraints were limiting options to Bank Account type only.
Now When Disbursement Payment user should, Select Payment Method Type Credit Card,  and select Credit Card account from financial account dropdown. 
Move payment to Send status. 
Open Credit Card Financial Account, On Transactions tab, select Not Assigned in Gl Reconciliation dropdown. Search for transactions.
Select transaction created above, Select reconciliation from dropdown above list and click assign to reconciliation.   


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828371 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 08:32:23 +00:00
Anil Patel 0610d70c82 Removed condition to show only invoices that have outstanding amount.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826169 13f79535-47bb-0310-9956-ffa450edef68
2009-10-17 03:00:19 +00:00
Anil Patel 85e66f54be Removed bad form action attribute value. Now its just request name instead of full path.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826159 13f79535-47bb-0310-9956-ffa450edef68
2009-10-17 02:04:33 +00:00
Vikas Mayur 55e80c40ae Trival fix to the layout on Edit Invoice form in Bizzness theme, billingAccountId was displaying out of the screenlet body for Purchase Invoice.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825010 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 05:30:18 +00:00
Vikas Mayur b9fab1ea70 Fixed typo, screencvs -> screencsv. Applied patch from Brajesh Patel, part of OFBIZ-3015 (https://issues.apache.org/jira/browse/OFBIZ-3015)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823517 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 11:52:52 +00:00
Ashish Vijaywargiya 128f931c7e Previously due to boolean value was passed in search, which was returning error, now if_exists pass the value of variable.
Patch from Chirag.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821811 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 14:39:49 +00:00
Adrian Crum a4d68934c9 Converted GenericDelegator concrete class references to Delegator interface references.
This commit requires ant clean. Also, external libraries that reference GenericDelegator will need to be updated.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821643 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 00:08:27 +00:00
Ashish Vijaywargiya f5e6ae7b8d Applied patch from jira issue OFBIZ-2994 - Consistency in location of select checkbox.
Thanks Chirag for your contribution on this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821284 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 09:51:52 +00:00
Anil Patel 29d7f61b6a Fix bug reported in OFBIZ-2982. Sharan for bug report and helpful details.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820509 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 01:57:15 +00:00