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
Bruno Busco f6fe95d163 Reverted changes 836143 and 836137 following Adrian's issue report in https://issues.apache.org/jira/browse/OFBIZ-3206 "Recent Markup Changes Break Layout"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880628 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 06:49:10 +00:00
Bruno Busco 1bba0e374e Moved TabBar menus to tabbar decorator-section for Invoices and Payments screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836143 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 08:41:35 +00:00
Anil Patel d84e045585 Improve Invoice Terms rendering. Using UiLables and Currency formatting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834251 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 21:55:45 +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 f4829840f2 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826449 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 14:37:45 +00:00
Hans Bakker a4e3d7d8fa make transactionlist on invoice more readable and added some hyperlinks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795534 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 13:10:22 +00:00
Hans Bakker 6263434615 when a new invoice was created the currency was not set
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795471 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 03:36:08 +00:00
Hans Bakker 56c7728bb4 invoice overview now displayed correctly
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791691 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 03:36:31 +00:00
Scott Gray 43e0f68f86 Reverted r790567 and altered the invoice sub menu to use the new request-confirmation link attribute
OFBIZ-2688

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791127 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 13:41:22 +00:00
Ashish Vijaywargiya ef828b6101 Applied patch from jira issue OFBIZ-2684 (In Accounting invoice section the InvoiceSubBar Menu all options are not working properly, convert it to ftl, so that all functionality can be run.)
There is bug in the Menu Widget code and it will be handled in separate issue created and referred on the above jira issue.
For now I have commented out the code of Menus.xml from InvoiceScreens.xml file and on fixing this bug in menu widget code the artifact will be reused again.

Thanks Rishi for your contribution on this. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790567 13f79535-47bb-0310-9956-ffa450edef68
2009-07-02 12:40:23 +00:00
Hans Bakker 613a9cfcff invoice list corrections
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@775580 13f79535-47bb-0310-9956-ffa450edef68
2009-05-17 05:31:01 +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
Hans Bakker ed8503aa61 move list customer invoices from myportal into accounting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762061 13f79535-47bb-0310-9956-ffa450edef68
2009-04-05 10:02:32 +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
Hans Bakker b520250cd9 shortening the invoice overview screen by using partially half the screen and only show timeentries if they are there
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755465 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 03:25:19 +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
Hans Bakker 557dd16f0c small correction to move the title back under- and not next to the subtabbar
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@740000 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 15:21:51 +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
Hans Bakker 5d7accf40c first part of payrol, be able to create a payrol invoice see issue: OFBIZ-2117
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735949 13f79535-47bb-0310-9956-ffa450edef68
2009-01-20 07:15:19 +00:00
Bruno Busco 4b655661a1 Changed all FindScreens in Accounting application to use the FindScreenDecorator
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735552 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 21:53:43 +00:00
Bruno Busco bc9d99b364 - Fixed headerItem and tabButtonItem settings in Accounting, AP and AR (menu items did not highlight correctly)
- Extended ApAppBar and ArAppBar menus from CommonAppBarMenu

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735366 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 01:09:40 +00:00
David E. Jones 874f02e9da Manual merge of typecheckcleanup200810 branch as of rev 731346 in that branch, resolved all conflicts; with this BigDecimal is not the native type for many entity fields and is used for many calculations; some work is still needed in certain areas of the project but this covers the most critical ones; thanks especially to Scott for his work on this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731851 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 07:13:36 +00:00
Marco Risaliti 70e5c20298 Some missing Italian translations for Accounting component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730738 13f79535-47bb-0310-9956-ffa450edef68
2009-01-02 14:27:45 +00:00
Hans Bakker a2c5b444ce OFBIZ-2097: show organizationPartyId in header(can be set in preferences), rewrote financial history to show currencies, invoice/p[aymentworker now can show in actual and organizationparty currency
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729396 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 06:26:14 +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
Hans Bakker 4c3e7044d1 fix an error in applying payments to invoices and make applying invoices to payment work too when there are different currencies
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@702894 13f79535-47bb-0310-9956-ffa450edef68
2008-10-08 14:39:12 +00:00
Hans Bakker 2d2a7bc27b convert to screenlet, add field to timeentries
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@690695 13f79535-47bb-0310-9956-ffa450edef68
2008-08-31 14:00:49 +00:00
Hans Bakker 308e478141 screenlet conversion and show newest invoices first
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689734 13f79535-47bb-0310-9956-ffa450edef68
2008-08-28 06:47:09 +00:00
Jacopo Cappellato 7f2a0faf43 Fix for currency locale issues in Invoice screens plus some minor fixes for errors happening after the migration to Groovy.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@668560 13f79535-47bb-0310-9956-ffa450edef68
2008-06-17 08:17:39 +00:00
Scott Gray 5e72bbacc3 Couple of script cleanups
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@667321 13f79535-47bb-0310-9956-ffa450edef68
2008-06-13 03:17:38 +00:00
Ashish Vijaywargiya 55b888849e Patch from JIRA issue # OFBIZ-1839.
Container to Screenlet conversion for Accounting component.

For now followed the CamelCase pattern starting with the First letter as capital one.
Thanks Awdesh Singh Parihar for your patch and Ratnesh Upadhyay for your Support.

Special thanks to Vikas Mayur and Adrian Crum for their useful comments.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@666968 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 06:09:10 +00:00
Scott Gray b0ead4966d Capitalized the accounting script's names also switched a couple of screens to use the screenlet widget
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@664307 13f79535-47bb-0310-9956-ffa450edef68
2008-06-07 09:45:26 +00:00
Scott Gray 27082089d3 I had missed committing the groovy name changes in the screen widgets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@661673 13f79535-47bb-0310-9956-ffa450edef68
2008-05-30 12:07:13 +00:00
Ashish Vijaywargiya 1bd0bca817 Applied patch from JIRA issue (Save an Invoice as Invoice Template) :- https://issues.apache.org/jira/browse/OFBIZ-1672
Here is the description :- 

Save Invoice as Template
1) Add Seed Invoice Type TEMPLATE.
2) Add two sub invoice Types SALES_INV_TEMPLATE and PUR_INV_TEMPLATE
3) Add [Save Invoice as Template] button on Create Invoice and Edit Invoice screens. On Click save Invoice data as Invoice Template.

Thanks Sumit Pandit for working on this.
Patched a typo.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@655851 13f79535-47bb-0310-9956-ffa450edef68
2008-05-13 13:19:50 +00:00
Vikas Mayur 596586e8ce continuing cleanups in HR module - patch from Harsha Chadhar & Parimal Gain
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@655778 13f79535-47bb-0310-9956-ffa450edef68
2008-05-13 08:27:14 +00:00
Vikas Mayur 3456d33ced Add Application level menu/tools for AR - Applied patch for OFBIZ-1667 (https://issues.apache.org/jira/browse/OFBIZ-1667), Thanks SumitPandit for this patch
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@654551 13f79535-47bb-0310-9956-ffa450edef68
2008-05-08 15:31:21 +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 8d8168ef9d Payments/Invoices 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@616091 13f79535-47bb-0310-9956-ffa450edef68
2008-01-28 22:29:23 +00:00
Anil Patel 2ac687cee3 Conditionally include read only or editable screen for Invoice header based on statusId field value.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@606126 13f79535-47bb-0310-9956-ffa450edef68
2007-12-21 07:46:49 +00:00
Jacopo Cappellato d28cfcb26a First step in the implementation of past due date invoices: created a service that computes the due date(s) and outstanding amount(s) based on the Invoice terms; added initial support for multiple payment terms per invoice (e.g. 'pay after 30 days the 50% of the invoice, pay after 60 days the 40%, pay after 90 the 10%').
Part of issue OFBIZ-1530
Modified the getDayEnd util method to be usable in Minilang.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604922 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 16:40:35 +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
Hans Bakker 0fe58c13fe show time-entry information on the invoice with the possibility to unlink
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@590611 13f79535-47bb-0310-9956-ffa450edef68
2007-10-31 10:09:19 +00:00
Andrew Zeneski ac18b4b3b9 invoice formatting changed (PDF) as well as now added link to order(s) from the invoive items
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@573674 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 19:18:00 +00:00
Jacopo Cappellato 77436917aa Billing account terms are now copied as order terms when the order is created; before this change the terms were copied as invoice terms when the invoice was created: this doesn't happen now, however the invoice terms are inherited from the order terms (including billing account terms).
Also added the list of invoce terms in the invoice overview screen.
OFBIZ-1167

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@560517 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 08:03:38 +00:00