Commit Graph
61 Commits
Author SHA1 Message Date
Bruno Busco 342e9cb614 Accounting application
Moved TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
This makes better the rendering of themes such as Dropping Crumbs.

Removed several redundant <section><widget> tags also

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883139 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 20:14:11 +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
Anil Patel e69b9bc5a2 Removed duplicate definition of CommonPartyDecorator. Added partyDecoratorLocation parameter to ar/ap web.xml file so they can find CommonPartyDecorator.
This issues was discussed on list after r829392 commit in response to patch on OFBIZ-3080.
 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831920 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 15:32:39 +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
Anil Patel 048e2c58ef Removing CommonTaxAuthorityDecorator from CommonScreens.xml because now it exists in TaxAuthorityScreens.xml file.Missed this file in my commit r826954.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828285 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 03:00:12 +00:00
Anil Patel 337f5997bc Moved CommonPartyAccountsDecorator from CommonScreens.xml to GlScreens.xml. Added partyGlDecoratorLocation parameter. The pattern of having decorator for set of screens in same file as screens is much more flexible. Same pattern is used in many our screens sets in accounting e.g Payment, Invoices, BillingAccount etc.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826708 13f79535-47bb-0310-9956-ffa450edef68
2009-10-19 16:04:53 +00:00
Anil Patel a046a2bd76 Moved CommonBillingAccountDecorator back to BillingAccountScreens.xml. Add billingAccountDecoratorLocation parameter for location. This pattern to reference screen decorator is much more flexible and is already in place in Invoice and Payment screens.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825663 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 21:15:38 +00:00
Ashish Vijaywargiya 9cd35b6ef8 Moved decorator screen to CommonScreens.xml file.
This will help to override decorator screen using ${parameters.mainDecoratorLocation}.

Thanks Brajesh for the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825534 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 15:50:50 +00:00
Anil Patel be9218c7ea Moved CommonPaymentDecorator to PaymentScreens file. Updated decorator location parameter name to paymentDecoratorLocation. This pattern is adopted from InvoiceScreens. This pattern allows to easily override decorator by specifying custom value to paymentDecoratorLocation parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822588 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 05:08:43 +00:00
Bruno Busco 122bdc4154 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820887 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 05:20:03 +00:00
Anil Patel 2d00d6a445 Misc cleanups in Financial Account and Payment Group screens.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798113 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 12:13:53 +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
Ashish Vijaywargiya 012b5ab921 Applied patch from jira issue OFBIZ-2699 - Create Payment Batches for Ar Payment
Following thing is covered in this patch:
-- functionality to cancel payment group and expire association with payment. 
Thanks Awdesh & Rishi for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792526 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 12:24:13 +00:00
Ashish Vijaywargiya e50dbb1796 Applied patch from jira issue OFBIZ-2699 - Create Payment Batches for Ar Payment.
Following things are covered in this patch:
– Add new tab with name overview for payment group.
– Added forms on overview screen. 

Thanks Awdesh for your contribution on this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792213 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 16:27:51 +00:00
Scott Gray 28d5cedff1 Remove the freemarker payment menu and reinstate the widget version, fixes problem reported by Rishi Solanki
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791388 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 05:44:36 +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
Ashish Vijaywargiya e473a0f651 Applied patch from jira issue OFBIZ-2694 (In Accouting Payment Section The PaymentSubTabBar options are not working properly, so converting it to ftl so that desired functionality can be achieved.)
There were bug reported Menu Widget code and for more details see the discussion available at OFBIZ-2684.

Thanks Surya for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790924 13f79535-47bb-0310-9956-ffa450edef68
2009-07-03 14:15:31 +00:00
Vikas Mayur dce4a20ee3 Implemented entity, crud services and ui for payment groups which will be enable user to generate checks in a batch from selected bank account (which is not implemented yet).
Thanks to Jacopo for notes. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788963 13f79535-47bb-0310-9956-ffa450edef68
2009-06-27 12:45:11 +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
David E. Jones 70f8da92bb Moved logo and icon images back to images component and removed from everywhere else; all references to these should be to there only now; fixes issue with logo in ecommerce and other little things
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766426 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 06:12:55 +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 9aa57f3ea4 A patch from Bruno Busco "Linking End User Documentation to OFBiz" (https://issues.apache.org/jira/browse/OFBIZ-2133) - OFBIZ-2133
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748884 13f79535-47bb-0310-9956-ffa450edef68
2009-02-28 16:29:24 +00:00
Hans Bakker 041ccc0a7d rename applicationext component to commonext
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748388 13f79535-47bb-0310-9956-ffa450edef68
2009-02-27 04:05:47 +00:00
Hans Bakker 5192a24e48 introduction of a common component for applications. moved the 2 lines containing party info to this component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748144 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 13:36:51 +00:00
Hans Bakker 33ed533574 get the title under the buttons
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@747684 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 06:55:14 +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
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
Bruno Busco 7bf56339b7 Replaced appheader.ftl with a standard AppBar menu widget in Accounting application
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735416 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 09:55:01 +00:00
Hans Bakker ff7759b530 show the component name at the login screen for all components
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@734074 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 08:47:35 +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 af7a0409c1 Removed deprecated CSS styles from the maincss.css file. I skipped the eCommerce component because it doesn't use that style sheet, and I also skipped the content component because it is used in eCommerce.
This shouldn't affect any layout. If it does, just post a message on the dev ml (with link please) and I'll fix it.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@675831 13f79535-47bb-0310-9956-ffa450edef68
2008-07-11 04:02:30 +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
Vikas Mayur e63ac96ff3 Applied patch from Jira OFBIZ-1496 (https://issues.apache.org/jira/browse/OFBIZ-1496)
With few enhancements :
1) Added Apache License to TransactionTotals.bsh
2) Improved the bsh code.
3) Added style element to the Forms and Screen.

Many thanks to Rishi Solanki, Sumit Pandit & Ratnesh Upadhyay for posting and testing this patch.
Special thanks to Jacopo for his help on this issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@620794 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 13:34:13 +00:00
Ashish Vijaywargiya addabc82ae Applied patch from JIRA Issue # OFBIZ-1529.
Description :- UI: Create a new top level menu item in the accounting component: "Global GL Settings"(Submenu will be Chart Of Accounts,Costs,Payment Method Type and Invoice Item Type) .I think this changes are useful from the user point of view.


Thanks to Jyotsna Rathore for working on this.
Special thanks to Pranay Pandey for improving this patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@606760 13f79535-47bb-0310-9956-ffa450edef68
2007-12-25 06:20:11 +00:00
Ashish Vijaywargiya b33f704af0 Applied patch from JIRA Issue # OFBIZ-1503 with minor changes.
Thanks Jyotsna Rathore for your patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604182 13f79535-47bb-0310-9956-ffa450edef68
2007-12-14 12:57:40 +00:00
Jacopo Cappellato 86256f89e6 Added accounting reports menu; implemented placeholder for the report that will be implemented as described in OFBIZ-1496
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@601832 13f79535-47bb-0310-9956-ffa450edef68
2007-12-06 19:51:00 +00:00
Adrian Crum 8453ecffc0 Accounting Invoice permissions and UI work.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@600357 13f79535-47bb-0310-9956-ffa450edef68
2007-12-02 19:09:17 +00:00
Adrian Crum 1727dc68fe Accounting Financial Account permissions and UI work.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@600347 13f79535-47bb-0310-9956-ffa450edef68
2007-12-02 17:40:57 +00:00
Adrian Crum 88ccb8cb22 Some preliminary work on converting the Accounting component permission checking to the new permission service.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@600198 13f79535-47bb-0310-9956-ffa450edef68
2007-12-01 21:26:55 +00:00
Anil Patel e76bfc73c9 New screen to manually create an AcctgTrans.
Ashish, Thanks for patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@599645 13f79535-47bb-0310-9956-ffa450edef68
2007-11-30 00:02:52 +00:00
Jacopo Cappellato 325eb67516 Misc cleanups and enhancements to the ui related to accounting transactions.
Implemented new screen to search/display accounting transaction entries.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@597431 13f79535-47bb-0310-9956-ffa450edef68
2007-11-22 15:28:00 +00:00
Jacopo Cappellato c61926872e Further ui cleanups for the Accounting screens.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@597157 13f79535-47bb-0310-9956-ffa450edef68
2007-11-21 17:46:17 +00:00
Jacopo Cappellato 2bc28f44a9 Misc improvements to the menu of the accounting screens.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@597128 13f79535-47bb-0310-9956-ffa450edef68
2007-11-21 16:10:32 +00:00
Adrian Crum 085e65e5b8 Eliminated redundant code by switching components over to the common login and password change screens. I didn't change the hand held component - since it will probably need its own login screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@588474 13f79535-47bb-0310-9956-ffa450edef68
2007-10-26 02:29:49 +00:00
Jacopo Cappellato c3c7cdb4c3 Better handling of global variables to set the url for the application logo: now ONE global variable is set in GlobalDecorator and this will affect all the applications; if we need a custom logo for each application then we will have to uncomment the variable setting in the application's main-decorator.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@579920 13f79535-47bb-0310-9956-ffa450edef68
2007-09-27 06:43:11 +00:00
Anil Patel 6a3cc0c6cf No functional change. Changed looks of Summary screen to look similar to Order Summary screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576026 13f79535-47bb-0310-9956-ffa450edef68
2007-09-16 03:05:48 +00:00
Anil Patel 3749753d00 added find Journal entry screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574777 13f79535-47bb-0310-9956-ffa450edef68
2007-09-12 03:50:22 +00:00
Anil Patel b202633a63 Companies --> Accounts now navigates to set of screens for managing GL activities.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574743 13f79535-47bb-0310-9956-ffa450edef68
2007-09-12 01:18:37 +00:00