| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883646 |
Tue Nov 24 10:23:42 UTC 2009 |
ashish |
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.
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883641 |
Tue Nov 24 09:54:34 UTC 2009 |
ashish |
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.
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl
MODIFY
/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883628 |
Tue Nov 24 09:10:21 UTC 2009 |
ashish |
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.
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
MODIFY
/ofbiz/trunk/applications/accounting/servicedef/services_payment.xml
MODIFY
/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883604 |
Tue Nov 24 06:36:39 UTC 2009 |
ashish |
Applied fix from trunk revision: 883348
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.
|
| Files Changed |
MODIFY
/ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
MODIFY
/ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883601 |
Tue Nov 24 06:23:22 UTC 2009 |
ashish |
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.
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
MODIFY
/ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml
MODIFY
/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
MODIFY
/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883597 |
Tue Nov 24 06:00:34 UTC 2009 |
ashish |
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.
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
MODIFY
/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883588 |
Tue Nov 24 05:32:26 UTC 2009 |
ashish |
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.
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883525 |
Mon Nov 23 22:24:59 UTC 2009 |
hansbak |
fix for using equals operator with null field in performFind service: OFBIZ-3151
|
| Files Changed |
MODIFY
/ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883410 |
Mon Nov 23 17:02:08 UTC 2009 |
apatel |
[OFBIZ-3251] Patch to fix Format the FinAccountTransAssociatedWithPayment section in the PaymentOverview screen. Thanks Aswath Satrasala for patch.
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883387 |
Mon Nov 23 16:09:54 UTC 2009 |
jleroux |
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
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
MODIFY
/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
MODIFY
/ofbiz/trunk/applications/party/config/PartyUiLabels.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883348 |
Mon Nov 23 14:07:40 UTC 2009 |
ashish |
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.
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
MODIFY
/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883291 |
Mon Nov 23 09:33:12 UTC 2009 |
jleroux |
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...
|
| Files Changed |
MODIFY
/ofbiz/trunk/.classpath
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883280 |
Mon Nov 23 08:48:43 UTC 2009 |
jleroux |
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.
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
MODIFY
/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
MODIFY
/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ADD
/ofbiz/trunk/applications/product/webapp/catalog/product/AddAdditionalImages.ftl
MODIFY
/ofbiz/trunk/applications/content/servicedef/services_content.xml
MODIFY
/ofbiz/trunk/applications/product/config/ProductUiLabels.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883020 |
Sun Nov 22 00:39:41 UTC 2009 |
buscob |
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
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
MODIFY
/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
MODIFY
/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
MODIFY
/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
MODIFY
/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
MODIFY
/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
MODIFY
/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#883017 |
Sun Nov 22 00:20:12 UTC 2009 |
jleroux |
A modified patch from Marco Risailit " Add the possibility to filter the list of available countries from the drop down." (https://issues.apache.org/jira/browse/OFBIZ-3192) - OFBIZ-3192
I have used StringUtil.split() and enhanced for loops instead
|
| Files Changed |
MODIFY
/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#882919 |
Sat Nov 21 14:50:05 UTC 2009 |
jleroux |
"Applied fix from trunk for revision: 882918 "
------------------------------------------------------------------------
r882918 | jleroux | 2009-11-21 15:45:40 +0100 (sam. 21 nov. 2009) | 2 lignes
A patch from Carsten Schinzer "Seed data (GEO) for Gemany contains bugs." (https://issues.apache.org/jira/browse/OFBIZ-2759) - OFBIZ-2759
Commited in CTR mode...
------------------------------------------------------------------------
?\026
|
| Files Changed |
MODIFY
/ofbiz/branches/release09.04/framework/common/data/GeoData_DE.xml
MODIFY
/ofbiz/branches/release09.04
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#882918 |
Sat Nov 21 14:45:40 UTC 2009 |
jleroux |
A patch from Carsten Schinzer "Seed data (GEO) for Gemany contains bugs." (https://issues.apache.org/jira/browse/OFBIZ-2759) - OFBIZ-2759
Commited in CTR mode...
|
| Files Changed |
MODIFY
/ofbiz/trunk/framework/common/data/GeoData_DE.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#882883 |
Sat Nov 21 11:22:47 UTC 2009 |
jleroux |
A patch from Pierre Smits "Improvement of Dutch language file for projectmgr." (https://issues.apache.org/jira/browse/OFBIZ-3212) - OFBIZ-3212
|
| Files Changed |
MODIFY
/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#882631 |
Fri Nov 20 16:25:07 UTC 2009 |
jleroux |
A patch from Carsten Schinzer " Extend ContentOperationData for LEGAL_INFO." (https://issues.apache.org/jira/browse/OFBIZ-3234) - OFBIZ-3234
The ContentOperationsData.xml file lists ContentPurposeTypes.
I found that among the typical company / ecommerce content, there is also legal information such as: Terms and Conditions, Imprint / Legal Notices, Data Protection Policies, other policies.
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/content/data/ContentOperationData.xml
|
| Repository |
Revision |
Date |
User |
Message |
| ASF |
#882618 |
Fri Nov 20 15:54:39 UTC 2009 |
ashish |
Applied patch from jira issue OFBIZ-3077 - Error for productStoreId when click on productId link from showcart of purchase order.
Steps regenerate error:
1) Hit url: https://localhost:8443/ordermgr/control/orderentry
2) Select purchase order with supplier
3) Add product for order
4) Click on the productId from showcart page
it will generate error as following
org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productdetail: java.lang.NullPointerException: Cannot get property 'productStoreId' on null object (Cannot get property 'productStoreId' on null object)
Notes from Mridul:
As Joe has already stated that we need to do few adjustments in the code based on presence of productStoreId. I would vote for:
1. Showing all reviews.
2. Skipping surveys.
The third section, which is the most important one and needs productStoreId is getProductVariantTree service invoked in ProductDetail.groovy (line 232). getProductVariantTree service needs productStoreId to get available inventory. In case of PO's we don't need to check for available inventory at all. Now for being able to use the same code to display product detail page in case of a PO, we will need to make modifications to getProductVariantTree service too, which can be done in two ways:
1. Add a boolean IN attribute checkInventory to service definition, if its true check the available inventory and if false do not.
2. A check on productStoreId in the implementation can serve our purpose too.
I like #1 more as it won't eliminate importance of productStoreId in case of a sales order. Looking forward to suggestions from community to handle this situation.
Thanks Amit for the contribution. Mridul Thanks a lot for providing useful notes for the implementation.
Guys, I appreciate your coordination on this!
|
| Files Changed |
MODIFY
/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
MODIFY
/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
MODIFY
/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
MODIFY
/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
MODIFY
/ofbiz/trunk/applications/product/servicedef/services_view.xml
|
