This reverts commit 17eb2e4cf7.
It does not work when using <<target="javascript:........>>
I could change those cases but it's easier and safer to simply revert back to
target-type!
Thanks: James for report
(OFBIZ-7532)
To display a number we had different possibilities :
* on ftl use the template <@ofbizAmount and <@ofbizCurrency
* by java call a function UtilFormatOut.formatAmount, UtilFormatOut.formatPrice, UtilFormatOut.formatQuantity, etc..
* by form widget, use <display type=accounting-number for accounting but nothing for other
To simplify and homogenize all, I implemented a number type purpose :
* default: display a number by default, use when no purpose is present
* quantity: display a number as a quantity
* amount: display a number as an amount (like price without currency)
* spelled: litteral displaying for a number (use on <@ofbizAmount ftl only before)
* percentage: display a number as a percentage
* accounting: diplay a number for accounting specific
Each purpose can be associate to a number for displaying it :
* on ftl <@ofbizNumber number=value format=purpose/>
* on java UtilFormatOut.formatNumber(value, purpose, delegator, locale)
* on form widget <display type=number format=purpose/>
The format use by a purpose is define on framework/common/config/number.properties with the template
.displaying.format = ##0.00
With this, you can surchage a configuration, create your own purpose or surchage only one through entity SystemProperty.
Concerning the backware compatibility:
* For the ftl the template <@ofbizAmount is now a link to '<@ofbizNumber format=amount'
* For java all previous function call UtilFormatOut.formatNumber with the matching purpose
* For form xml accounting-number is managed as an exection
Last point, display a currency is different that a number, so I didn't refactoring some code for this case (only move properties from general to number for centralize de configuration on the same file)
Thanks Charles Steltzlen to start the refactoring
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1864832 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10836)
Steps to generate:
1.Navigate to https://demo-trunk.ofbiz.apache.org/ordermgr/control/orderentry
2.Add any finished good to the order.
3.Select New Shopping List from Add Order Items To Shopping List section.
4.Click on Add To Shopping List.
5.Now Click on Add To Order button ahead of any product in that shopping list.
6.Error message displays on the screen
Thanks: Rohit Hukkeri
jleroux: note that there is another issue popping up when testing this issue.
It's related with OFBIZ-10418 and maybe OFBIZ-5157
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1853750 13f79535-47bb-0310-9956-ffa450edef68
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749489 13f79535-47bb-0310-9956-ffa450edef68
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749488 13f79535-47bb-0310-9956-ffa450edef68
No needs to use return there. I also tried a simple UEL expression (ie removing groovy interpretation by removing "groovy:"), it did not work
This really shows that, at least OOTB, only one possible syntax should be used, else it's only confusing more!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1302210 13f79535-47bb-0310-9956-ffa450edef68
Please committers use only target with parameter attribute (not in URL) for link and hyperlink fields when there is an action (ie DB modification)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@952119 13f79535-47bb-0310-9956-ffa450edef68
Fix the variant issue in product lookups
Remove the temporary window presentation workaround (done at r939232)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940410 13f79535-47bb-0310-9956-ffa450edef68
Following points are covered in this patch:
1) Show associated products for product of type "MARKETING_PKG_AUTO" on order items section of show cart page in order manager application.
2) Marketing packages should only shown backordered when ATP of product which compose Marketing packages product are less than quantity added in cart.
3) Pick sheets should show Products of type Marketing Packages along with the products which compose Marketing Packages.
4) Show link of production run created on order items section of Order detail page while placing order for product of type MARKETING_PKG_AUTO.
5) Product of type Marketing Packages should be shown on Verify Pick Screen along with Products they are composed of.
Thanks Divesh for the contribution - this is very nice addition to the trunk.
I would be more then happy to see comments / concern from - Jacopo? Scott? Anil? or others?
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834479 13f79535-47bb-0310-9956-ffa450edef68
Two things I didn't realize:
1. for VIEW_INDEX_x parameters, x is 1 based rather than 0 based
2. when override-list-size is used in the form widget it expects the list to be a window of the result set
and not a size limited list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812085 13f79535-47bb-0310-9956-ffa450edef68
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)
Of course this effort to remove trailing spaces has no functional implications.
Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {
So these changes are also in this commit, should not be a problem anyway.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
We are near the end...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759684 13f79535-47bb-0310-9956-ffa450edef68
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
This one is huge, with some changes by hand, conversion from tabs to 4 spaces and some trailing spaces (I have activated it AnyEdit plugin following the changes I made in http://docs.ofbiz.org/display/OFBADMIN/Coding+Conventions but I wonder if I should not reverse all that - I mean my plugin setting and in wiki -, it's a nightmare!)
I did my best on this one, but I'm not sure some typos did not slip in. Anyway, alea jacta est
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759666 13f79535-47bb-0310-9956-ffa450edef68
Replaced all the field's titles in form widgets that were explicitly set to empty to ${uiLabelMap.CommonEmptyHeader}
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@550173 13f79535-47bb-0310-9956-ffa450edef68
I put also some svn:ignore for shark build and lib diretories and assetmaint/build
I did some by hand lately, too much to remember. They were files with old header but without copyright. A 1st attempt I suppose, will have to check this after this commit.
I add some problems to commit this patch in one piece because it's so huge (specially with Eclipse I had to turn to Tortoise) !
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499486 13f79535-47bb-0310-9956-ffa450edef68