Commit Graph
102 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
Jacques Le Roux caded9e937 Fixed: Hyperlink title under form widget doesn't support character encoding for special characters (OFBIZ-12026)
When we use any title with special characters for hyperlink tag, it shows broken
string on UI, eg:
<hyperlink description="${uiLabelMap.CommonImportExport}"  target="ImportExport">
should render a button with the title "Import/Export. But it shows as
Import&#x2f;Export

jleroux: I have noticed that the same happens with special French characters.
So it's a general issue.
The title (description in code) is HTML encoded and that does not work for
special characters. I simply used a string encoder.

Thanks: Pradeep Choudhary for report, Sourabh Jain for a possible but not
general solution at OFBIZ-12023, ie using target-type="plain"
2020-12-11 13:40:53 +01:00
Jacques Le Roux 06e56ed7e9 Improved: Invoice import is not visible from UI and not working (OFBIZ-12089)
While working on OFBIZ-12080 I found an upload feature that allows to import
invoices but it's not visible from UI and not working.
Moreover the export feature was missing a parameters as the import.

It has been introduced by Hans Bakker with
https://svn.apache.org/repos/asf/ofbiz/trunk@1502093
and I'm not sure the integration was completed.

We could remove it, but I think it can be useful and does not seem to miss much
to work fine.

Also use an uploadedFile label in ImportParty and UploadContent forms
2020-12-08 17:22:24 +01:00
Jacques Le Roux b549b9aa19 Fixed: Label issue on List Companies page (OFBIZ-12023)
Navigate to URL: 'accounting/control/ListCompanies'
Under the companies list, the 2nd column has button for account
The System is not showing proper label in French.

This issue is occurring due to the hyperlink title is not supporting character
encoding for special characters. Please track progress under OFBIZ-12026.
2020-12-07 18:45:25 +01:00
Jacques Le Roux 976cef7fa0 Fixed: Label issue on List Companies page (OFBIZ-12023)
Navigate to URL: 'accounting/control/ListCompanies'
Under the companies list, the last column has button for import export.
The System is not showing proper label.

This issue is occurring due to the hyperlink title is not supporting character
encoding for special characters. Please track progress under OFBIZ-12026.

Thanks: Lalit Dashora for report, sourabh jain for patch, Daniel Watford for test
2020-11-30 12:02:21 +01:00
Pierre SmitsandPawan Verma e1ab3b1e99 Improved: Enhance entity "GlXbrlClass" and use (OFBIZ-10613) (#41)
* Improved: Enhance entity "GlXbrlClass" and use

(OFBIZ-10613)

Adding field parent of the GlXbrlClassId
Application of field in appropriate forms

* Improved: Added new field parentGlXbrlClassId into DATAMODEL_CHANGES.md
(OFBIZ-10613)

Co-authored-by: Pawan Verma <pawan.verma@hotwaxsystems.com>
2020-05-08 16:34:40 +05:30
Suraj Khurana 61b451dd0b Improved: Consistency and Readability improvements for option (form widget) tag.
(OFBIZ-8930)
Thanks Devanshu Vyas for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1845081 13f79535-47bb-0310-9956-ffa450edef68
2018-10-29 08:02:45 +00:00
Nicolas Malin 7e60d42314 Fixed: correct just a type introduce by editor auto-saving just before commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1824437 13f79535-47bb-0310-9956-ffa450edef68
2018-02-16 09:10:44 +00:00
Nicolas Malin 8aa723a98a Implemented: Add PartyPrefDocTypeTpl entity to link official template document to organisational party (OFBIZ-10186)
With this entity we can link a customScreen with an organisational party for a document type like salesinvoice, product quote and so on.
I added screen, form and menu to manage them on the organisation party configuration page accounting/control/ListCompanies
Currently this isn't useful alone but needed for issues OFBIZ-10215, OFBIZ-10216, OFBIZ-10217 that will be completed soon

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1824436 13f79535-47bb-0310-9956-ffa450edef68
2018-02-16 09:04:06 +00:00
Jacques Le Roux bf092f9c6e Fixed: GlAccountOrganizations manually added using accounting forms do not
appear on trial report because fromDate gets set to NULL
(OFBIZ-5938)

This was broken again when changing the createGlAccountOrganization service 
to entity-auto

Thanks: Rajesh Kumar Mallah for reporting

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812226 13f79535-47bb-0310-9956-ffa450edef68
2017-10-15 17:53:04 +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 1337db5cb2 Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8926) (OFBIZ-8927)

Thanks: Ankush Upadhyay for the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768235 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 16:11:36 +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
Pranay Pandey 3b6417f6d1 Improved: Accounting list forms column title alignment.
(OFBIZ-8278)

Thanks: Aditi Patidar for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1765011 13f79535-47bb-0310-9956-ffa450edef68
2016-10-15 05:41:01 +00:00
Divesh Dutta 556279917d Improved:Display from date with default to now timestamp and also add asterisk sign to all the forms where it is part of primary key in all the components.
(OFBIZ-7650) (OFBIZ-7651) (OFBIZ-7653) (OFBIZ-7660) (OFBIZ-7662) (OFBIZ-7665) (OFBIZ-7666) (OFBIZ-8028)(OFBIZ-8029) (OFBIZ-8255)

Thanks: Anuj Jain and Ratnesh for the pathes and Swapnil Shah for reporting the issues.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761192 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 11:02:39 +00:00
Michael Brohl 923b980f29 Improved: Accounting: Consistent form name.
(OFBIZ-8045)

Change all form names to upper camel case for consistency.

Thanks: Tanmay Muley for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761077 13f79535-47bb-0310-9956-ffa450edef68
2016-09-16 20:27:26 +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
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
Deepak Dixit 87601f6aca (OFBIZ-7219) Relocate .groovy files in the accounting component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747746 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 16:54:38 +00:00
Hans Bakker 9d39583bcf be able to set accounting company in the header, so other companent can change it too. https://issues.apache.org/jira/browse/OFBIZ-6802
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728584 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 01:45:50 +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
Jacopo Cappellato ecfc14a6bc ${bsh: to ${groovy: scriptlet conversions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1613432 13f79535-47bb-0310-9956-ffa450edef68
2014-07-25 13:28:20 +00:00
Jacopo Cappellato 5daa29eeab Applied patch from OFBIZ-5592: made more consistent the Chart of Accounts screen in Global GL Settings with the one in Organisational GL Settings.
Thanks to Pierre Smits for the contribution (and to Anahita Goljahani for the tests).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1603434 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 12:50:41 +00:00
Jacopo Cappellato 3874109539 A pretty important refactoring of some GL data and code that fixes a series of long standing gaps, errors and design issues affecting account balances and the closure of fiscal periods (some of them introduced by me when I initially wrote the first version of these business logics; at that time I didn't have a clear and deep enough understanding of these accounting rules sigh…).
This new version is cleaner (less code, less redundancy of information), correct and it also resolves some pretty relevant issues (including some db deadlock errors) affecting performance in instances with medium/high number of GL postings.
Here is a list of changes introduced in this commit:
* removed the postedBalance field from GlAccount and GlAccountOrganization: this was a wrong design; the field in GlAccount was not used by the applications; the field in GlAccountOrganization was used but not consistently
* added openingBalance field to GlAccountHistory: now this entity has full information about an account in a financial period after the period closed (opening and ending balance, posted debits and credits); now the endingBalance is computed correctly both for Debits and Credits accounts
* updated demo data for the data model changes mentioned above
* the business logic to compute the account balances is now implemented in a service (computeGlAccountBalanceForTimePeriod) and reused consistently
* removed several FIXME/TODO comments now that the new code addresses the related gaps and issues
* removed some old, incorrect or no more used artifacts: getGlAcctgOrgWithPostedBalanceSplit (service), getNetBalance (utily methods)
* refactored the TrialBalanceReport and GlAccountTrialBalance reports and related pdf versions: the new versions have cleaner code and show the correct balances both for debits and credits
* fixed a series of Groovy compilation issues due to missing imports


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1530273 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 13:49:19 +00:00
Hans Bakker baff7e8119 revert r1505301, not required to show organization partyId in csv download
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1505878 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 01:58:17 +00:00
Hans Bakker 03420d2e7d correction to rev 1502093
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1505301 13f79535-47bb-0310-9956-ffa450edef68
2013-07-21 08:34:08 +00:00
Hans Bakker 6d7fd95df4 more consistent namimg of requests,screens and forms for import/export invoices
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1502149 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 08:33:24 +00:00
Hans Bakker c09114575f spelling error in reference number field invoice export/import
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1502116 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 04:33:04 +00:00
Hans Bakker ad8ae088de add a csv import/export invoices at an organizational level with partyid and productid translation functions, more imports/exports will follow
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1502093 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 03:14:30 +00:00
Hans Bakker cecc38b6b6 fixed problem of not able to add accounting company, caused by r1494034 and reported by Pierre at https://issues.apache.org/jira/browse/OFBIZ-5229
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1494435 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 03:59:17 +00:00
Scott Gray a5fc6fad11 FIX: The Sales/Purchase Invoice GlAccount Override screen would always so the Remove button even when no overrides were in place
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493505 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 12:51:52 +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
Erwan de Ferrieres 201fc9ed3b OFBIZ-4636 - On Depreciation screens for FixedAssets in both Accounting (setup) and Asset Maintenance no mapping for GlAccounts are shown. - A patch from Pierre Smits
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1231004 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 11:09:37 +00:00
Jacques Le Roux 911990f1b5 A patch from Nicolas Malin "Use CustomMethod for select order, quote and invoice hook to resolve id." (https://issues.apache.org/jira/browse/OFBIZ-3765) - OFBIZ-3765
JLR: Quoting Anne on user ML: There are still some files that refer to the deprecated

        * invoiceSequenceEnumId,
        * quoteSequenceEnumId
        * orderSequenceEnumId fields of PartyAcctgPreference.

    Files I know of are:

    applications/accounting/servicedef/services_admin.xml
    applications/accounting/widget/GlSetupForms.xml
    applications/commonext/script/org/ofbiz/setup/SetupEvents.xml

Nicolas: quick corrections to use old attributes. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1065014 13f79535-47bb-0310-9956-ffa450edef68
2011-01-29 13:18:46 +00:00
Hans Bakker c27642ee41 - solve groovy syntax at PartyAcctgPreference form
- set default logo from accounting company or when not present the ofbiz logo and allow the browser to set trhe size from the logo image.
  1.) TrialBalance.rptdesign
  2.) InvoiceAcctgTransEntry.rptdesign
  3.) AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
  4.) IncomeStatement.rptdesign
  5.) PaymentAcctgTransEntry.rptdesign
svn commit -m 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1028621 13f79535-47bb-0310-9956-ffa450edef68
2010-10-29 05:56:21 +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
Jacopo Cappellato e177f478d1 Fixed invalid value for the "type" attribute of a set operation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@926767 13f79535-47bb-0310-9956-ffa450edef68
2010-03-23 20:42:42 +00:00
Jacopo Cappellato c46469c488 Fixed typo in variable name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912588 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 14:43:08 +00:00
Jacopo Cappellato 4289dad8e1 Fixed bug that was preventing the loading of content for acctg party preference form.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912583 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 14:32:22 +00:00
Jacopo Cappellato 81990aea5d Another step in the implementation of automatic transactions for fixed assets: implemented screen to setup global mappings for a specific asset
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@900792 13f79535-47bb-0310-9956-ffa450edef68
2010-01-19 14:31:49 +00:00
Ashish Vijaywargiya 88a092d2f9 Applied patch from jira issue OFBIZ-3320 - improvement in Find screen.
Fix title of buttons to Find, for all the find screens to maintain consistency. 

Thanks Chandan for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@889084 13f79535-47bb-0310-9956-ffa450edef68
2009-12-10 04:29:19 +00:00
Ashish Vijaywargiya 0685b12452 Applied patch from Parimal Gain - Getting error in create PartyAccounting Preference record.
To reproduce the issue perform following steps -

    * Select Organizations at https://localhost:8443/accounting/control/PartyAcctgPreference (say Testing Team 1)
    * After selection at next page fill form by required fields.
    * Submit form by click on "Add" button.
    * You will get error message here.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835359 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 12:07:25 +00:00
Anil Patel f20d6df304 Moved call to getPartyAccountingPreferences from PartyAcctgPreference screen to form. This is much more flexible.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834359 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 06:07:21 +00:00
Ashish Vijaywargiya 6f05e4881c Applied patch from jira issue OFBIZ-3088 - Getting error on the console: Error parsing '${uiLabelMap.}'.
Getting error on the console after hitting following url :
https://localhost:8443/accounting/control/AdminMain?organizationPartyId=Company

Error:
2009-10-26 11:44:57,186 (http-0.0.0.0-8443-4) [FlexibleStringExpander.java:405:ERROR] Error evaluating expression: javax.el.ELException: Error parsing '${uiLabelMap.}': syntax error at position 13, encountered '}', expected <IDENTIFIER>
2009-10-26 11:44:57,191 (http-0.0.0.0-8443-4) [FlexibleStringExpander.java:405:ERROR] Error evaluating expression: javax.el.ELException: Error parsing '${uiLabelMap.}': syntax error at position 13, encountered '}', expected <IDENTIFIER>
2009-10-26 11:44:57,195 (http-0.0.0.0-8443-4) [FlexibleStringExpander.java:405:ERROR] Error evaluating expression: javax.el.ELException: Error parsing '${uiLabelMap.}': syntax error at position 13, encountered '}', expected <IDENTIFIER>
2009-10-26 11:44:57,199 (http-0.0.0.0-8443-4) [FlexibleStringExpander.java:405:ERROR] Error evaluating expression: javax.el.ELException: Error parsing '${uiLabelMap.}': syntax error at position 13, encountered '}', expected <IDENTIFIER>
2009-10-26 11:44:57,203 (http-0.0.0.0-8443-4) [FlexibleStringExpander.java:405:ERROR] Error evaluating expression: javax.el.ELException: Error parsing '${uiLabelMap.}': syntax error at position 13, encountered '}', expected <IDENTIFIER>
2009-10-26 11:44:57,206 (http-0.0.0.0-8443-4) [FlexibleStringExpander.java:405:ERROR] Error evaluating expression: javax.el.ELException: Error parsing '${uiLabelMap.}': syntax error at position 13, encountered '}', expected <IDENTIFIER>
2009-10-26 11:44:57,209 (http-0.0.0.0-8

Thanks Brajesh / Rishi for your contribution.
 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829794 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 13:42:55 +00:00
Jacques Le Roux b7a941d4f6 Revert r813307 on Adrian's request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813893 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 16:02:01 +00:00