Commit Graph
50 Commits
Author SHA1 Message Date
Jacques Le Roux ec2b84341e Reverted: "Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)"
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
2020-12-18 11:08:32 +01:00
Jacques Le Roux 17eb2e4cf7 Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)
Same for sub-hyperlink
2020-12-11 16:52:04 +01:00
Nicolas Malin 4a511be1cc Implemented: Homogenize displaying number with multiple format
(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
2019-08-09 20:37:11 +00:00
Jacques Le Roux 60776a32ad Fixed: Add To Order button not working on shopping list screen
(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
2019-02-17 12:46:56 +00:00
Divesh Dutta 738a12bec1 Improvement: Miniland code readability and consistency improvements
(OFBIZ-8744) (OFBIZ-8745) (OFBIZ-8746) (OFBIZ-8748) (OFBIZ-8829) (OFBIZ-8830) (OFBIZ-8907) (OFBIZ-8908) (OFBIZ-8924) (OFBIZ-8925) 

Thanks: Ankush Upadhyay , Sega patidar , Abhijeet Ashapure for your patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768219 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:14:04 +00:00
Jacques Le Roux c8ba932772 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux 89212904bd Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
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
2016-06-21 11:37:47 +00:00
Jacques Le Roux 4931db1ed9 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
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
2016-06-21 11:14:16 +00:00
Nicolas Malin 895c9856b3 Cleaning forms code is needed after setting default-value in list-options and entity-options, patch related to OFBIZ-6524 and follows the resolution of OFBIZ-6490 and OFBIZ-6489. Thanks Gil Portenseigne for this effort
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686674 13f79535-47bb-0310-9956-ffa450edef68
2015-06-20 21:58:05 +00:00
Jacques Le Roux 608b923cfd Adrian suggested to removes all default-widget-style="tabletext": <<That style was removed from the stylesheet in 2007. All references to it should be removed.>>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340388 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 09:38:25 +00:00
Jacques Le Roux 3e7b774156 Adrian suggested to removes all default-tooltip-style="tabletext": <<That style was removed from the stylesheet in 2007. All references to it should be removed.>>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340387 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 09:37:35 +00:00
Jacques Le Roux 3369dca046 Replaces title="${uiLabelMap.CommonEmptyHeader}" by title=" " where it's known to not be a problem. Here with links styled by widget-style="buttontext"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340373 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 08:45:18 +00:00
Jacques Le Roux 9a9b96356d Improves the LookupBulkAddProducts form by disabling the amount field when Product.requireAmount field is not "Y"
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
2012-03-18 19:54:38 +00:00
Jacques Le Roux 8b373ccbe7 Improve the LookupBulkAddProducts form by disabling the amount field when Product.requireAmount field is not "Y"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1302195 13f79535-47bb-0310-9956-ffa450edef68
2012-03-18 18:33:09 +00:00
Jacques Le Roux 86e817b533 Reverted on Scott's advice (useless and give some trouble on back button: POST => msg like "do you want to send again", not GET)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@952164 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 09:30:45 +00:00
Jacques Le Roux 4943ab1e3b Secure some targets. Note that they have been introduced since OFBIZ-2243 has been closed.
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
2010-06-07 07:02:02 +00:00
Jacques Le Roux df40275120 A completed patch from Sascha Rodekamp "Lookup Layer Search of a Varient Product" (https://issues.apache.org/jira/browse/OFBIZ-3746) - OFBIZ-3746
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
2010-05-03 10:37:33 +00:00
Jacques Le Roux 92699050d0 A temporary workaround for the problem reported by Sam Hamilton at https://issues.apache.org/jira/browse/OFBIZ-3746: "Lookup Layer Search of a Variants Product"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939232 13f79535-47bb-0310-9956-ffa450edef68
2010-04-29 08:47:57 +00:00
Ashish Vijaywargiya 0507a954f6 Part of OFBIZ-3320 - Now you will see "Find" button on Lookup forms.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@889088 13f79535-47bb-0310-9956-ffa450edef68
2009-12-10 04:50:29 +00:00
Ashish Vijaywargiya d48eee6986 Applied patch from jira issue OFBIZ-3173 - Better supportability for products of type MARKETING_PKG_AUTO in order processing and fulfillment process.
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
2009-11-10 14:32:53 +00:00
Scott Gray 3b055daffc Fix some issues I caused with the purchase order Bulk Add Supplier Product screen
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
2009-09-07 11:19:58 +00:00
Scott Gray 507fd7fa07 I incorrectly added viewSize/viewIndex parameters to this form
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810354 13f79535-47bb-0310-9956-ffa450edef68
2009-09-02 04:21:35 +00:00
Scott Gray 62dfb43ed0 A few improvements mostly the LookupBulkAddSupplierProducts.groovy script which takes a very long time to load even with relatively modest result sizes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809104 13f79535-47bb-0310-9956-ffa450edef68
2009-08-29 08:52:07 +00:00
Scott Gray 12566c26b9 Wherever possible changed ELI queries to limit the result set to the actual rows required of the query, should improve time
and memory performance if a cursor isn't being used on large result sets quite a bit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808820 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 08:58:10 +00:00
Vikas Mayur e67c91369f Product Quick Lookup on Order Entry shopping cart page show additional information for purchase order.
Applied slightly modified patch from Sharad Gupta, part of OFBIZ-2701 (https://issues.apache.org/jira/browse/OFBIZ-2701) 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791447 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 11:38:19 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \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
2009-04-08 10:54:51 +00:00
Jacques Le Roux 76f5ca6638 Secure URLs, we don't need to duplicate in from-field when param-name is the same
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Jacques Le Roux c2ed8b71ac Securing URLs, link element in screens and menus : 27th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761971 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 17:33:50 +00:00
Jacques Le Roux 77a2ff1d9f 21th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
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
2009-03-29 14:02:55 +00:00
Jacques Le Roux 40f5281303 20th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759680 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 13:33:53 +00:00
Jacques Le Roux 8c6d89fe75 18th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
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
2009-03-29 11:00:00 +00:00
Marco Risaliti 201290e8db A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746341 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 19:11:06 +00:00
Marco Risaliti 30bd7c76df A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@745286 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 22:57:14 +00:00
Marco Risaliti e39f705523 A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744265 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 22:22:34 +00:00
Marco Risaliti 6554ab80c1 Artifact cleaning on order component after recent changes on xsd files (OFBIZ-2137)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739028 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 21:38:21 +00:00
Jacques Le Roux 572b7683e0 All tabs to 4 spaces in *.groovy, *.java, *.xml : less problems in future with that aspect...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737003 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 11:08:47 +00:00
Adrian Crum 75191fa776 Removed deprecated CSS styles from back office applications.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@676212 13f79535-47bb-0310-9956-ffa450edef68
2008-07-12 18:41:44 +00:00
Marco Risaliti 12fff3283c Fourth patch applied for clean up labels between order and ecommerce application (OFBIZ-1780)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@657466 13f79535-47bb-0310-9956-ffa450edef68
2008-05-17 21:32:40 +00:00
Marco Risaliti 4b2039672c Order View forms & removed some deprecated styles (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1545)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@613672 13f79535-47bb-0310-9956-ffa450edef68
2008-01-20 20:28:45 +00:00
Bilgin Ismet Ibryam a16275649e Applied my (modified) patch from JIRA Issue # OFBIZ-1453 "store/load possibility for AGGREGATED product configurations".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@613216 13f79535-47bb-0310-9956-ffa450edef68
2008-01-18 17:47:01 +00:00
Jacopo Cappellato e8944af650 Sorry for the big commit.
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
2007-06-24 07:27:29 +00:00
David E. Jones 7d70c41c12 Did a big search/replace to change all xsd file refs from www.ofbiz.org to ofbiz.apache.org
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@539504 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 15:47:14 +00:00
Jacopo Cappellato 37ec41dee7 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@511769 13f79535-47bb-0310-9956-ffa450edef68 2007-02-26 10:11:32 +00:00
Jacques Le Roux dad67935f7 A (large) patch from Scott Gray "Update ASL header" (https://issues.apache.org/jira/browse/OFBIZ-637).
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
2007-01-24 17:15:54 +00:00
Jacopo Cappellato 1c336218f1 In the purchase order entry requirements' screen, now by default only the requirements that have a role of SUPPLIER for the given party are shown.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@440330 13f79535-47bb-0310-9956-ffa450edef68
2006-09-05 12:24:39 +00:00
Jacopo Cappellato 5954203b5e Fixed pagination bug in quick product lookup page in po entry screen.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@434121 13f79535-47bb-0310-9956-ffa450edef68
2006-08-23 18:34:49 +00:00
Jacopo Cappellato 29cd61f90d Implemented new lookup search for products limited by supplier's product if the order is a purchase order.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@429290 13f79535-47bb-0310-9956-ffa450edef68
2006-08-07 10:12:53 +00:00
Jacopo Cappellato 0c431fe3e3 License change from MIT to ASL2.0 for the files of the order component.
Thanks to Ashish Vijaywargiya for the patch (Apache OFBIZ-87).


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@422818 13f79535-47bb-0310-9956-ffa450edef68
2006-07-17 19:46:37 +00:00
Jacopo Cappellato 86ff215457 Applied i18n patch from Marco Risaliti (Apache OFBIZ-25).
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@418930 13f79535-47bb-0310-9956-ffa450edef68
2006-07-04 07:07:51 +00:00
David E. Jones 94fe6d1cda Initial OFBiz import from revision 7923 of the old svn.ofbiz.org SVN repository.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@418498 13f79535-47bb-0310-9956-ffa450edef68
2006-07-01 19:05:20 +00:00