Commit Graph
139 Commits
Author SHA1 Message Date
Sebastian Berg 18b83b91c2 Fixed: Unable to add product (of ASSET_USAGE type) in order OFBIZ-10791
Thanks Priya for providing the patch
2021-02-15 17:56:35 +01:00
James Yong ba5536fe57 Improved: Apply CSS Grid to Find Orders (OFBIZ-12116)
Improve naming
2021-01-03 11:13:13 +08:00
James Yong 6f3c7cb4c2 Improved: Apply CSS Grid to Find Orders (OFBIZ-12116)
Apply CSS Grid Layout on the form.
Keep related fields together
2021-01-02 12:46:44 +08:00
James Yong 816a2a6ac1 Reverted: apply buttontext class for links inside screenlet title bar (OFBIZ-12112)
Links not showing correctly for themes like Bluelight, Tomahawk.
This reverts commit 9d0e5313
2020-12-27 15:29:03 +08:00
James Yong 9d0e5313bc Improved: apply buttontext class for links inside screenlet title bar (OFBIZ-12112)
For Order application
2020-12-26 20:25:47 +08:00
Saurabh Dixit d28978def4 Fixed: Single product tile is displayed on one row in product search. (OFBIZ-12045) (#245)
Cause: Wrong use of bootstrap grid classes.
Fix: Used row class as a parent to col-* class while rendering the products.
2020-11-30 11:14:06 +01:00
Jacques Le Roux 60dd569529 Fixed: Handle special characters like single quote in Freemarker template (prevent encoding) (OFBIZ-12029)
A such case was reported by Amit Gadaley at
https://markmail.org/message/ybyjkngdiwrywut6
The solution is to use StringUtil.wrapString() to prevent encoding.
2020-11-10 11:09:46 +01:00
Jacques Le Roux d04f777389 Fixed: display/selection of unit of measure is broken (OFBIZ-11955)
Improve code for UOM dropdown of products like WG-9943

Thanks: Alex
2020-09-11 10:43:13 +02:00
Akash Jain 98f495a79c Improved: adding product to purchase order auto assigned PRODUCT_ORDER_ITEM (OFBIZ-9339)
Thanks, Wai for report.
2020-09-01 21:06:15 +05:30
Jacques Le Roux 8a5107e498 Fixed: display/selection of unit of measure is broken (OFBIZ-11955)
Fixes UOM dropdown for products like WG-9943

Thanks: Alex
2020-08-31 10:46:00 +02:00
Jacques Le Roux 9a957eb7a7 Fixed: display/selection of unit of measure is broken
(OFBIZ-11955)

This fixes in in order component

Thanks: Alex
2020-08-30 14:13:10 +02:00
Akash Jain f5ef671703 Fixed: Default value flags not working for configurable and variant products at the time of order entry (OFBIZ-10532)
Thanks, Deepak Nigam for report.
2020-08-27 18:03:02 +05:30
Akash Jain 29c2ed5a18 Fixed: View Image button on order view page fails to render the image (OFBIZ-11734)
Thanks, Arpit Mor for reporting.
2020-08-04 15:48:55 +05:30
Akash Jain 68d210a7d0 Improved: Purchase Order Email Support (OFBIZ-11864) 2020-08-03 17:29:13 +05:30
Jacques Le Roux 7d6e5ddbb5 Improved: Hard coded label in ProductUomDropDownOnly (OFBIZ-11891)
The select label is not receiving translations.

There are more related issues, but this is independent.

Thanks: Alex Bodnaru
2020-07-16 14:34:22 +02:00
Priya SharmaandPriya Sharma a3059c097d [Implemented] Introduce the option for specifying Check (Reference) Number upon using Check as payment method during ordering (#203)
Done the following:
- Added a field on the UI to allow the input of the check reference number
- Added logic to set this reference number on the cartpaymentinfo map
- Added logic to fetch the reference number from the order preference record and apply it on the payment.

(OFBIZ-7377)

Co-authored-by: Priya Sharma <priya.sharma@hotwaxsystems.com>
2020-06-16 14:55:35 +05:30
Pawan Verma d106b91dd0 Improved: UI improvement on View Order page(OFBIZ-10985)
Thanks, Rashi for report and Aishwary for initial patch and garima and jacques for the review.
2020-06-02 17:34:29 +05:30
Pawan Verma 30ee142864 Improved: Improvement in Purchases by Product Report(OFBIZ-11733)
The status description should be used in report instead of OFBiz ID.

Thanks: Chandan Khandelwal for your contribution.
2020-06-02 16:57:29 +05:30
Aditya Sharma 3a2a9df44b Fixed: paginateOrderList does not find orders on next page specific to FindOrders.ftl
(OFBIZ-11356)
Adding the missing showAll flag in the paginateOrder form because of which the orders were not shown while submitting the next button.
Thanks Michael Brohl for reporting the issue and Ankit Joshi for providing the patch
2020-05-23 16:18:28 +05:30
James Yong e3e12ee487 Improved: No need to specify externalKeyParam in ofbizUrl calls (OFBIZ-11711)
Let ofbizUrl macro generates externalLoginKey when needed.

Thanks: Jacques for review
2020-05-17 20:37:48 +08:00
James Yong b17fd2419a Improved: Apply multi-block attr to each application (OFBIZ-11706)
For Order application.
2020-05-15 19:24:20 +08:00
James Yong 60c78d24be Improved: <script-template> widget tag (OFBIZ-11686)
Removed script-template tag.
Use multi-block=true on html-template tag instead.
2020-05-15 11:16:15 +08:00
James Yong 803f7fa060 Improved: <script-template> widget tag (OFBIZ-11686)
The new tag allows us to render a freemarker template containing javascript,
as external script in html instead of inline script.
This helps to reduce CSP errors.
2020-05-13 20:19:05 +08:00
Pawan Verma 63f0a84ae2 Fixed: Create Exchange Order button on Return screen is distorted
(OFBIZ-11144)

Thanks: Devanshu for the report, Suraj and Jacques for the review.
2020-04-28 10:11:41 +05:30
Pawan Verma 95af7cf8ba Fixed: Error showing on Allocation Plan screen
(OFBIZ-11338)

Thanks: Yashwant Dhakad for the report and Aman Mishra for the patch.
2020-02-24 17:18:24 +05:30
akash 5d011d3226 Improvement: Quantity and Add to Cart button showing twice on Compare Products page
(OFBIZ-10665)

Thanks, Ritesh Kumar and Dikpal Kanungo for your contribution.
2020-02-22 11:26:29 +05:30
Pawan Verma 8bcf9c2cc5 Fixed: Order Status History section broken for anonymous order
(OFBIZ-11231)

Reason for the issue: Anonymous orders doen't have associated User login record, so shown statusUserLogin in that case.
2020-01-25 12:02:48 +05:30
James Yong 05ffbd2817 Improved: Add 'controlPath' attribute to 'ofbizUrl' freemarker macro
(OFBIZ-11317)

Adding the controlPath attribute to allow the controls by ofbizUrl to support uri to other OFBiz web application.

Thanks: Jacques for the review
2020-01-12 22:25:50 +08:00
Pawan Verma 756b181c37 Fixed: Add button for 'Gift Message is shown on completed order
(OFBIZ-11160)

Thanks: Pierre Smits for report and Shivanand Chhatre for the fix.
2019-12-12 16:07:56 +05:30
Mathieu Lirzin d0f522aeed Fixed: Remove obsolete references to WorkflowActivity (OFBIZ-11303)
The workflow component is in attic since 7 years.
2019-12-01 20:05:27 +01:00
Jacques Le Roux 3d555f5765 Fixed: Number problem cancelling order item
(OFBIZ-11283)

If an order item has a quantity greater then 1000, cancelling the order item via
the order form in backend does not work.

In the Demo (trunk) environment: the quantity of 1200 to cancel is displayed as
"1,200" in the quantity input field.
--> an error is displayed

On my local installation I use a different locale and it is displayed as "1.200".
--> interprets the dot as a comma and the quantity of 1,2 is cancelled

Create Order: Order Mgt --> Order Entry --> Sales Order (Customer: DemoCustomer)
--> ProductId: GZ-2644, Quantity 1200 --> Finalize order
On order: Edit Items --> click checkbox next to quantity -->cancel selected items

jleroux: I have applied the same in ReceiveInventory.ftl

Thanks: Ingo Wolfmayr for report and test. Ankush Upadhyay for the fix
2019-11-25 10:29:21 +01:00
Pawan Verma d00208cad9 Fixed: Production run not created for marketing package auto type product if component inventory is not available
(OFBIZ-10585)

When we create an order for marketing package auto, the system checks the component inventory and if found then it creates the production run job and produce marketing package inventory, but if component quantity not available then it does not create the job. So if we don't have an inventory item of component then production run should be created with created status.

Thanks: Yashwant Dhakad for report and Ankush Upadhyay for the patch.
2019-11-23 11:59:07 +05:30
Jacques Le Roux ce26d03f02 Fixed: FTL error for purchase order with Bulk Item Type
(OFBIZ-11252)

Steps to regenerate:
1. Login into the ordermgr application and click on Order Entry tab
2. Create PO with any supplier
3. Fill details and click on Continue
4. Now select Product Category with Item type Bulk and add the description and 
   Click on add to order
5.  Finalize order with Finalize Order button
6. Add Term type, ship group option, etc details and create Order.
7. Scroll down to Order Items section and See the FTL error on the screen.

Thanks: Devanshu Vyas

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1868553 13f79535-47bb-0310-9956-ffa450edef68
2019-10-17 14:26:42 +00:00
Suraj Khurana 932d955043 Improved: UI of the order status section in status column of order items table on orderview screen.
(OFBIZ-11106)
Thanks: Chandrashekhar Dhakad for reporting the issue and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1868048 13f79535-47bb-0310-9956-ffa450edef68
2019-10-06 11:18:40 +00:00
Pawan Verma e1e849339a Fixed: Sales By Store Report not working
(OFBIZ-11119)

Added Null check to avoid Exception.

Thanks: Chandan Khandelwal for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867910 13f79535-47bb-0310-9956-ffa450edef68
2019-10-03 07:33:42 +00:00
Jacques Le Roux 6bcc250a7c Improved: Clarify orders list headers at Find Order screen
(OFBIZ-10972)

Labels the drop-down
Second drop-down is not required to perform the action. So it should not be 
displayed if printer data is not available, adds required validation check

Thanks: Sanjay Yadav for report, Mohammed Rehan Khan foe review and patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867784 13f79535-47bb-0310-9956-ffa450edef68
2019-09-30 17:09:57 +00:00
Nicolas Malin cbc0a76517 Improved: Find order screen can't make a search without ship to country
(OFBIZ-11176)
When you search orders on the standard screen [1] you can't unselect a country.
The problem come from the populate country list by countries.ftl who select by default a country without possibility to escape it.
We added a possibility to escape it through variable doNotPreselectDefaultCountryGeoId 

[1] https://localhost:8443/ordermgr/control/findorders

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1866012 13f79535-47bb-0310-9956-ffa450edef68
2019-08-27 21:30:58 +00:00
Pawan Verma 806b7093ad Improved: Replaced hard coded PDF instead of uiLabel on various places
(OFBIZ-11169)

Replaced hard coded PDF instead of uiLabel on various places use CommonUilable instead.

Thanks: Komal Dayle for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1865853 13f79535-47bb-0310-9956-ffa450edef68
2019-08-24 15:05:25 +00:00
Pawan Verma 5daa9476e4 Fixed: Order status history should show party id instead of user login id
(OFBIZ-11121)
Thanks: Ashish Kumar Pandey for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1865811 13f79535-47bb-0310-9956-ffa450edef68
2019-08-24 04:50:11 +00: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 4f83ffc16b Improved: Improper alignment of Status, OrderDate and PartyId column header on
Find Orders page
(OFBIZ-11116)

Steps to regenerate:

1. Go to the order component (ordermgr/control/main)
2. Click on Find Orders submenu (ordermgr/control/findorders)
3. Click on Find button.
4. Last 3 column headers of the table are not aligned properly.

Thanks: Humera Khan for report and Ashish Kumar Pandey for the fix

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1863965 13f79535-47bb-0310-9956-ffa450edef68
2019-07-29 18:08:45 +00:00
Jacques Le Roux be99f5a0a7 Improved: no functional change
Adds missing ASL2 headers, thanks to Mathieu on dev ML :)
Also automatically sorts imports

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1862214 13f79535-47bb-0310-9956-ffa450edef68
2019-06-27 14:03:34 +00:00
Deepak Nigam 5e6c96d8bb Implemented: The feature where a user will be able to add different types of content(image, document, URL, etc.) to an order.
(OFBIZ-7257)
Here is an implementation plan for the proposed solution. 
Order Attachment Flow:
1) Show 'Attachments' instead of 'Image' on the order view screen.
2) If there are any attachments associated with the order, then their information will be displayed in the form of a button(Content link) else 'No Attachment' label should be shown.
3) If no attachments are there, then along with the label, a button(Add Attachment) will be displayed.
On clicking the Add Attachment button, a user will be redirected to a page where he/she can add different types of content(image, document, URL, etc.) to the order.
Order Attachment Modeling:
Used OrderContent as the entity to store the content and order association.
Created OrderContentType data for an image and document for starters.

Thanks Avnindra Sharma for reporting the original issue, Devanshu Vyas for providing the patch and Jacques for review and suggestions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1861853 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 12:06:43 +00:00
Jacques Le Roux 9d40609c1d Fixed: Mass actions in FindOrders.ftl don't keep parameters
(OFBIZ-11052)

This adds a missing ampersand  after requestParameters.hideFields?default("N") 
when needed 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1859796 13f79535-47bb-0310-9956-ffa450edef68
2019-05-23 16:33:26 +00:00
Jacques Le Roux 92a16f9980 Improved: Missing uiLabel for Create New on CMS Content Find Screen
(OFBIZ-11005)

Steps to regenerate:
    Go to https://demo-trunk.ofbiz.apache.org/content/control/CMSContentFind
    Find missing uiLabel for Create New, showing as CommonCreateNew.

jleroux: This is related with OFBIZ-9905, we decided to use only CommonCreate
This do that and fix others which were missing in OFBIZ-9905

Thanks: Pawan Verma for report, Suraj for comment


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858516 13f79535-47bb-0310-9956-ffa450edef68
2019-05-02 06:44:47 +00:00
Suraj Khurana 443bac5d8f Improved: Added support for Inventory (Supply) Allocation Planning.
(OFBIZ-10518)
Thanks Deepak Nigam for initiating this feature and providng the patches, Arun Patidar for review and Swapnil Shah for design discussions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858270 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 13:05:30 +00:00
Suraj Khurana 8691800f38 Improved: Use code128 instead of code39 for barcode generation.
(OFBIZ-10896)
Currently, we are using code39 to generate barcodes but there are some limitations of code39 as it only able to encrypt letters from A to Z, digits from 0 to 9 and an additional set of special characters – “. $ % + – / *”.
Thanks Pawan Verma for reporting, analysis and providing the patch. Thanks everyone else for providing their inputs during discussion on Dev ML.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858242 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 06:15:14 +00:00
Suraj Khurana d0a0e74cd6 Improved: Incorrect contact information displayed on purchase order view page.
(OFBIZ-5401)
It seems like the address information listed should relate to the party of the screen, so the supplier contact information should probably appear.
Thanks Christian Carlow for reporting, Prakhar Kumar for the patch and everyone else for discussions and suggestions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858237 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 05:27:08 +00:00
Jacques Le Roux 8a139ca806 Fixed: partyId misses in EditEftAccount.ftl (party) when you create an EFT
account from the quick finalize page
(OFBIZ-10680)

If you split the payment and want to create an EFT account you get an error in 
EditEftAccount.ftl (party) at line 40 colum 50: the partyId is missing.

Adds the patch to add the partyId field that was missing while creating an EFT 
account or credit card in split payment mode. Added proper checks to avoid the 
broken screen in case the parameter is missing.

Thanks: Ankit Joshi for the fix

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851319 13f79535-47bb-0310-9956-ffa450edef68
2019-01-15 07:43:36 +00:00
Deepak Dixit d9bf61bf83 Fixed: Page dropdown list on categorydetail page broken
(OFBIZ-10787)
Thanks Sebastian Wachinger for reporting the issue.
Corrected the condition to display pagination options for ordermgr template as well.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851006 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 06:07:54 +00:00