Commit Graph
7832 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
Jacques Le Roux a941c13879 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885140 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 19:42:43 +00:00
Jacques Le Roux 57ee595bc2 Fix a bug reported by Arun Patidar at https://issues.apache.org/jira/browse/OFBIZ-3272 "Delete links for on Catalog-> Promos->Rules is not working." OFBIZ-3272
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885122 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 17:57:17 +00:00
Jacques Le Roux 9b5c289ab0 More uses of is(Not)Empty (certainly last)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885116 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 17:19:33 +00:00
Jacques Le Roux 47b0eff762 More uses of is(Not)Empty
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885112 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 16:27:42 +00:00
Jacques Le Roux e07ab48fb4 Some cleaning related to is(Not)Empty
* remove duplicate ()
* remove casts no longer needed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885103 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 15:46:52 +00:00
Vikas Mayur aeda03e7c9 Its better to show description instead of ID.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885094 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 14:17:50 +00:00
Jacques Le Roux 569a4afeea Some cleaning related to isEmpty
* remove duplicate ()
* remove casts no longer needed

I'm doing these last tasks around isEmpty and isNotEmpty mostly to be sure that nothing has slipped in. Despite I have been very careful, I prefer double check.

+ one typo in ofbizSelenium help (not sure this file is used yet though, seems to be missing some parts which are commented out, for now I guess)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885093 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 14:08:16 +00:00
Jacques Le Roux 2777b83223 Fix r885091 where isNotEmpty has been used by error instead of isEmpty
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885092 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 13:59:45 +00:00
Jacques Le Roux 5d4b9b5982 More uses of isEmpty(expr) instead of (expr == null) || (expr.size() == 0
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885091 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 13:31:52 +00:00
Vikas Mayur 69b4609a70 Replaced the permission required to update/delete a contact mech for Facility with correct permission. Also added permission check to create a facility contact mech.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885087 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 12:12:56 +00:00
Jacques Le Roux e43c404c34 Fix some typos in HELP
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884874 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 13:41:48 +00:00
Ashish Vijaywargiya f93a26c26b Applied patch from jira issue OFBIZ-3264 - OFBiz Change cart item price according to the price role.
Working Area: OnePageCheckout >> ShoppingCart.

Change minicart item price according to the price rule that will change according to the item quantity.
A product have different price as following:
A product feature contain different price rule with different condition for action like
1 product ---> Price $10.00
50 product ----> Price $8.00 (productPriceAction.amount = "-20.0" with productPriceActionTypeId="PRICE_POL").
If we change the quantity on shoppincart in OnePageCheckout the item price is not reflecting in the cart.

For this we need to add an out item price from getShoppingCartData service so that we can update value in the OnePageCheckout shoppingcart.

Thanks Brajesh & Rishi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884780 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 08:24:16 +00:00
Jacques Le Roux fffdd4175d A patch from Arpit Singh Pandya "Error is not Handle for Inventory, if wrong productId is passed, it is breaking the ftl." (https://issues.apache.org/jira/browse/OFBIZ-3265) - OFBIZ-3265
Steps to generate the problem
– Go to https://demo.ofbiz.org/catalog/control/main
– In Right bar at Search Products section Leave Product Id.
– Select "Inventory" in "Product Jump" DropDown.

It is breaking the ProductInventorySummary.ftl and EditProductInventoryItems.ftl code. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884758 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 07:25:06 +00:00
Jacopo Cappellato 099cd47379 Hidden marketing package specific information for non marketing package products in the inventory page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884653 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 17:27:22 +00:00
Jacopo Cappellato 00db5e864c Completed production runs should not be considered by the getProductManufacturingSummaryByFacility service.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884615 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 16:05:12 +00:00
Jacopo Cappellato eee2746ed7 Misc enhancements to the "shipment plan" screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884592 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 15:38:37 +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 b1dfdbbf6a production runs are now sorted by start date.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884569 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 14:37:36 +00:00
Jacopo Cappellato 08289da32f Cleaned up the "work with shipment plan" screen. Fixed a few bugs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884564 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 14:26:14 +00:00
Ashish Vijaywargiya 2b787a499d Shown product lookup instead of text. Patch from Akash Jain.
Lookup added at:
(1) Go to Facility > Shipments, depress  Find Shipment(s) link.
(2) Depress any shipment Id (hyperlink) which have Input status.
(3) Depress Items tab, there should be product lookup for Product Id.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884556 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 13:57:39 +00:00
Hans Bakker 441dbff981 dutch translation files from pierre OFBIZ-3212
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884511 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 11:08:58 +00:00
Ashish Vijaywargiya 7a2bd27321 Layout fixes so that screen looks consistent and similar to the other existing screens present OOTB https://localhost:28443/facility/control/FindFacilityLocation?facilityId=WebStoreWarehouse.
Thanks Chandan for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884467 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 08:51:38 +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
Bruno Busco 0cf076fb20 Moved the "CatalogTabBar" Menus from the "body" decorator-section to the "pre-body" decorator section in the CommonCatalogDecorator.
This makes better the rendering of themes such as Dropping Crumbs.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884034 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 11:04:41 +00:00
Jacques Le Roux 70d7a15dfb Partially fix an issue I discussed with Akash on dev ML on how to format decimals in prices
* Mostly parameterize UtilFormatOut.formatPrice() from general.properties
* I removed unused currency.decimal.format calls in CheckOutEvents class
* Also removed unused priceNumberFormat in UtilFormatOut class

Still have to fix 11 harcoded  "##0.00" in ftl files using ofbizCurrency 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884023 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 10:43:09 +00:00
Adam Heath 8846568006 In the Product/Parties screen, the link to the related party was broken.
Instead of showing the related party, it would show the user who was
logged into the partymgr backend.  The patch that fixed this was
provided by Ean Schuessler in
(https://issues.apache.org/jira/browse/OFBIZ-3258) OFBIZ-3258

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883933 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 00:31:25 +00:00
Jacopo Cappellato 1aa3f03573 Misc fixes for tests for gl postings, and also a couple of bug fixes discovered playing with the tests.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883796 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 17:30:55 +00:00
Bruno Busco ec1d4bb0f2 SFA 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@883786 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 17:01:52 +00:00
Bruno Busco eb5ec98a7d Marketing component
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@883776 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 16:44:59 +00:00
Bruno Busco 964588402b Content and Humanres component
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@883769 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 16:30:31 +00:00
Ashish Vijaywargiya d0929dde7d Lookup form will not show values by default it will show resultant list only on clicking Lookup button on the lookup form.
Thanks Akash for the contribution.
Special thanks to Pranay for commenting to do this improvement.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883700 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 14:16:10 +00:00
Hans Bakker 029dee7381 added the warehouse processing for the ordersales entities. Contribution by our Antwebsystems employee Tom
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883699 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 14:07:47 +00:00
Jacopo Cappellato 03ed509c46 Fixed failing accounting test.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883688 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 13:32:37 +00:00
Bruno Busco a35ef9c0cd Product component
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@883671 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 12:42:37 +00:00
Jacques Le Roux 7775b59023 Some itemizedlists and orderedlists in Setup Help.
I used cdata in HELP_SystemInfoNotes.xml because username is a docbook reserved word and I was unable to use author mode.
BTW I did not find in HELPUI where HELP_SystemInfoNotes.xml is used...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883663 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 11:38:07 +00:00
Ashish Vijaywargiya ec7c9da36d Applied patch from jira issue OFBIZ-3252 - Add Supplier for Product, it is showing warning on the console.
-- When we are going to associate supplier for any product from catalog, it is showing warning on console.

Thanks Arpit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883646 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 10:23:42 +00:00
Jacopo Cappellato 1cc8ea400a Fixed entity definition for new olap entities in the order component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883645 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 10:23:33 +00:00
Jacopo Cappellato f4aa6859e3 Fixed test that was failing due to the changes I did to demo data for accounting. Enhanced the comments.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883642 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 09:57:23 +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 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
Jacques Le Roux c72b29cb1f Use UtilValidate.isNotEmpty methods instead of (obj != null) || (obj.length > 0) and (obj != null) || (obj.size > 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:41:34 +00:00
Jacques Le Roux 5518e9baf8 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
Complete r883492

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883516 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 22:02:05 +00:00
Jacques Le Roux e839974fe7 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.length == 0)
Complete r883507


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883508 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 21:48:18 +00:00
Jacques Le Roux 4e0d303e06 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.length == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883507 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 21:42:18 +00:00
Jacques Le Roux 8ae9319710 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883492 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 20:34:27 +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