Commit Graph
26 Commits
Author SHA1 Message Date
Deepak Dixit 3273793842 Fixed: Incorrect mapping for Lookup Purchase Order (#272)
(OFBIZ-12143)

This issue was due to common form is being used for LookupPurchaseOrderHeaderAndShipInfo and LookupOrderHeaderAndShipInfo screen. Passed the paginateTargetUrl from screen to make sure pagination works properly
Thanks Rajesh Kumar for reporting the issue
2021-02-12 16:05:27 +05:30
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
Rishi Solanki 8390f0606a Implemented: Implement and Apply Return Lookup. Added lookup with screen forms and controller entry. Use the same lookup on communication event return screen.
(OFBIZ-10171)
Thanks Ratnesh Upadhyay for reporting and providing fix for the issue.
Thanks Yogesh Noaroliya for verification and details.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1822411 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 14:21:37 +00:00
Deepak Dixit d09255c0b7 Reverted: Minilang code readability and consistency improvements done at r#1768222, this commit reversed key and description of drop-down in the code.
(OFBIZ-9114)

Thanks  Wei Zhang for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1772880 13f79535-47bb-0310-9956-ffa450edef68
2016-12-06 12:37:42 +00:00
Divesh Dutta 70eb7ff508 Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8929) (OFBIZ-8930) (OFBIZ-8953) (OFBIZ-8965) (OFBIZ-8972) (OFBIZ-8986) (OFBIZ-8991) 

Thanks: Ankush Upadhyay, Anuj Jain, Abhijeet for your patches. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768222 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:34:00 +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
Michael Brohl f0a109c0dd Improved: Order: Consistent form name.
(OFBIZ-8078)

Change all form names to upper camel case for consistency. I have slightly modified the patch to remove a typo (LookupOrderHeader instead of LSookupOrderHeader) in LookupScreens.xml.

Thanks: Tanmay Muley for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761095 13f79535-47bb-0310-9956-ffa450edef68
2016-09-16 21:31:05 +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 8901e90da5 A patch from Pierre Smits "Replacing bsh code with groovy Code in ORDER screens, forms and menus" https://issues.apache.org/jira/browse/OFBIZ-6340
jleroux: The quote part has been already handled at OFBIZ-6351



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1679697 13f79535-47bb-0310-9956-ffa450edef68
2015-05-16 08:00:32 +00:00
Jacques Le Roux fb3a2adcc5 Fixes a bug, and get rid of some more bsh scriptlets
2015-01-23 18:19:10,216 |http-bio-8443-exec-6 |FlexibleStringExpander        |W| Error evaluating scriptlet [${bsh:isPromo!=null&&isPromo.equals("Y")}]; error was: java.lang.IllegalArgumentException: Error ru
nning bsh script [isPromo!=null&&isPromo.equals("Y")]: javax.script.ScriptException: Sourced file: inline evaluation of: ``isPromo!=null&&isPromo.equals("Y");'' : Attempt to resolve method: equals() on undefi
ned variable or class name: isPromo : at Line: 1 : in file: inline evaluation of: ``isPromo!=null&&isPromo.equals("Y");'' : isPromo .equals ( "Y" )

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1654273 13f79535-47bb-0310-9956-ffa450edef68
2015-01-23 17:23:12 +00:00
Hans Bakker 39408b7951 add quoteterm fields to be the same as ordeterm fields, add maintenance screens to the quote, copy quoteterms to orderterms when creating order from quote
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1067840 13f79535-47bb-0310-9956-ffa450edef68
2011-02-07 01:56:53 +00:00
Adam Heath ac2299c50e Fix a bunch of no final newline issues.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965918 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:21 +00:00
Jacques Le Roux 21ec172143 A patch from Sam Hamilton "Extending the search when receiving a Purchase Order" (https://issues.apache.org/jira/browse/OFBIZ-3777) - OFBIZ-3777
This patch is to add a couple of extra ways to look for a purchase order when receiving it into a facility

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948020 13f79535-47bb-0310-9956-ffa450edef68
2010-05-25 12:17:09 +00:00
Jacques Le Roux 578662ae4c Now that we have fixed the layered lookup inside layered lookup issue and the recursive call case we can get rid of all the useless remaining presentation="window".
I keep the example and beware LookupTimeDuration is a special case

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@944623 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 12:13:00 +00:00
Jacques Le Roux 855585e46b Fix 2 duplicates attributes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939570 13f79535-47bb-0310-9956-ffa450edef68
2010-04-30 07:28:30 +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
Jacques Le Roux e714f96c66 Closes "Replace popup lookups by layer lookups" (https://issues.apache.org/jira/browse/OFBIZ-3442) - OFBIZ-3442
Not all cases have been resolved but this patch takes this into account and should not introduce any not known issues. These issues are identified at "Layer popup umbrella main task" (https://issues.apache.org/jira/browse/OFBIZ-3445). They will be resolved later and are actually bugs so will be committed later when fixed. They are
* "Allow to open a layer lookup from a layer lookup" (https://issues.apache.org/jira/browse/OFBIZ-3446) and its specific case "Allow to open a layer lookup from a layer lookup recursively" (https://issues.apache.org/jira/browse/OFBIZ-3693)
* "The minimize/enlarge buttons (+ -) blocks the layer" (https://issues.apache.org/jira/browse/OFBIZ-3692)
* "When you get disconnected (time out) from a layered lookup, you then get afterward ugly screens" (https://issues.apache.org/jira/browse/OFBIZ-3450)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@937852 13f79535-47bb-0310-9956-ffa450edef68
2010-04-25 18:49:01 +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 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
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
Bruno Busco f33c01737f Part of OFBIZ-3067 - Menus and form widget files location
Order component
Moved forms from webapp to widget folder
Removed empty folders

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829377 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 14:29:27 +00:00