Commit Graph
12781 Commits
Author SHA1 Message Date
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
Adrian Crum 0206592d18 JavaDoc updates in the conversion framework. No functional changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883589 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 05:35:18 +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
Adrian Crum df86f46af2 Added Blob<->byte[] converters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883529 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 22:49:06 +00:00
Hans Bakker d0293a5f16 fix for using equals operator with null field in performFind service: OFBIZ-3151
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883525 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 22:24:59 +00:00
Jacques Le Roux d5d543b178 Fix r883508
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883517 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 22:02:49 +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
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
Jacopo Cappellato 7c34d8694c Demo data for a sales invoice that is still not paid; the figures in the balance sheet now are more interesting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883457 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:42:56 +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
Bilgin Ismet Ibryam 803f423dc6 - Fixed wrong style used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883444 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:16:46 +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
Jacques Le Roux ec52afdb2e Correct a label, reported by Sam Hamilton at " Wrong Label used when creating an employee" (https://issues.apache.org/jira/browse/OFBIZ-3248) - OFBIZ-3248
I used BabelFish (http://fr.babelfish.yahoo.com/translate_txt) to do the translations from Customer to Person (but for Romanian, Thai and Hindi where I used http://dictionnaire.sensagent.com/). Thai was the hardest because I did not know how to cut the sentences (it seems there are no words in Thai). I kept, in comments, the labels I was not sure about : hi_IN, ru, th and zh.

It was fun to do this, and amazing to see that all indo-european languages (in OFBiz) use something very near (for Russian I suppose because unable to read). I guess they all use a word which comes from the Latin Persona (which did not change in Italian)

Doing that I found an interesting tool : http://iate.europa.eu

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883387 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 16:09:54 +00:00
Ashish Vijaywargiya 9f43893c28 Applied patch from jira issue OFBIZ-2619 - Issues with Receive PO functionality.
-- updated patch with use of variable name modifiers in UEL arithmetic, as suggested by Adrian. 

Thanks Mridul for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883348 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 14:07:40 +00:00
Jacques Le Roux 7c92156d1c Some other fixes in help files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883333 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 13:15:09 +00:00
Jacques Le Roux 49b2961e9c Fix few things in help files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883329 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 13:02:53 +00:00
Ashish Vijaywargiya 6449e9e2c0 Applied patch from Akash Jain.
Order Lookup is not working properly for Receive Inventory process.

Steps to reproduce :-

(1) Hit url
https://demo.ofbiz.org/facility/control/ReceiveInventory?facilityId=WebStoreWarehouse 
(2) Depress Lookup for Purchase Order Number. 
(3) First time it works proper there is shown list of purchase orders properly. 
(4) Depress LOOKUP button, now there is no purchase order in the result. 

Thanks Scott & Rishi for jumping in b/w and providing your useful comments on it.
For more details please refer: http://markmail.org/message/qrgrlpyk24f4jipy?q=Order+Lookup+is+not+working+properly+for+Receive+Inventory

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883328 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 13:02:51 +00:00
Hans Bakker 8142ef2fdc show communication even screens within in the communication portlet avoiding having required decorators.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883323 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 12:45:36 +00:00
Jacques Le Roux 23f65dfef7 Oops, I put a wrong tag in r883280 while doing some tests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883292 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 09:35:26 +00:00
Jacques Le Roux b8dfabda0e A patch from Erwan de FERRIERES "add path to framework/sql in classpath file" (https://issues.apache.org/jira/browse/OFBIZ-3231) - OFBIZ-3231
With the new framework/sql /* files, we should add the path in the classpath file. If not added, we have errors in eclipse... 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883291 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 09:33:12 +00:00
Jacques Le Roux f64c440775 A patch from Surya Kusumakar "New feature to upload multiple Additional View Images at Product Content." (https://issues.apache.org/jira/browse/OFBIZ-3244) - OFBIZ-3244
Add a new feature in Product Content to add all four images at a time and one can preview those images in larger view on mouse over of particular image. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883280 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 08:48:43 +00:00
Scott Gray b94f973c30 Allow a target and additional parameters to be specified when defining a portal page menu item, for example:
<menu-item name="main" parent-portal-page-value="${parameters.parentPortalPageId}"/>

can now be customized to point to a specific target rather than the default "showPortalPage":
<menu-item name="main" parent-portal-page-value="${parameters.parentPortalPageId}">
    <link target="MyCustomRequest">
        <parameter param-name="myCustomParam" from-field="parameters.myCustomParam"/>
    </link>
</menu-item>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883239 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 04:06:27 +00:00
Scott Gray 0d359fca2c Allow a WidgetWorker.Parameter instance to be created without an Element
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883235 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:34:30 +00:00
Adam Heath 1e2d73707f Switch to ConcurrentHashMap for utilCacheTable.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883230 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:07:01 +00:00
Adam Heath 10bc1da16b Remove all but one constructor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883229 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:06:21 +00:00
Adam Heath c4a0d6d66d Make utilCacheTable private.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883228 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:05:30 +00:00
Adam Heath e4718ddb62 Add a helper method, getUtilCacheTableKeySet, and use that in
FindUtilCache.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883227 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:04:50 +00:00
Adam Heath 07d88a3152 Use getOrCreateUtilCache here too.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883226 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:03:59 +00:00
Adam Heath 6e0fcf060a No longer access utilCacheTable from AbstractCache; this nescessatited
creating a getOrCreateUtilCache helper method.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883225 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:03:20 +00:00
Adam Heath 95264791c2 Move getCacheName out of the synchronized block.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883224 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:02:27 +00:00
Adam Heath 760632627c Add another createUtilCache variant that allows for extra properties to
be looked upped for setting parameters.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883223 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:01:37 +00:00
Adam Heath 8c800494de Fix defaultIndices manipulation, by switching to ConcurrentHashMap; this
has a good side-effect of fixing the total lack of synchronization on
the previous version.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883222 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:00:49 +00:00
Adam Heath b625a1ff4d Make defaultIndex calculation field and method private and static.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883221 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:00:04 +00:00
Adam Heath 0a1ab8a989 Move utilCacheTable.put out of the constructors.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883220 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:59:22 +00:00
Adam Heath f691ed6312 Make utilCacheTable final.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883219 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:58:36 +00:00
Adam Heath b6788006fb Make all constructors private(removing deprecation while doing so), and
then make the name property private/final.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883218 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:57:47 +00:00
Adam Heath 820d11eb97 Deprecate UtilCache constructors, and add a create helper function.
This is the first step to making utilCacheTable concurrent, and
non-blocking.  To do so, the constructor has to have no side-effects.
This means it can't modify utilCacheTable itself; this will be moved to
the helper function created above.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883217 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:56:28 +00:00
Adam Heath 60e0905b7f Fix generics in getUtilCacheTableValuesImage.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883216 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:52:29 +00:00
Scott Gray 393673369f Prevent errors when no portlet description is available
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883192 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 23:52:25 +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
Adam Heath c31e3499ed Add flags to disable joins on DELETE and UPDATE.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883138 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 20:07:29 +00:00
Adam Heath 4976cbb3da Plans that have condition objects now store those in the abstract classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883137 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 20:06:34 +00:00