Commit Graph
195 Commits
Author SHA1 Message Date
Gil Portenseigne c981418dc9 Implemented: Add tasks from different project on the same invoice (OFBIZ-8116)
This new feature allow to bill task time entries from several projects into one unique Invoice.

Thanks Florian Montalbano for your contribution, i did apply some light improvments in your patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761202 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 11:56:04 +00:00
Divesh Dutta 556279917d Improved:Display from date with default to now timestamp and also add asterisk sign to all the forms where it is part of primary key in all the components.
(OFBIZ-7650) (OFBIZ-7651) (OFBIZ-7653) (OFBIZ-7660) (OFBIZ-7662) (OFBIZ-7665) (OFBIZ-7666) (OFBIZ-8028)(OFBIZ-8029) (OFBIZ-8255)

Thanks: Anuj Jain and Ratnesh for the pathes and Swapnil Shah for reporting the issues.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761192 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 11:02:39 +00:00
Michael Brohl 9170a3a3b2 Improved: Projectmgr: Consistent form name.
(OFBIZ-8107)

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@1761110 13f79535-47bb-0310-9956-ffa450edef68
2016-09-16 22:34:20 +00:00
Michael Brohl e22972c4c6 Improved: Party: Consistent form name.
(OFBIZ-8088)

Change all form names to upper camel case for consistency. I have slightly modified the patch to have camel case also for the LookupParty form in PartyForms.xml.

Thanks: Tanmay Muley for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761100 13f79535-47bb-0310-9956-ffa450edef68
2016-09-16 21:52:52 +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 7ad9cef368 (OFBIZ-7218) Relocate .groovy files in the specialpurpose/projectmgr component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747848 13f79535-47bb-0310-9956-ffa450edef68
2016-06-11 05:50:23 +00:00
Jacques Le Roux c7478af54a Reverts r1745010, it did not occurs to me that it was in a display field. And the simplified syntax (no HTML entities) does not work in these fields because of this https://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references#Predefined_entities_in_XML
The error msg is "The entity name must immediately follow the '&' in the entity reference."

For a reason I'll check later this works in '<set field value="${groovy: ' cases...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1745012 13f79535-47bb-0310-9956-ffa450edef68
2016-05-22 05:37:29 +00:00
Jacques Le Roux a1fad80934 No functional change, in grovvy snippet we can get rid of &amp; and such, this does it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1745010 13f79535-47bb-0310-9956-ffa450edef68
2016-05-22 04:41:27 +00:00
Pranay Pandey 0cb3d98f74 [OFBIZ-7003] Applied patch from the ticket. Fixed error on console when accessing project manager.
Thanks James Yong for reporting the issue, thanks Montalbano Florian for review and comment and thanks Chandan Khandelwal for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744929 13f79535-47bb-0310-9956-ffa450edef68
2016-05-21 12:41:42 +00:00
Gil Portenseigne 76dd74850f OFBIZ-5703 :
Fix a regression on <auto-parameters-entity/> and <auto-parameters-service/> in which default-entity-name and default-service-name weren't taken in consideration anymore.

Thanks Dhiraj Gupta for reporting the issue, Thanks Jacques and Divesh for the analysis

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740415 13f79535-47bb-0310-9956-ffa450edef68
2016-04-21 21:56:52 +00:00
Divesh Dutta 382d99527a [OFBIZ-5703] Fixed: Project contents were not getting deleted. auto-parameters-entity does not seems to be working, for now passed all the needed parameters. Thanks Anuj Jain for the patch
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735778 13f79535-47bb-0310-9956-ffa450edef68
2016-03-19 14:57:27 +00:00
Nicolas Malin ce97afbf6b patch from Pierre Smits : Remove tooltip CommonNotModifRecreat from display fields (OFBIZ-6696), thanks for the screen clean Pierre
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1718970 13f79535-47bb-0310-9956-ffa450edef68
2015-12-09 21:24:44 +00:00
Jacques Le Roux c4b535cad1 Completes r1709882 for <<Remove tooltip="${uiLabelMap.CommonRequired}" from fields>> https://issues.apache.org/jira/browse/OFBIZ-6691
Removes nonsensical required-field="true" for <display* field types

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710093 13f79535-47bb-0310-9956-ffa450edef68
2015-10-22 20:22:11 +00:00
Jacques Le Roux 9ea03cde10 Completes r1709882 for <<Remove tooltip="${uiLabelMap.CommonRequired}" from fields>> https://issues.apache.org/jira/browse/OFBIZ-6691
Replaces all }*" by requiredField but for forms using auto-fields-entity or auto-fields-service for which I created the subtask "Enhance auto-fields-entity and auto-fields-service to generate required fields on PK ones" https://issues.apache.org/jira/browse/OFBIZ-6695

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710086 13f79535-47bb-0310-9956-ffa450edef68
2015-10-22 19:47:33 +00:00
Nicolas Malin 895c9856b3 Cleaning forms code is needed after setting default-value in list-options and entity-options, patch related to OFBIZ-6524 and follows the resolution of OFBIZ-6490 and OFBIZ-6489. Thanks Gil Portenseigne for this effort
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686674 13f79535-47bb-0310-9956-ffa450edef68
2015-06-20 21:58:05 +00:00
Jacques Le Roux 5c7f0b1fcb This closes "Replace bsh code with Groovy code" https://issues.apache.org/jira/browse/OFBIZ-6332 with all its subtasks and more.
jleroux: I suspected it was only a matter of replacing "${bsh" by "${groovy" in *.xml. But I had not the guts to get into 11(!) sub tasks. 
So, in Eclipse, I simply did a S/R in *.xml and compared parts of my changes with some Pierre's most "complex" patches respectively product, ebaystore, projectmgr and scrum. 
They were totally similar (just revisions number changed) so here is the whole. 

I will later improve these changes by removing HTML entities when possible, this is a bit more delicate because in some cases the XML schema are not complete (or/and for other still obscure to me reasons) and if you simply replace HTML entities by simple code (eg &Amp; by &) you get issues in logs when the XML parser cross them...

Note: only menus, screen and forms are changed here.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682118 13f79535-47bb-0310-9956-ffa450edef68
2015-05-27 20:39:43 +00:00
Ashish Vijaywargiya ed26dd4dc4 Applied patch from jira issue OFBIZ-4946 - Getting error when uploading a file after creating a data resource.
Thanks Ashish Ambulkar for creating the issue. Thanks Arun, Jacques for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646984 13f79535-47bb-0310-9956-ffa450edef68
2014-12-20 14:22:50 +00:00
Nicolas Malin a230eea6cb Improve screen projectmgr/control/EditProjectContents, to display the creation form instead of the update content (that doesn't works) when a workEffortContent is deleted. Raise by Dhiraj Gupta on issue OFBIZ-5730.Review the form to display only modification's field that can be modified.
Clean attribut's links by auto-attribut-entity

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1643384 13f79535-47bb-0310-9956-ffa450edef68
2014-12-05 18:36:33 +00:00
Jacopo Cappellato 912cdbcee9 OFBIZ-4854: added from/thru dates to summary box for project resources.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1610385 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 11:00:09 +00:00
Jacques Le Roux 7cc0bd93c1 A patch from Ankit for "Priority field is missing on Add/Edit Project form." https://issues.apache.org/jira/browse/OFBIZ-5230
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1494202 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 17:00:37 +00:00
Jacques Le Roux 1cce08ae64 A patch from Ankit for "No the date fields showning on edit project page." https://issues.apache.org/jira/browse/OFBIZ-5222
No date fields are showing on Edit project page(https://demo-trunk.ofbiz.apache.org:8443/projectmgr/control/EditProject?projectId=10005 create a new project) for the following:

Estimated Start Date
Estimated Completion Date
Actual Start Date
Actual Completion Date

Also on the Project Summary page no dates are showing in Project Information.
https://demo-trunk.ofbiz.apache.org:8443/projectmgr/control/projectView?projectId=10005

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1492673 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 13:52:07 +00:00
Jacques Le Roux db0841345b A patch from Nicolas Malin for "ProjectMgr : list project's company, error on form to resolve currency" https://issues.apache.org/jira/browse/OFBIZ-5071
To solve this issue, I change bsh script to groovy script.
After the patch application, on the same page, the currency appears near "Your Company Name Here [Company]"

jleroux: actually I did a bit more and rewrote it using safe-navigation and elvis operator, nice to read hèè ;)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1408408 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 18:59:38 +00:00
Jacques Le Roux afe62dee1a Extended from a Tom Burns's patch at https://issues.apache.org/jira/browse/OFBIZ-4851
To reproduce:
1. In Catalog Manager select the Products menu
2. Click find
3. Click product id GZ-1006-1
4. Click Locations tab
5. In Add Facility Location screenlet select Web Store Warehouse from the Facility Id drop-down list
6. In the Location Seq Id pop up window select Facility Id Web Store Warehouse click find.
7. Select a Location Id
8. In Add Facility Location click Add

Expected: Add location to product record
Actual:
org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen component://common/widget/CommonScreens.xml#GlobalDecorator: java.lang.IllegalArgumentException: Return value from use-when condition eval was not a Boolean: null [null] on the field facilityName of form UpdateProductFacilityLocations (Return value from use-when condition eval was not a Boolean: null [null] on the field facilityName of form UpdateProductFacilityLocations)

jleroux: I found some other same cases and fixed them the same way

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1399539 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 07:14:35 +00:00
Jacques Le Roux 3369dca046 Replaces title="${uiLabelMap.CommonEmptyHeader}" by title=" " where it's known to not be a problem. Here with links styled by widget-style="buttontext"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340373 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 08:45:18 +00:00
Jacques Le Roux 2f5ddb1b12 A patch from Pierre Smits "Project resource overview doesn't show the resources with a thru-date before the current date." https://issues.apache.org/jira/browse/OFBIZ-4853
When a project manager expires the assignment of a resource by clicking the delete button in the Project Resources overview the resource is deleted from the overview. It should be that the resource is still shown in the overview with the tru-date visible.
Otherwise there will be a discrepancy between the overview of resources of the project and the project dashboard.
The name of the button is also wrong. It should state 'expire' not 'delete'.

jleroux: I have also created a new label FormFieldTitle_expireButton copying labels from CommonExpire. I saw that labels where not sorted at all so I used Labels Manager for that. I put back CommonEmptyHeaderby hand. I will soon fix this issue. So, apart the sort changes, there is also a lot of false changes in CommonUiLabels.xml because Labels Manager now uses the right way for Language Identification: http://www.w3.org/TR/REC-xml/#sec-lang-tag (ie a - separate language from country instead of previously a _)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338695 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 13:27:54 +00:00
Jacques Le Roux 06add8ab01 A patch from Pierre Smits "Project resources overview shows button when thruDate < nowTimestamp" https://issues.apache.org/jira/browse/OFBIZ-4858
The button to end the assignment of a resource on a project should only be shown when the thruDate is not set or when the thruDate > nowTimestamp. But the button is also shown when the thruDate < nowTimestamp.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1335946 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 07:15:19 +00:00
Erwan de Ferrieres c84348312f forgot entry-name at rev 1140520
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1141528 13f79535-47bb-0310-9956-ffa450edef68
2011-06-30 13:19:37 +00:00
Erwan de Ferrieres d53c9e2352 Wrong parameter was used when displaying the project's info: the workEffortId was used instead of parentProjectId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1140522 13f79535-47bb-0310-9956-ffa450edef68
2011-06-28 11:09:28 +00:00
Erwan de Ferrieres 7068845fac Correction on getProject when retrieving the parentProjectId and when editing a the parentProjectId from a project. Wrong parameter was used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1140520 13f79535-47bb-0310-9956-ffa450edef68
2011-06-28 11:05:26 +00:00
Erwan de Ferrieres 900b7d6aeb Adding missing uiLabels for seqIds in ProjectMgr
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1130163 13f79535-47bb-0310-9956-ffa450edef68
2011-06-01 14:33:44 +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
Jacques Le Roux 86e817b533 Reverted on Scott's advice (useless and give some trouble on back button: POST => msg like "do you want to send again", not GET)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@952164 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 09:30:45 +00:00
Jacques Le Roux 4943ab1e3b Secure some targets. Note that they have been introduced since OFBIZ-2243 has been closed.
Please committers use only target with parameter attribute (not in URL) for link and hyperlink fields when there is an action (ie DB modification)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@952119 13f79535-47bb-0310-9956-ffa450edef68
2010-06-07 07:02:02 +00:00
Jacques Le Roux fda988d301 Closes "Allow to open a layer lookup from a layer lookup recursively" (https://issues.apache.org/jira/browse/OFBIZ-3693) - OFBIZ-3693
This commit removes all remaining <presentation="window">

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@946073 13f79535-47bb-0310-9956-ffa450edef68
2010-05-19 07:36:02 +00:00
Jacques Le Roux 62976e36fb We still have a problem with the find button in recursive cases (ie LookupWorkEffort and LookupContent).
It's not related to previous patches committed but an issue which is remaining and we have to face now.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@944647 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 14:13:03 +00:00
Jacques Le Roux 578662ae4c Now that we have fixed the layered lookup inside layered lookup issue and the recursive call case we can get rid of all the useless remaining presentation="window".
I keep the example and beware LookupTimeDuration is a special case

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@944623 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 12:13:00 +00:00
Jacques Le Roux 8f11d470b9 Some other issues with layered lookups, bypassed for now using popups
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939999 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 12:43:34 +00:00
Scott Gray af3dc66664 Get rid of a few Boolean instantiations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935162 13f79535-47bb-0310-9956-ffa450edef68
2010-04-17 10:25:42 +00:00
Bruno Busco 1f2f4e1789 A patch from Blas Rodriguez Somoza
OFBIZ-3617 - XHTML validation errors (specialpurpose_projectmgr)
https://issues.apache.org/jira/browse/OFBIZ-3617

XHTML validation errors

    * Unclosed INPUT
    * attributes without values (checked, selected, disabled, etc)
    * attribute values without "
    * Uppercase tags or attributes.
    * Unencoded ampersands in urls.

Other errors:
gantChart.ftl
Duplicated DOCTYPE

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932722 13f79535-47bb-0310-9956-ffa450edef68
2010-04-10 13:58:26 +00:00
Erwan de Ferrieres 294953e2e4 Closing XML tags with empty body
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@924765 13f79535-47bb-0310-9956-ffa450edef68
2010-03-18 13:27:08 +00:00
Scott Gray 6109808c8a Tabs to spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@924378 13f79535-47bb-0310-9956-ffa450edef68
2010-03-17 17:28:01 +00:00
Hans Bakker 9102341ee9 add some more fields to the task overview listing of a project, reduce length of field titles
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920230 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 08:33:40 +00:00
Erwan de Ferrieres e9c99d97d3 Project manager update :
milestones can be added to a project and are diplayed on the Gantt chart

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918343 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 07:11:31 +00:00
Hans Bakker e1d5e7c62f add optional sequenceNum to be able to order phases and tasks within a project
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915275 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 10:47:21 +00:00
Hans Bakker 7270cdc1d0 after an update on the task list, remain on the same page
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@906796 13f79535-47bb-0310-9956-ffa450edef68
2010-02-05 03:27:40 +00:00
Hans Bakker b57f01aee1 paginatiuon missing on the tasklist in the project manager
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@906787 13f79535-47bb-0310-9956-ffa450edef68
2010-02-05 03:09:34 +00:00
Hans Bakker e3b55432f3 allow the entry of planned hours on the project task list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@906446 13f79535-47bb-0310-9956-ffa450edef68
2010-02-04 10:39:12 +00:00
Hans Bakker 27c04647fd status should not be given to the update service because cannot be changed here
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@906413 13f79535-47bb-0310-9956-ffa450edef68
2010-02-04 09:20:17 +00:00