Commit Graph
96 Commits
Author SHA1 Message Date
Akash Jain 3f07bb8103 Improved: Improvements in Find Invoice screen (OFBIZ-9643)
Thanks, Renuka Srishti for reporting the issue.
2020-08-03 15:57:49 +05:30
holivier 211540a966 Documented: Help link using asciidoc files via generated html
(OFBIZ-11693)

Migrate AccountingHelData.xml to added some <set field="helpAnchor" to
the correct screens

Now in accounting component only asciidoc documents are used, help link
area now link to userDocUri
(ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc as default value in
general.property)
2020-06-05 15:15:21 +02:00
Suraj Khurana 0b669e0ccb Fixed: Issue with Status of invoice.
(OFBIZ-10310)
Cause: Missing statusId in parameters.
Thanks Aayush Jain for reporting and Devanshu Vyas for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1861837 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 10:32:12 +00:00
Jacques Le Roux 148be77060 Improved: Have the ability to edit/remove terms of an invoice
(OFBIZ-9290)

Currently the user has the ability to add terms to an invoice, 
but doesn't have the functions to edit or remove existing terms.

jleroux: Based on Akshay Modak's patch, which was, mmm..., imperfect

Thanks: Pierre Smits for report, Akshay Modak for initial patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1857076 13f79535-47bb-0310-9956-ffa450edef68
2019-04-07 10:29:10 +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
Divesh Dutta 85ce444748 Improvement: Minilang code readibility and conistency improvements
(OFBIZ-8445) (OFBIZ-8447) (OFBIZ-8448) (OFBIZ-8450) ( OFBIZ-8451) (OFBIZ-8653) (OFBIZ-8740) (OFBIZ-8741) (OFBIZ-8742) (OFBIZ-8743)

Thanks: Devanshu Vyas, Anuj Jain, Sega Patidar, Abhijeet Ashapure for your patches

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768209 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 12:41:35 +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 e929d179d8 (OFBIZ-7228) Relocate .groovy files in the party component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747770 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 18:39:22 +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
Jacques Le Roux 780457fa86 A patch from Pierre Smits for "Add links to edit/delete a term, for instance from the list" https://issues.apache.org/jira/browse/OFBIZ-6866
This patch addresses the visibility of the 'add/edit' terms form. Additionally it reorders the sequence of the roles form and removes a wrong screenlet title.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742087 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 10:42:53 +00:00
Deepak Dixit 8ace9fbcb6 (OFBIZ-6813) Apply patch from jira issue.
============================================================
relocate .ftl files in the accounting component
============================================================

Thanks Pierre Smits for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738754 13f79535-47bb-0310-9956-ffa450edef68
2016-04-12 10:17:36 +00:00
Jacques Le Roux e012e37b59 A patch from Pierre Smits for "Have the ability to add terms to invoices" https://issues.apache.org/jira/browse/OFBIZ-6865
Currently in UI there is no way that terms can be added to an invoice.

jleroux: Works well, links to edit/delete a Term, for instance from the list at "createInvoiceTerm" request would be welcome...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1727894 13f79535-47bb-0310-9956-ffa450edef68
2016-02-01 07:18:35 +00:00
Anil Patel ea115c8f81 [OFBIZ-3879] Patch from the jira issue resolves the problem. Now start rendering invoice only if valid data if found in the database.
Code needs reformatting.
Thanks Deepak Dixit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626399 13f79535-47bb-0310-9956-ffa450edef68
2014-09-20 08:49:07 +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
Jacques Le Roux 777b0ec794 I made a mistake in r1527171. When I removed the call to GetInvoiceItemTypes.groovy in InvoiceScreens.xml I did not notice it was also generating the AccountOrganizationAndClass list.
This fixes it by renaming GetInvoiceItemTypes.groovy to GetAccountOrganizationAndClass.groovy and removing the now useless invoiceItemTypes list inside it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1547742 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 09:29:59 +00:00
Jacques Le Roux 83c6338646 Fixes an issue reported by Christian Carlow at "Invoice Item type drop down empty when creating new invoice item" https://issues.apache.org/jira/browse/OFBIZ-5415
jleroux: Rather than what proposed Christian I used the same best practice than in r1527171

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1547717 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 06:55:59 +00:00
Jacques Le Roux 26285fdb52 Fixes an issue with InvoiceItemTypes reported by Christian on dev ML following proposed Nicolas's solution.
I did not get further enough to add missing labels, like InvoiceItemType.description.SINVOICE_HEAD_ADJ, etc.
So when missing the default English description set in data seed is used

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1527171 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 09:24:33 +00:00
Hans Bakker ff9107cb25 replace groovy file with new view and add orderitemSeqId to invoiceitemlist
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1512132 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 03:08:25 +00:00
Christian Geisert dcb74a8441 show localized description in invoice item type drop-down
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338699 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 13:30:52 +00:00
Marco Risaliti 5a2e780587 accounting has dependency on projectmgr (OFBIZ-3564)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1128623 13f79535-47bb-0310-9956-ffa450edef68
2011-05-28 12:24:25 +00:00
Erwan de Ferrieres 26d953fd00 Missing ProductUiLabels for the CommonInvoiceDecorator
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1089342 13f79535-47bb-0310-9956-ffa450edef68
2011-04-06 07:51:53 +00:00
Erwan de Ferrieres af399d6ada Missing call to ProductUiLabels in invoiceOverview
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1086913 13f79535-47bb-0310-9956-ffa450edef68
2011-03-30 11:58:43 +00:00
Jacopo Cappellato 47beefcd84 Added missing sorting directive for transaction id that was causing the invoice related transactions to appear messed un in the invoice detail screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1058028 13f79535-47bb-0310-9956-ffa450edef68
2011-01-12 09:13:36 +00:00
Hans Bakker 14da0d5cce after action return back on the correct page, in invoice, also made the description field longer and move hidden fields to the top of the form
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1056211 13f79535-47bb-0310-9956-ffa450edef68
2011-01-07 07:05:59 +00:00
Bruno Busco 6aa252df3b Added UiLabels resources loading in Porlets.
This fixes the missing portlet UILabels rendering when accessing the Portal Page Admin in WebTools.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@996090 13f79535-47bb-0310-9956-ffa450edef68
2010-09-11 07:10:50 +00:00
Adam Heath ac2299c50e Fix a bunch of no final newline issues.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965918 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:21 +00:00
Erwan de Ferrieres 87ec7593ff Adding tabButtonItem for FindInvoices screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932088 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 20:22:24 +00:00
Hans Bakker c86264ef45 combine 2 invoice menus together in one menu
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915647 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 03:06:47 +00:00
Hans Bakker 0b7e302d77 show commission run screen button from ap also in accounting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@901966 13f79535-47bb-0310-9956-ffa450edef68
2010-01-22 03:17:28 +00:00
Jacques Le Roux cb3be6ce4f Replace other status labels by CommonStatus
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@890670 13f79535-47bb-0310-9956-ffa450edef68
2009-12-15 06:41:50 +00:00
Hans Bakker 187e9a5f5d add a invoice list portlet for the logged-on suplier
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@887048 13f79535-47bb-0310-9956-ffa450edef68
2009-12-04 03:22:29 +00:00
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