Commit Graph
494 Commits
Author SHA1 Message Date
Jacques Le Roux 7fb64ba5b5 Fixed: Wrong heading on creating quote under order component (OFBIZ-11221)
Steps to re-generate :

1. Login with the username and password.
2. Go to order component order.
3. Click on Quotes
4. Click on new quotes

Error: Edit quote is shown on the place of New quote.
Actual: New quote should be shown on the place of edit quote on UI.

Thanks: jai kumar raghuwanshi for report, Pradyum Dharwa  for 1st patch,
Ratnesh Upadhyay for better suggestion and Ankit Joshi for the patch
2021-02-20 13:28:06 +01:00
Michael Brohl 662a3f9d1c Improved: Remove Compdoc functionality from content manager
(OFBIZ-10476)
2021-02-13 17:33:05 +01:00
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
Suraj Khurana cbec4d7b7c Fixed: ViewQuoteProfit shows fields in wrong order.
(OFBIZ-11680)
Thanks Pierre for reporting and Lalit Dashora for providing the patch.
2021-02-12 10:59:11 +05:30
Jacques Le Roux 49dbd2afcb Improved: Create 'New Request' button should be removed from create new request screen in Order the component. (OFBIZ-12121)
Thanks: Shubham Choudhary
2021-01-24 18:14:30 +01:00
Nicolas Malin 7165768251 Implemented: Add a framework method to get main webapp menu with the webapp name
(OFBIZ-10601)

To improve theme management and provide better tools for new themes, we implement a method to obtain the main menu of a webapp.
Instead of just managing a menu, we extend the functionality by offering a method to expose a summary of the webapp, to simplify the navigation.

For this we add a new attribute on webapp definition app-shortcut-screen :

    <webapp name="mywebapp"
            ...
            app-shortcut-screen="component://mycomponent/widget/CommonScreens.xml#ShortcutApp"
            ...
    />

The idea is to define a new purpose screen *Shortcut* that contains what defines a webapp when an action or navigation has been requested. With this screen you can load a menu, a search, a complex description and use all screen powerfulness to resolve what displaying and support by theming

    <screen name="ShortcutApp">
        <section>
            <actions>
                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
            </actions>
            <widgets>
                <decorator-screen name="ShortcutDecorator" location="component://common/widget/CommonScreens.xml">
                    <decorator-section name="body">
                        <include-menu name="MyShortcutAppBar" location="component://mycomponent/widget/CommonMenus.xml"/>
                    </decorator-section>
                </decorator-screen>
            </widgets>
        </section>
    </screen>

Each component are self-sufficient to define what shortcuts to display without framework change or knowledge about other component.
Each theme can implement and customize the display rendering at will.

To illustrate an example of implementation we set sub menu for each webapp defined on applications and exploit it on bluelight theme.

Thanks for Dennis Balkir, Jacques Leroux, Leila Mekika and Julien Nicolas for their involvement
2021-01-15 08:56:23 +01: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
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
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 b67eb606a6 Improved: Create new quote button should be removed from new quote screen (OFBIZ-11405)
Thanks, Ratnesh for reporting the issue.
2020-08-22 21:30:38 +05:30
Akash Jain 68d210a7d0 Improved: Purchase Order Email Support (OFBIZ-11864) 2020-08-03 17:29:13 +05:30
Akash Jain 001ce6a6c4 Improved: Status ID checkbox for Return, Requirement and Quote forms (OFBIZ-11935) 2020-08-03 16:15:45 +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
holivier 56f164d3a8 Documented: migrate help link to asciidoc user manual for Order
(OFBIZ-11580)

All files have been migrated to asciidoc format and help link now point
to the html file generated from the asciidoc files

In the global Help Docbook index tree, remove all points about
Order and add a short page with a link to the new help

Remove docbook help files for Order
2020-07-02 12:07:05 +02:00
Jacques Le Roux 4f841e9897 Fixed: IDOR vulnerability in the order processing feature in ecommerce component (OFBIZ-11836)
https://demo-stable.ofbiz.apache.org/ecommerce/control/order.pdf?orderId=WSCO10000

In the above URL, the parameter 'orderId' has the value 'WSCO10000' and after
incrementing the value to 'WSCO10001' or 'WSCO10002' will download the receipt
of other orders which have been placed by other users.

All the available order receipts can be downloaded by running an automated tool
(Burp Intruder) on the parameter 'orderId=WSCOXXXXX'

I have successfully tested this by using 2 different accounts: DemoCustomer and
DemoCustomer2

An attacker can download order receipts of other users and this could lead to
information disclosure.

The only real solution to this issue is to implement access control. The user
needs to be authorized for the requested information before the server provides
it.

Thanks: Harshit Shukla [mailto:harshit.shukz@gmail.com]reported this IDOR
vulnerability to the OFBiz security team, and we thank him for that.
2020-06-26 09:28:49 +02:00
James Yong ea537323fa Reverted: Use Compound Widget on rest of the project (OFBIZ-11821) 2020-06-20 20:16:11 +08:00
James Yong 49601e1213 Reverted: Use Compound Widget on rest of the project (OFBIZ-11821)
Removed FindRequestCompound.xml
2020-06-20 20:12:35 +08:00
James Yong 2f557b7fba Reverted: Use Compound Widget on rest of the project (OFBIZ-11821)
Verbose and may better suit in custom implementation.
2020-06-20 20:06:42 +08:00
James Yong da3473b183 Improved: Use Compound Widget on rest of the project (OFBIZ-11821)
Remove unnecessary namespace
2020-06-17 22:42:01 +08:00
James Yong 4bdabd825e Improved: Use Compound Widget on rest of the project (OFBIZ-11821)
Refactor for Find Request
2020-06-14 13:55:11 +08:00
James Yong 28809d71d8 Improved: Use Compound Widget on rest of the project (OFBIZ-11821)
Refactor for Find Request
2020-06-14 11:40:16 +08:00
James Yong 5e63e81d08 Improved: Remove unused location ${parameters.quoteDecoratorLocation} (OFBIZ-11802)
Thanks: Jacques for review
2020-06-06 18:34:08 +08:00
Pierre Smits 5fac98022e Improved: quote menu
(OFBIZ-11715)

updated: QuoteTabBar - simplified labels
updated: moved 'Edit quote' menu item to QuoteSubTabBar
updated: reordering of menu-items of QuoteTabBar
updated: various UiLabels used by menu-items in QuoteTabBar
2020-05-24 14:34:03 +02: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
Suraj Khurana 3615f5b842 Improved: Converted all CustRequestContent related CRUD services from simple to entity-auto (#94)
* Improved: Converted all CustRequestContent related CRUD services from simple to entity-auto
(OFBIZ-11627)

* Improved: Added seca rule for checkStatusCustRequest while invoke and updateCustRequestLastModifiedDate while commit for services related to CustRequestContent.
2020-05-02 17:00:48 +05:30
akash de70b3c9ca Improvement: View Request button should not display when there is no customer request data on Quote Items screen
(OFBIZ-10629)

Thanks, Kumar Rahul and Ritesh Kumar for your contribution.
2020-02-22 13:00:34 +05:30
Deepak Dixit c3d53e6b8c Fixed: Fix typo 2020-01-06 00:53:32 +05:30
Jacopo Cappellato cbad4d3e22 Fixed: Add missing view permissions checks to various screens. 2019-11-15 19:23:38 +01:00
Jacques Le Roux c98def05a3 Fixed: EditExample always update status, because current Status not shown
(OFBIZ-11230)

In the EditExample Form, the drop-down is populates with the Valid change status 
only. So current status is not in the list and the status print in the drop-down 
is the next authorized. I want to modify exampleName or exampleType, I go to 
editExample and change what I want and validate. The problem is status is also 
changed!

There are 12 other same or similar cases. For the first of them (in FinAccount) 
there is the same bug: when I change FinAccount Name, status change too. If I 
add current="first-in-list" in the tag drop-down it works 

jleroux: Quote is a peculiar case due to OFBIZ-7337 which was a wrong fix
 
Thanks: Oliver for the analysis and the fix 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1868545 13f79535-47bb-0310-9956-ffa450edef68
2019-10-17 12:19:33 +00:00
Jacques Le Roux 8147e98a89 Improved: Correct location of New Requirement button on Requirements view
(OFBIZ-7333)

Steps to regenerate the issue:
1. Go to order manager.
2. Go to sub-menu "Requirements"
3. Find Requirements view is having New Requirement button placed at wrong 
position.

Moves the EditRequirement button above RequirementsTabBar

Thanks: Pranay for patch issue analysis

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867694 13f79535-47bb-0310-9956-ffa450edef68
2019-09-29 07:35:18 +00:00
Jacques Le Roux 531793820e Improved: Add a discussion feature in order detail view for following
communication about the order (mail, phone etc.)
(OFBIZ-11210)

This is in order detail view for following communication about the order 
(mail, phone etc.) to keep an eye about all com' event linked to the order.

Thanks: Carl Demus

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867581 13f79535-47bb-0310-9956-ffa450edef68
2019-09-26 15:11:52 +00:00
Pawan Verma bd255b14b8 Reverted: Allow-multiple dropdown improvement of UI on order report screen
(OFBIZ-11166)

Reverted rev 1865818.

Thanks Deepak Dixit for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1865897 13f79535-47bb-0310-9956-ffa450edef68
2019-08-26 05:30:17 +00:00
Pawan Verma b6ee2e1698 Improved: UI improvement for drop-down fields on order report screen
(OFBIZ-11166)
Thanks: Ashish Kumar Pandey for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1865818 13f79535-47bb-0310-9956-ffa450edef68
2019-08-24 07:58:35 +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
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
Scott Gray 23f36f67a1 Fixed: Ensure the story field in ordermgr's EditCustRequest form is html encoded (OFBIZ-11006)
Fixes CVE-2019-10074

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858523 13f79535-47bb-0310-9956-ffa450edef68
2019-05-02 08:59:11 +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 f722adda85 Improved: Submit button should not display when there is no item present over Quote Prices Screen.
(OFBIZ-10627)
Thanks Ratnesh Upadhyay for reporting the issue and Kumar Rahul for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858241 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 06:00:20 +00:00
Rishi Solanki 95979acf0e [Fixed] Incorrect decorator being used over view all promotions and view promotion details screen causing back navigation. Change the decorator name on the showAllPromotions and showPromotionDetails screens. Now user can go back after navigating to both screens.
(OFBIZ-10859)
Thanks to Ratnesh Upadhyay for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1856627 13f79535-47bb-0310-9956-ffa450edef68
2019-03-30 13:39:07 +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
Nicolas Malin 98814e5c03 Improved: Convert QuoteServices.xml mini lang to groovy - Deprecate Mini Lang
(OFBIZ-10553) (OFBIZ-9350)
Convert all QuoteServices.xml and their xml test
Thanks to Antoine Ouvrard, Leila Mekika, Gil Portenseigne and Mathieu Lirzin for this team work to convert all function and tests case

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1849800 13f79535-47bb-0310-9956-ffa450edef68
2018-12-27 14:40:03 +00:00
Jacques Le Roux 356984ce4f Fixed: Dependent dropdowns should be used in createPostalAddress and
Set Billing screens of ordermgr.
(OFBIZ-10681)

If you create an EFT account from the quick finalyse page, at 
ordermgr/control/createPostalAddress the US states which are proposed by default 
are not the US states but all states. 
You still can pick one US state, but it's counter intuitive.

Thanks: Aman Mishra for the fix and finding of Set Billing screen

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1849567 13f79535-47bb-0310-9956-ffa450edef68
2018-12-22 19:18:49 +00:00
Nicolas Malin c7d7b23144 Improved: Migrate from minilang to entity-auto createQuoteWorkEffort et deleteQuoteWorkEffort.
(OFBIZ-10553)
But createQuoteWorkEffort is not a crud service on entity QuoteWorkEffort because it is linked to a seca to call createWorkeffort before if a workEffortId is not present in context.

<eca service="createQuoteWorkEffort" event="in-validate">
   <condition field-name="workEffortId" operator="is-empty"/>
   <action service="createWorkEffort" mode="sync"/>
</eca>

I converted this service createQuoteWorkEffort has a real Crud service and create an other ensureWorkEffortAndCreateQuoteWorkEffort to simulate the attendee process. Now we have a coherent service naming and not surprise for developer .
To manage the service createQuoteWorkEffort as deprecated, I define it twice

     <service name="createQuoteWorkEffort" default-entity-name="QuoteWorkEffort" engine="entity-auto" invoke="create" auth="true">
        <deprecated use-instead="ensureWorkEffortAndCreateQuoteWorkEffort" since="Upcoming Release">
            use createQuoteWorkEffort to create a workeffort has been deprecated for best pratice naming reason, use ensureWorkEffortAndCreateQuoteWorkEffort instead.
            Now createQuoteWorkEffort work as a crud service on QuoteWorkEffort
        </deprecated>
    </service>
    <service name="createQuoteWorkEffort" default-entity-name="QuoteWorkEffort" engine="entity-auto" invoke="create" auth="true">
        <description>Create a new QuoteWorkEffort</description>
        <required-permissions join-type="AND">
            <check-permission permission="ORDERMGR" action="_CREATE"/>
        </required-permissions>
        <auto-attributes mode="IN" include="pk"/>
     </service>

First to alert on deprecation and second ensure that the definition work fine.
In log we will have an alert on the deprecation and an alert on the duplicated definition during the deprecation time.

Thanks to Antoine Ouvrard, Gil Portenseigne, Leila Mekika and Mathieu Lirzin for their review

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1847056 13f79535-47bb-0310-9956-ffa450edef68
2018-11-20 20:19:34 +00:00
Deepak Dixit ff6a962841 Improved: Standardise layout for Order
(OFBIZ-10332)
Thanks Dennis Balkir for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1828918 13f79535-47bb-0310-9956-ffa450edef68
2018-04-11 18:29:12 +00:00
Michael Brohl 18913ff6a4 Fixed: Removing Birt dependencies in ReportScreens.xml.
(OFBIZ-10283)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1826805 13f79535-47bb-0310-9956-ffa450edef68
2018-03-15 12:31:31 +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
Jacques Le Roux 8e71b3f69c Improved: Remove ftl dependency in order on ecommerce
(OFBIZ-6946)

Currently there are dependencies in the order component on the ecommerce 
component. Order management should work without the ecommerce component.

jleroux: I simply removed the commented out lines, no need for a patch
There are still a lot of other dependencies in the order component on the 
ecommerce component...

Thanks: Pierre for report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1821356 13f79535-47bb-0310-9956-ffa450edef68
2018-01-17 12:10:17 +00:00