Commit Graph
46 Commits
Author SHA1 Message Date
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
Adrian Crum 87acb57984 UI work in the Facility Manager component. Based on recent dev ml discussions:
1. Reduced number of screenlets used
2. Add Item plus Item List screens have Add Item on top, added collapsible screenlets
3. Used placeholders in UI labels for better internationalization.

Internationalization note: I added a few labels to ProductUiLabels and changed a few others. Non-English languages need to be updated.

The browser title bar has more information in it. Helpful for reviewing browser history.

There is still a lot of work that needs to be done on this.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@662306 13f79535-47bb-0310-9956-ffa450edef68
2008-06-02 02:02:35 +00:00
Jacopo Cappellato 0ac5f4cd29 Converted another bsh script to groovy: there are a lot more improvements that can be done on this (the original bsh script was not very good actually), but for now this is hopefully enough.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@662159 13f79535-47bb-0310-9956-ffa450edef68
2008-06-01 07:25:32 +00:00
Adrian Crum b1cb94b23c Major layout fixes in the Accounting Fixed Asset screens. I eliminated a number of unnecessary screenlets, added more meaningful UI labels, and changed the arrangement of some screens.
In the case where a screen has a list of items in combination with a form to add an item to the list, it is better to have the form on top of the list, so that as items are entered, the form isn't scrolled off the screen. In those types of screens, I made the form collapsible so that you have more room to scroll through the list.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@658838 13f79535-47bb-0310-9956-ffa450edef68
2008-05-21 20:02:02 +00:00
Adrian Crum 6c27cb75a3 Improved Find Fixed Asset screen. Follows layout best practices by using the Find screen decorator, adds search options, uses Ajax for list navigation, uses permission service checking so the screen can be reused.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@658559 13f79535-47bb-0310-9956-ffa450edef68
2008-05-21 05:40:56 +00:00
Adrian Crum 68c1dbbaf9 Second sweep through the maincss.css style sheet. Changed the head1, head2, and head3 style names to h1, h2, and h3. Updated affected styles in ftl and xml files.
The ecommerce component is excluded from this commit.

These changes shouldn't break any layout. If you spot something wrong, let me know and I'll fix it.

I won't make any more maincss.css changes for a little while. I'll let the dust settle from these two commits, then I'll go through the file and physically remove the deprecated styles.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@627051 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 19:30:09 +00:00
Marco Risaliti 97bce9030c Replace all the head4 style to head3 style.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@618302 13f79535-47bb-0310-9956-ffa450edef68
2008-02-04 15:12:07 +00:00
Marco Risaliti 2f5fc43057 Costs/Fixed Assets/Fin Account/Invoice Item Type/Payment Method Type forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1603)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@616045 13f79535-47bb-0310-9956-ffa450edef68
2008-01-28 21:21:33 +00:00
Vikas Mayur 2ceb0c9e3b Applied Patch from Sumit Pandit and Santosh Malviya "Implement fixed asset depreciation (methods) (https://issues.apache.org/jira/browse/OFBIZ-1539)"- OFBIZ-1539 with few modifications.
Thanks to Sumit Pandit, Santosh Malviya for the patch and many thanks to Jacopo, Jacques for there review & help.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@611416 13f79535-47bb-0310-9956-ffa450edef68
2008-01-12 14:11:54 +00:00
Adrian Crum 4a663e405b More Asset Maintenance UI cleanups. No functional changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@573121 13f79535-47bb-0310-9956-ffa450edef68
2007-09-06 00:44:14 +00:00
Hans Bakker a52e59334e make the fixed asset calendar also usable for one2one rental product
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@567051 13f79535-47bb-0310-9956-ffa450edef68
2007-08-17 13:15:30 +00:00
Anil Patel 62a3c6c815 Forms, Screens and Services for FixedAssetPartyAssignment. Mridul, Thanks for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@541934 13f79535-47bb-0310-9956-ffa450edef68
2007-05-26 20:38:46 +00:00
David E. Jones 7d70c41c12 Did a big search/replace to change all xsd file refs from www.ofbiz.org to ofbiz.apache.org
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@539504 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 15:47:14 +00:00
Jacopo Cappellato f6931798ff Applied patch from Adrian Crum (OFBIZ-844) to update fixed asset calendar style sheets.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@522825 13f79535-47bb-0310-9956-ffa450edef68
2007-03-27 09:13:47 +00:00
Jacques Le Roux ddb337a15b A patch from Anil K Patel "Add Orders Tab to FixedAssetMaint and clean up Tab selection" (https://issues.apache.org/jira/browse/OFBIZ-842).
Minor code modifications.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@522294 13f79535-47bb-0310-9956-ffa450edef68
2007-03-25 16:18:15 +00:00
Jacques Le Roux dad67935f7 A (large) patch from Scott Gray "Update ASL header" (https://issues.apache.org/jira/browse/OFBIZ-637).
I put also some svn:ignore for shark build and lib diretories and assetmaint/build 

I did some by hand lately, too much to remember. They were files with old header but without copyright. A 1st attempt I suppose, will have to check this after this commit.

I add some problems to commit this patch in one piece because it's so huge (specially with Eclipse I had to turn to Tortoise) !

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499486 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 17:15:54 +00:00
David E. Jones c5ff197fd7 Applied patch from Anil Patel with a new FixedAssetMaintOrder entity and related artifacts; Jira #OFBIZ-598
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@498756 13f79535-47bb-0310-9956-ffa450edef68
2007-01-22 19:24:43 +00:00
Jacopo Cappellato 2b24624f0c Added default system currency for fixed asset std costs.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@488565 13f79535-47bb-0310-9956-ffa450edef68
2006-12-19 07:31:49 +00:00
Jacopo Cappellato 6a76fc7ffd Applied patch from Anil Patel to combine ListFixedAssetStdCosts and EditFixedAssetStdCost defined in FixedAssetScreens.xml into one screen: OFBIZ-553
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@488562 13f79535-47bb-0310-9956-ffa450edef68
2006-12-19 07:24:01 +00:00
Jacopo Cappellato 280f6c4086 Conversion from MIT to ASL2.0 for the files of the accounting component.
Many thanks to Scott Gray for the patch (Apache OFBIZ-87).

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@422402 13f79535-47bb-0310-9956-ffa450edef68
2006-07-16 08:09:27 +00:00
Hans Bakker 3d1af3ec6b contribution from Anil Patel to show children of a fixed asset OFBIZ-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419735 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 22:59:25 +00:00
David E. Jones 94fe6d1cda Initial OFBiz import from revision 7923 of the old svn.ofbiz.org SVN repository.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@418498 13f79535-47bb-0310-9956-ffa450edef68
2006-07-01 19:05:20 +00:00