Commit Graph
71 Commits
Author SHA1 Message Date
Jacques Le Roux 4d646ce052 Improved: Use "Create" instead of "Create New" on the various screens of all
components
(OFBIZ-9905)

As the title says + removes now useless labels

Thanks: Aayush Jain for report, Sourabh Jain for the fix, Pierre Smits and 
Rishi Solanki for comments

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858291 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 17:56:44 +00:00
Jacopo Cappellato 9537673e5b Fixed: straight line fixed asset depreciation method was not computing properly
depreciation transactions for assets that are used after their expected end of 
life.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1783388 13f79535-47bb-0310-9956-ffa450edef68
2017-02-17 12:45:31 +00:00
Deepak Dixit b9f5d0828f Improved: Consitent menu bar in following screens decorator:
- Agreement
- Billing Account 
- Financial Account
- Fixed Assets
- Maintenance

(OFBIZ-8180)(OFBIZ-8178)(OFBIZ-8177)(OFBIZ-8176)(OFBIZ-8175)

Thanks Avnindra Sharma for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768265 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 18:19:56 +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
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
Adrian Crum 771e10f1c4 First pass at extracting grid widget from the form widget. This commit has a lot of duplicate code - future commits will reduce and reuse the duplicate code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1654670 13f79535-47bb-0310-9956-ffa450edef68
2015-01-25 17:18:24 +00:00
Erwan de Ferrieres baf9a03086 Adding missing uiLabels in FixedAssetScreens.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230460 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 09:58:32 +00:00
Bruno Busco 618fa21fb1 Added "create" style on create new buttons
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1026282 13f79535-47bb-0310-9956-ffa450edef68
2010-10-22 10:36:50 +00:00
Jacopo Cappellato ee63073271 Fixed a series of errors thrown by the depreciation algorithms on certain data (null pointer exceptions, divide by zero operations).
This also fixes a bug reported in the users list by Jhanneth Andrade Sajami.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@925162 13f79535-47bb-0310-9956-ffa450edef68
2010-03-19 10:21:41 +00:00
Jacopo Cappellato ae0ea3fcb9 Moved the position of fixed asset depreciation screenlets in order to make the screen more organized.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915279 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 11:05:34 +00:00
Jacopo Cappellato 536c1b8d0c Completed implementation for semi automatic creation of accounting transactions for fixed asset depreciations from the fixed asset detail screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915261 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 09:51:23 +00:00
Jacopo Cappellato e1c5750551 Initial support for semi automatic accounting transactions for fixed asset depreciations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912661 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 17:09:33 +00:00
Bilgin Ismet Ibryam c7c5d8831b Fixed NPE in Fixed asset geo location screen.
Commented out not used code and removed unnecessary isEmpty checks.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@911328 13f79535-47bb-0310-9956-ffa450edef68
2010-02-18 11:08:35 +00:00
Jacopo Cappellato d9283fecf6 Modified depreciation services to compute and return the next depreciation amount based on actual history of depreciations. Added information in the "depreciation" screen of fixed asset about depreciation parameters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@903321 13f79535-47bb-0310-9956-ffa450edef68
2010-01-26 16:56:26 +00:00
Erwan de Ferrieres a10c937891 Adding new uiLabels and removing some hardcoded labels in fixedAsset
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@902808 13f79535-47bb-0310-9956-ffa450edef68
2010-01-25 13:45:53 +00:00
Bruno Busco b90e0394df Added several "button-bar" wrapping divs to have button bars rendered consistently.
Added several "create" class styles for create/new buttons.
All this will be used in a new theme me and Erik Schuessler are working on...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@902175 13f79535-47bb-0310-9956-ffa450edef68
2010-01-22 17:00:55 +00:00
Jacopo Cappellato 8c4dd5cb6e First step in the implementation of automatic transactions for fixed assets:
* new entity to setup account mappings for all assets, by asset type or for a specific asset
* screen to setup mappings for a specific asset



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@900727 13f79535-47bb-0310-9956-ffa450edef68
2010-01-19 11:24:34 +00:00
Jacopo Cappellato 6d215a87db Improved error handling of fixed asset depreciation algorithm in the "Depreciation" tab.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@900329 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 10:24:07 +00:00
Erwan de Ferrieres 595517b3bf JIRA-3381 : Update of the geolocation screen in party (https://issues.apache.org/jira/browse/OFBIZ-3381)
The geoChart screen is now used for all the geolocalization calls.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@899560 13f79535-47bb-0310-9956-ffa450edef68
2010-01-15 08:28:51 +00:00
Jacopo Cappellato 01707fdddb Implemented form to list, in the fixed asset depreciation screen, the accounting transactions created for the fixed asset.
Fixed a couple of invalid simple method operations I committed in my last commit.
 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@899158 13f79535-47bb-0310-9956-ffa450edef68
2010-01-14 10:59:44 +00:00
Jacopo Cappellato 04548bee96 Refactored fixed asset depreciation screen and improved data preparation service; replaced (poorly implemented) ftl template with a simple form definition.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@899142 13f79535-47bb-0310-9956-ffa450edef68
2010-01-14 10:14:46 +00:00
Jacopo Cappellato bb17b94670 First step in the implementation of the screens and services to setup depreciation formulae for fixed assets.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@898869 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 18:22:14 +00:00
Anil Patel 52e7a3ad66 Removed extra container around labels. Apply h1 (or h2, h3) style to label instead.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834376 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 07:38:24 +00:00
Bruno Busco 4740d3a616 Part of OFBIZ-3067 - Menus and form widget files location
Accounting component
Moved forms from webapp to widget folder


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828868 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 21:57:30 +00:00
Bruno Busco ca9d334eee Part of OFBIZ-3067 - Menus and form widget files location
Accounting component
Renamed accounting/widget/Menus.xml to accounting/widget/AccountingMenus.xml
Renamed accounting/widget/ap/Menus.xml to accounting/widget/ap/ApMenus.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828855 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 21:17:14 +00:00
Bruno Busco 87a421db00 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826270 13f79535-47bb-0310-9956-ffa450edef68
2009-10-17 15:14:14 +00:00
Adrian Crum 392410f12d Fixed broken fixed asset calendars.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796878 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 21:02:08 +00:00
Adrian Crum f8fa9e3106 Put the fixed asset decorator screen back where it belongs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796873 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 20:35:18 +00:00
Hans Bakker fd36165353 Calendars now working in accounting, workeffort and myportal with fixed asset, facility and party. reported by adrian and with help from Jacopo.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791057 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 04:21:29 +00:00
Hans Bakker dd6243832e make the changed calendar screens also working in the accounting component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@786951 13f79535-47bb-0310-9956-ffa450edef68
2009-06-21 08:22:18 +00:00
Adrian Crum 4489f97979 Some trivial layout and UI label fixups for the Fixed Asset Geo Location feature. This is a really cool feature, btw. Kudos to whoever created it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@781851 13f79535-47bb-0310-9956-ffa450edef68
2009-06-04 20:47:02 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacques Le Roux a5042291f7 1st part of an effort to remove trailing spaces
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Jacques Le Roux 76f5ca6638 Secure URLs, we don't need to duplicate in from-field when param-name is the same
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Jacques Le Roux b1a100f172 Securing URLs, link element in screens and menus : 8th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760684 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 22:23:40 +00:00
Jacques Le Roux 13f8903e35 A patch from Santosh Malviya " Fixed Asset Geo Location Screen not showing" (https://issues.apache.org/jira/browse/OFBIZ-2204) - OFBIZ-2204
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@747100 13f79535-47bb-0310-9956-ffa450edef68
2009-02-23 18:40:07 +00:00
Marco Risaliti 54e0334ca2 A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742770 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 22:13:57 +00:00
Jacques Le Roux ce297d5a9b Add geolocation screens to Facility ContactMechs, FacilityLocation and FixedAsset + miscellaneous enhancements, also in data.
I have began to refactor toward putting as much as possible geolocation artifacts in framework/common with the idea of creating an applications/common component where all shared (transversal) features/artifacts would be. More explanations on dev ML soon...
There is also an unused taxAuthorityVATReport request/view-map in accounting controller (part of another task I slowly work on)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738452 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 11:03:20 +00:00
Marco Risaliti 8ed72242d9 Artifact cleaning on accounting component after recent changes on xsd files (OFBIZ-2137)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737563 13f79535-47bb-0310-9956-ffa450edef68
2009-01-25 18:33:55 +00:00
Marco Risaliti 1a3edc02f8 A lot of cleaning into MyPage/MyPortal/Pos/ProjectMgr components and some italian translations (Part of OFBIZ-1780)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735131 13f79535-47bb-0310-9956-ffa450edef68
2009-01-16 21:03:44 +00:00
Marco Risaliti c059520ae4 Misc clean up on Accounting labels (Part of OFBIZ-1780)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730637 13f79535-47bb-0310-9956-ffa450edef68
2009-01-01 23:18:32 +00:00
Adrian Crum 647530a6d2 Eliminated some unnecessary nested expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724882 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 20:55:33 +00:00
Adrian Crum 9a079d4499 Better integration of the WorkEffort calendar into the Fixed Asset component. This also includes some bug fixes.
Internationalization note: this commit contains a new UI label.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677731 13f79535-47bb-0310-9956-ffa450edef68
2008-07-17 21:23:43 +00:00
Adrian Crum 2325671d8c More Asset Maint work - eliminated redundant controller.xml entries, fixed a Fixed Asset screen reuse issue.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677639 13f79535-47bb-0310-9956-ffa450edef68
2008-07-17 17:09:29 +00:00
Adrian Crum 1f4e8de91d Fixed Asset Meter refactor, based on the patch in https://issues.apache.org/jira/browse/OFBIZ-1851.
This commit replaces the FixedAssetMaintMeter entity with a more generic FixedAssetMeter entity. There is a service available to migrate data in existing installations - migrateFixedAssetMaintMeter. The original FixedAssetMaintMeter behavior has been maintained - nothing changes from the user's perspective.

Meter readings will trigger the creation of a fixed asset maintenance if the fixed asset has been set up with product maintenances.

Many thanks to David Jones and Anil Patel for their help with this.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@673842 13f79535-47bb-0310-9956-ffa450edef68
2008-07-03 22:10:55 +00:00
Adrian Crum eb102be45f Updated some Find screens to use the new default search result property.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@670712 13f79535-47bb-0310-9956-ffa450edef68
2008-06-23 19:03:40 +00:00
Adrian Crum 0d29f71477 More UI work on Fixed Assets.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@663782 13f79535-47bb-0310-9956-ffa450edef68
2008-06-05 23:32:24 +00:00