Commit Graph
30 Commits
Author SHA1 Message Date
James Yong 2c62637752 Improved: Apply multi-block attr to each application (OFBIZ-11706)
For Accounting, Content, HR, Manufacturing.
2020-05-15 17:43:38 +08:00
Pawan Verma 1b6c632992 Fixed: Creating custom Time Period does not show in party time period
(OFBIZ-10904)

Thanks, Pierre and Jacques for your contribution.
2020-05-04 15:20:05 +05:30
Pierre Smits 3c5224c351 Improved: unify style application
(OFBIZ-11458)

replace 'align-float' with 'align-text'
2020-03-24 09:01:40 +01:00
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
Deepak Dixit b5da481d29 Improved: Use input type=submit for form submission (OFBIZ-10482)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1837892 13f79535-47bb-0310-9956-ffa450edef68
2018-08-12 08:52:51 +00:00
Deepak Dixit ef0c694a46 Improved: Use application/javascript instead of text/javascript
(OFBIZ-10492)
Replace text/javascript with application/javascript in all the script tag

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1836886 13f79535-47bb-0310-9956-ffa450edef68
2018-07-28 10:51:52 +00:00
Deepak Dixit 397628ba7d Improved: Remove use of deprecated language attribute from script tag
(OFBIZ-10491)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1836545 13f79535-47bb-0310-9956-ffa450edef68
2018-07-24 11:26:23 +00:00
Nicolas Malin 55c64af90d Improved: Resolve shipping address from Invoice
(OFBIZ-10249)
In some country (like european) you need to indicate on your sales invoice where you ship the finish good product related.
To help this case, I added a new worker function (InvoiceWorker.getShippingAddress) to found information from an invoice and improve the generic EditInvoice.groovy and the invoice ftl template to display it as example.
To homogenize postal address displaying with order I use the subscreen PartyScreens.xml#postalAddressPdfFormatter on the invoice ftl template

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1835028 13f79535-47bb-0310-9956-ffa450edef68
2018-07-03 21:58:32 +00:00
Nicolas Malin b48d0cadc5 revert revision 1830301 that contains mix improvement, i will recommit them correclty
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1830302 13f79535-47bb-0310-9956-ffa450edef68
2018-04-27 07:26:33 +00:00
Nicolas Malin 2695743cae Fixed: ConfigXMLReader - Events are not executed in the order defined
(OFBIZ-10369)
The events contained in the controller configuration for first-visit, pre-post processor and before-after login are executed in arbitrary order rather than the defined order.
If we define an event configuration as follow:

    <after-login>
        <event name=keepCartUpdated type=java path=org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents invoke=keepCartUpdated/>
        <event name=restoreAutoSaveList type=java path=org.apache.ofbiz.order.shoppinglist.ShoppingListEvents invoke=restoreAutoSaveList/>
        <event name=saveCartToAutoSaveList type=java path=org.apache.ofbiz.order.shoppinglist.ShoppingListEvents invoke=saveCartToAutoSaveList/>
    </after-login>

We wait that OFBIz run keepCartUpdated, restoreAutoSaveList and after saveCartToAutoSaveList event but the HashMap who organise them return arbitrary order and can return saveCartToAutoSaveList, keepCartUpdated and restoreAutoSaveList. Convert the HashMap to LinkedHashMap help to keep the loaded order.

Thanks to Vikas Mayur for solve this issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1830301 13f79535-47bb-0310-9956-ffa450edef68
2018-04-27 07:21:47 +00:00
Nicolas Malin 2a2e0b6edc Improved: Resolve invoiceItem description from InvoiceWorker
(OFBIZ-10240)
To help the invoiceItem description resolution, I created a worker in InvoiceWorker to resolve it like this :
 1 take the item description field
 2 if tax associate, resolve the taxAuthorityRateProduct description
 3 if product associate, call content wrapper to resolve PRODUCT_NAME or take the brandName
 4 take the item Type line description

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1825300 13f79535-47bb-0310-9956-ffa450edef68
2018-02-25 10:33:33 +00:00
Deepak Dixit 7e19de9966 Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029)
Applied slightly modified patch, rearrange import properly, 
Thanks Suraj Khurana for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818003 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 12:03:17 +00:00
Deepak Dixit 63258e90f8 Reverted r#1817989, workign fine locally, reverted for now will check and commit again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817998 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 10:42:32 +00:00
Deepak Dixit d1f85a7e5d Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029)
Applied slightly modified patch, rearrange import properly, 
Thanks Suraj Khurana for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817989 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 09:21:33 +00:00
Deepak Dixit d310aaf2cd Improved: Inconsistent String Comparisons, Applied patch for ftl file.
Thanks Devanshu Vyas for your contribution. (OFBIZ-9254)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812285 13f79535-47bb-0310-9956-ffa450edef68
2017-10-16 11:31:40 +00:00
Arun Patidar df3aba2f65 ADDED: Apply new ruleSet definition into Ofbiz files. (OFBIZ-9515)
Thanks Pradhan Yash Sharma for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809426 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 13:22:03 +00:00
Arun Patidar 35b93c82a1 Added missing file those of part of 1801320, also updated the path in screens. (OFBIZ-6774)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801359 13f79535-47bb-0310-9956-ffa450edef68
2017-07-09 09:28:35 +00:00
Jacopo Cappellato 349355ce9e Fixed: corrected a wrong UI label name that was causing an error in the
financial account transactions screen.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1793652 13f79535-47bb-0310-9956-ffa450edef68
2017-05-03 14:26:50 +00:00
Ashish Vijaywargiya 8144811a46 Applied patch from jira issue - OFBIZ-7860 - Clean up commented out code in Free Marker Template for Accounting.
Thanks so much Aman for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752953 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 13:07:03 +00:00
Deepak Dixit 834691742b (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Divesh Dutta bb56054523 [OFBIZ-7577] Accounting component: Checkbox and Radio buttons should get selected on clicking upon their labels. Thanks Devanshu Vyas for your patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751338 13f79535-47bb-0310-9956-ffa450edef68
2016-07-04 16:41:37 +00:00
Ashish Vijaywargiya 43793ed0fa Applied patch from jira issue - OFBIZ-7216 - Error with GL Account Trial Balance pdf.
Thanks Ravi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747514 13f79535-47bb-0310-9956-ffa450edef68
2016-06-09 09:08:37 +00:00
Ashish Vijaywargiya 97cc7ef837 Applied patch from jira issue - OFBIZ-7215 - Error with Cost Centers Report pdf.
Thanks Ravi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747401 13f79535-47bb-0310-9956-ffa450edef68
2016-06-08 14:35:26 +00:00
Pranay Pandey 69a1fcbb5d [OFBIZ-7162] No functional changes, corrected formatting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746968 13f79535-47bb-0310-9956-ffa450edef68
2016-06-06 06:48:14 +00:00
Pranay Pandey 4ef918dc28 [OFBIZ-7162] Fixed security issue with delete child period in EditCustomTimePeriod.
Thanks Montalbano Florian for reporting the issue and thanks Arjun Kaushal for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746820 13f79535-47bb-0310-9956-ffa450edef68
2016-06-04 13:20:58 +00:00
Ashish Vijaywargiya 439d829353 Applied patch from jira issue - OFBIZ-7156 - Free marker template error on Edit Custom Time Periods for Child Periods.
Thanks Ravi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746785 13f79535-47bb-0310-9956-ffa450edef68
2016-06-04 08:40:25 +00:00
Deepak Dixit 09ca38b7f6 (OFBIZ-7164) Fix typo in freemarker else tag.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746691 13f79535-47bb-0310-9956-ffa450edef68
2016-06-03 08:59:56 +00:00
Deepak Dixit 22257c6996 (OFBIZ-7021) Renamed accounting component ftl file name from lower case to upper case.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742358 13f79535-47bb-0310-9956-ffa450edef68
2016-05-05 05:30:40 +00:00
Deepak Dixit dde7b5e8e0 (OFBIZ-6813) Added missing files at r#1738754. Moved accounting/ap, accounting/ar files into template folder.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738757 13f79535-47bb-0310-9956-ffa450edef68
2016-04-12 10:23:12 +00:00
Deepak Dixit 8ace9fbcb6 (OFBIZ-6813) Apply patch from jira issue.
============================================================
relocate .ftl files in the accounting component
============================================================

Thanks Pierre Smits for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738754 13f79535-47bb-0310-9956-ffa450edef68
2016-04-12 10:17:36 +00:00