Commit Graph
212 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
Jacopo Cappellato 3a97100842 Fix for the initial value of inventory gl account.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883468 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 19:16:22 +00:00
Jacopo Cappellato 3279f9361e Small fixes for comments and formatting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883449 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:35:26 +00:00
Jacopo Cappellato 287200a9ca A bunch of enhancements to demo data related to general ledger:
1) the value of inventory in gl now matches the value of inventory items
2) the purchase cost of fixed assets also matches the value in gl
3) fixed several demo accouting transactions with better accounts

Now the Balance Sheet looks in much better shape (but there is still a lot to do).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883445 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:18:01 +00:00
Jacques Le Roux 96ca14f622 A patch from Sharan Foga "Special feature to allow submitting patches for online help update" (https://issues.apache.org/jira/browse/OFBIZ-2219) - OFBIZ-2219
Frmatting and tidy up using the itemized and orderedlist docbook commands for Tax Authorities. I've also included some documentation on the Bank Reconciliation process.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882452 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 08:52:53 +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
Jacques Le Roux b53c6ab6d0 Some itemizedlists and orderedlists in Accounting Help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882067 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 08:03:56 +00:00
Jacques Le Roux dd66fd9dd6 Some itemizedlists and orderedlists in Accounting Help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881845 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 17:39:53 +00:00
Scott Gray 353669de67 Corrected CostComponentCalc record, I thing the costComponentCalcId changed from EXAMPLE_COST to TASK_COST_CALC at some point and this was left behind
Partially fixes the testAcctgTransForActualManufacturingCost test

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881728 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 11:28:45 +00:00
Jacques Le Roux 538e4bb715 A patch from Sharan Foga "Special feature to allow submitting patches for online help update" (https://issues.apache.org/jira/browse/OFBIZ-2219) - OFBIZ-2219
This patch is mainly just some help text reformatting using the itemizedlist and orderedlist docbook commands for the Invoices and Payments submenus them easier to read.
I've also corrected a minor spelling mistake in the billing accounts and noticed that the Find Payments help screen was under Invoices instead of Payments so have moved that to the correct place,


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881180 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 07:45:07 +00:00
Jacques Le Roux 07e633136c Some itemizedlists and orderedlists in Accounting Help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881178 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 07:42:12 +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 dbec0ebdb2 Patch from Anurag Singh Sengar(Thanks!) - Added values in dueDate column.
For now "due date" is kept equal to "Invoice Date + 30 Days".

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880685 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 09:18:39 +00:00
Jacques Le Roux cc3a34ff2f Some itemizedlists and orderedlists in Accounting Help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880651 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 08:05:11 +00:00
Jacques Le Roux b24a2e5f0e Some itemizedlists and orderedlists in Accounting Help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836349 13f79535-47bb-0310-9956-ffa450edef68
2009-11-15 12:34:36 +00:00
Jacques Le Roux b52e278fe2 Begin to play with Eclipse/Oxygen docbook editor : some listitems replacing para with *
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835490 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 18:36:06 +00:00
Jacopo Cappellato 2be4c4f4a3 Added new Tax Authority Rate Type for "VAT" taxes.
Reorganized all the invoice item adjustment types so that now they all share the same parent type INVOICE_ADJ; this change is backward compatible because the type id are not modified and I have simply added new parent types.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834429 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 11:10:45 +00:00
Hans Bakker 14c0c8dcda help general index cleanedup, started first features list but need 'orderedlist' docbook tag for that
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834369 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 07:17:17 +00:00
Anil Patel a1f28554e0 Adding description to company credit card demo data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834361 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 06:24:31 +00:00
Ashish Vijaywargiya 7131b2dbe3 Renaming the two fields from PaymentGatewayOrbital entity as reported on Dev mailing list.
1) password -> connectionPassword.
2) class -> engineClass.

Thanks Jacques for your comment on this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831899 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 14:09:15 +00:00
Anil Patel 788723c431 Add relationship from PaymentMethod to FinAccount entity. A finAccount can have zero or more related PaymentMethods.
When making Disbursements using PaymentMethods owned by InternalOrganization, we can create FinAccountTransaction. In reconciliation process user can then add FinAccountTransactions to reconciliation.
In next step we need to improve service creating disbursements to fetch finAccountId from PaymentMethod and put in context to enable finAccountTransaction eca services to create finaccounttransactions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830048 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 03:36:47 +00:00
Jacques Le Roux d55e1e6466 A patch from Aswath Satrasala "Vendor Prepayment - outgoing payment - Setting status to 'Sent' causes exception." (https://issues.apache.org/jira/browse/OFBIZ-2968) - OFBIZ-2968
I created an outgoing payment
PaymentType: VendorPrepayment.
PaymentMethod: Cash
ToParty: DemoSupplier
I click on 'Status to Sent' - an exception occurs

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829527 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 10:41:32 +00:00
Ashish Vijaywargiya ff9b18971d Changes dash (-) to underscore (_) for ID's.
Increase readability and used extensively in ofbiz.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828940 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 06:15:40 +00:00
Anil Patel 338187f754 Updated Financial Account Demo data. Updated Id of two existing demo Financial Accounts, also updated corresponding demo transaction references.
Added Demo Payment Method and EftAccount records for existing demo financial accounts of type Bank account.
Added Demo Payment Method and Credit Card records for existing demo financial Account of type Credit Card.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828934 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 05:13:14 +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 5a527e16b6 Adding Loan financial Account types. Financial Account of Credit Card type can be used for tracking transactions of Business Credit Card (or any other).
Reconciliation Process already available can used for Reconciling Credit Cards activity during certain period.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828292 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 03:46:00 +00:00
Hans Bakker 812bc5cebe Taxauthority help screens from Sharan
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@827946 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 09:54:47 +00:00
Anil Patel 1c5741d91e Moved demo Payment and Invoice Acctg transactions closer to Demo Payments and Invoices in DemoPaymentsInvoices.xml file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825364 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 01:09:07 +00:00
Anil Patel db6fbfcdd5 Renamed AccountingUserDemoData to DemoAccountingUserData.xml. New name is in line with Demo data file naming pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825341 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 23:26:49 +00:00
Anil Patel b8ae8d56b9 Moved Financial Account transaction data to DemoPaymentsInvoices.xml file. Financial account transaction are created while processing payment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825273 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 20:54:18 +00:00
Anil Patel a91389ecbc Renamed PaymentsInvoices.xml file to DemoPaymentsInvoices.xml, Files have demo data so naming them appropriately.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825269 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 20:45:54 +00:00
Hans Bakker 5d8e8a8e85 more help files in accounting, financial accounts from Sharan Foga, added an addition on ofbiz installation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@824216 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 03:40:41 +00:00
Jacques Le Roux afb5504328 A patch from Sumit Pandit "Setup a new SecurityGroup specific for Accounting component." (https://issues.apache.org/jira/browse/OFBIZ-2606) - OFBIZ-2606
To setup of a new SecurityGroup which is dedicated to Accounting component only. It will assigned by all SecurityPermission which are required to handle variuos accounting operations.
Purpose of this will be to be able to create a UserLogin, who will have restricted access to Accounting component only.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818370 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 04:53:43 +00:00
Hans Bakker 58afa3eed8 unwanted files from previous commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818351 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 02:40:14 +00:00
Hans Bakker cb8f86475b Another help update for OFBIZ-2219 by Sharan. Thanks!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818348 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 02:30:51 +00:00
Scott Gray a46440d697 spaces for tabs
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818327 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 00:38:31 +00:00
Hans Bakker dd9ae86426 added another level in the accounting help data, added info and reorganized a bit, also fixed the problem with the selenium info which did not load
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@817524 13f79535-47bb-0310-9956-ffa450edef68
2009-09-22 07:39:53 +00:00
Hans Bakker 7db306e222 some help files for the accounting component contributed by Sharan OFBIZ-2219
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816478 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 06:15:49 +00:00
Jacques Le Roux 69bd17d99b A patch from Deepak Dixit "Demo data in OFBiz that explain "My Group" concept. (https://issues.apache.org/jira/browse/OFBIZ-2435) - OFBIZ-2435
Extend DEV and TESTING group to add few more groups that will be teams. These teams will be a party group in the role of Internal Organization.Each of these teams will have team members (Employees) and a Project Manager. This data will be used for "My Group" concept : It would be used for managing information of a group that the party is member of.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815658 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 08:16:27 +00:00
Hans Bakker e4ad7cdb5b missed some files in commit 815160
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815250 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 10:18:17 +00:00
Hans Bakker 9079c52ff1 more payment help screens by Sharan. Thanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815160 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 06:20:37 +00:00
Hans Bakker 9899efadde added more accounting help files contributed by Sharan OFBIZ-2219
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813657 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 03:17:22 +00:00
Hans Bakker 073906c5df help system now using the mapKey in ContentAssoc so its size is now limited to 100 instead of 20. Suggestion made by Scott: thanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813311 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:49:30 +00:00
Scott Gray e0f56250cd Remove some random copy paste error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813263 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 06:53:21 +00:00
Hans Bakker 710d306ed2 invoice help screens contributed by Sharon Foga
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813189 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 01:21:20 +00:00
Hans Bakker e0ba7104ce create a 'set' of documents: a technical and a user guide and added more info
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812021 13f79535-47bb-0310-9956-ffa450edef68
2009-09-07 07:31:11 +00:00
Hans Bakker d6a65c264a helpscreens placeholders now converted to the docbook V5 format inclusive of namespace support, updated the apache ofbiz document to explain how to create helpscreens, created an ftl template to display the docbook help screens, docbook pdf generation now almost working: it can create a local pdf file, but streaming to the browser does not work..if anybody interested to help me check modelscreenwidget.java line 1206
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@811787 13f79535-47bb-0310-9956-ffa450edef68
2009-09-06 09:39:20 +00:00
Hans Bakker 3b8322e8f9 update docbook data files for V5.0
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810801 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 08:01:51 +00:00