Skip to content

Commit b367623

Browse files
author
jhfrench
committed
Working on invoice function.
git-svn-id: http://florence/svn/Workstream/trunk@11 9544af80-f5ca-4854-9bb5-6cfa5b68f5d1
1 parent 8b9fccc commit b367623

File tree

141 files changed

+2034
-1949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+2034
-1949
lines changed

‎Administration/act_edit_account.cfm

-19
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,6 @@
1010
||
1111
Edits:
1212
$Log$
13-
Revision 1.1 2006/09/15 22:24:13 csy
14-
<>
15-
16-
Revision 1.0 2006-08-16 09:31:55-04 csy
17-
Initial revision
18-
19-
Revision 1.0 2005-02-15 15:27:18-05 daugherty
20-
Initial revision
21-
22-
Revision 1.3 2002-03-08 16:43:47-05 long
23-
added fields to ignore in the output list.
24-
25-
Revision 1.2 2001-11-15 10:13:01-05 long
26-
Changed the isolation level from Serializable to read_committed
27-
28-
Revision 1.1 2001-10-11 10:55:40-04 long
29-
Added $log $ for edits to all CFM files that have fusedocs.
30-
31-
3213
||
3314
--->
3415
<cfset ignore_these="FIELDNAMES,fuseaction,MAKE_CHANGES,MODULE_ID,MODULE_LIST,OBJ_LIST">

‎Administration/dsp_admin_options.cfm

-22
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,6 @@
1010
||
1111
Edits:
1212
$Log$
13-
Revision 1.4 2006/09/15 22:26:35 csy
14-
<>
15-
16-
Revision 1.0 2006-08-16 09:31:59-04 csy
17-
Initial revision
18-
19-
Revision 1.3 2006-07-07 14:01:26-04 csy
20-
task 43700 Included instructions to set and save a profile
21-
22-
Revision 1.2 2006-05-31 15:21:37-04 csy
23-
<>
24-
25-
Revision 1.1 2006-05-04 10:43:56-04 csy
26-
task 43700 Modified code so that user's new selection of companies to be viewed is saved to the database. When a user logs into workstream the next time ,his/her last selection fo company names in the "View These Companies" drop down list is still highlighted.
27-
28-
Revision 1.0 2005-02-15 15:27:22-05 daugherty
29-
Initial revision
30-
31-
Revision 1.1 2001-10-11 10:55:38-04 long
32-
added $log $ for edits. To all CFM files that have fusedocs.
33-
34-
3513
||
3614
--> session.workstream_text_size: string that contains either Lg, Md, or Sm; used in dynamically creating class and refers to text size
3715
--->

‎Administration/dsp_edit_account.cfm

-13
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,6 @@
1010
||
1111
Edits:
1212
$Log$
13-
Revision 1.1 2005/09/14 13:00:48 pciske
14-
task 34623 - added code to disable All Option checkbox if the current user does not have security access
15-
16-
Revision 1.0 2005-02-15 15:27:23-05 daugherty
17-
Initial revision
18-
19-
Revision 1.2 2002-03-08 16:52:37-05 long
20-
added link to edit employee if the user has access to edit users. Also changed the query so that non-Nucleus people can only grant access to reports that they themselves have access to.
21-
22-
Revision 1.1 2001-10-11 10:55:38-04 long
23-
Added $log $ for edits to all CFM files that have fusedocs.
24-
25-
2613
||
2714
--> session.workstream_text_size: string that contains either Lg, Md, or Sm; used in dynamically creating class and refers to text size
2815
--->

‎Administration/dsp_load_profile.cfm

-13
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,6 @@
1010
||
1111
Edits:
1212
$Log$
13-
Revision 1.1 2006/09/15 22:29:25 csy
14-
<>
15-
16-
Revision 1.0 2006-08-16 09:32:00-04 csy
17-
Initial revision
18-
19-
Revision 1.0 2005-02-15 15:27:23-05 daugherty
20-
Initial revision
21-
22-
Revision 1.1 2001-10-11 10:55:38-04 long
23-
Added $log $ for edits to all CFM files that have fusedocs.
24-
25-
2613
||
2714
--> session.workstream_text_size: string that contains either Lg, Md, or Sm; used in dynamically creating class and refers to text size
2815
--->

‎Administration/dsp_navigation.cfm

-13
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,6 @@
1010
||
1111
Edits:
1212
$Log$
13-
Revision 1.1 2006/09/15 22:29:37 csy
14-
<>
15-
16-
Revision 1.0 2006-08-16 09:32:01-04 csy
17-
Initial revision
18-
19-
Revision 1.0 2005-02-15 15:27:26-05 daugherty
20-
Initial revision
21-
22-
Revision 1.1 2001-10-11 10:55:37-04 long
23-
Added $log $ for edits to all CFM files that have fusedocs.
24-
25-
(KL | 9/28/2001) evaluating for Display_To_Nav
2613
||
2714
--> session.workstream_text_size: string that contains either Lg, Md, or Sm; used in dynamically creating class and refers to text size
2815
--->

‎Administration/dsp_profile_message.cfm

-13
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,6 @@
1010
||
1111
Edits:
1212
$Log$
13-
Revision 1.1 2006/09/15 22:27:38 csy
14-
<>
15-
16-
Revision 1.0 2006-08-16 09:32:02-04 csy
17-
Initial revision
18-
19-
Revision 1.0 2005-02-15 15:27:28-05 daugherty
20-
Initial revision
21-
22-
Revision 1.1 2001-10-11 10:55:36-04 long
23-
Added $log $ for edits to all CFM files that have fusedocs.
24-
25-
2613
||
2714
--> session.workstream_text_size: string that contains either Lg, Md, or Sm; used in dynamically creating class and refers to text size
2815
--->

‎Administration/qry_delete_module_access.cfm

-16
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,6 @@
1010
||
1111
Edits:
1212
$Log$
13-
Revision 1.1 2006/09/15 22:26:18 csy
14-
<>
15-
16-
Revision 1.0 2006-08-16 09:32:09-04 csy
17-
Initial revision
18-
19-
Revision 1.0 2005-02-15 15:27:36-05 daugherty
20-
Initial revision
21-
22-
Revision 1.2 2002-03-08 16:57:00-05 long
23-
changed the query so that only reports that we want to be deleted are actually deleted.
24-
25-
Revision 1.1 2001-10-11 10:55:32-04 long
26-
Added $log $ for edits to all CFM files that have fusedocs.
27-
28-
2913
||
3014
--->
3115
<cfquery name="delete_module_access" datasource="#application.datasources.main#">

‎Administration/qry_delete_object_access.cfm

-14
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,6 @@
1010
||
1111
Edits:
1212
$Log$
13-
Revision 1.1 2006/09/15 22:26:11 csy
14-
<>
15-
16-
Revision 1.0 2006-08-16 09:32:10-04 csy
17-
Initial revision
18-
19-
Revision 1.0 2005-02-15 15:27:37-05 daugherty
20-
Initial revision
21-
22-
Revision 1.2 2002-03-08 16:59:13-05 long
23-
changed query so that access is removed only from objects that we want them to lose.
24-
25-
Revision 1.1 2001-10-11 10:55:31-04 long
26-
Added $log $ for edits to all CFM files that have fusedocs.
2713
||
2814
--->
2915
<cfquery name="delete_object_access" datasource="#application.datasources.main#">

‎Administration/qry_delete_profile.cfm

-13
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,6 @@
1010
||
1111
Edits:
1212
$Log$
13-
Revision 1.1 2006/09/15 22:26:07 csy
14-
<>
15-
16-
Revision 1.0 2006-08-16 09:32:10-04 csy
17-
Initial revision
18-
19-
Revision 1.0 2005-02-15 15:27:38-05 daugherty
20-
Initial revision
21-
22-
Revision 1.1 2001-10-11 10:55:31-04 long
23-
Added $log $ for edits to all CFM files that have fusedocs.
24-
25-
2613
||
2714
--->
2815
<cfquery name="delete_profile" datasource="#application.datasources.main#">

‎Administration/qry_delete_profile_module.cfm

-13
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,6 @@
1010
||
1111
Edits:
1212
$Log$
13-
Revision 1.1 2006/09/15 22:26:04 csy
14-
<>
15-
16-
Revision 1.0 2006-08-16 09:32:10-04 csy
17-
Initial revision
18-
19-
Revision 1.0 2005-02-15 15:27:38-05 daugherty
20-
Initial revision
21-
22-
Revision 1.1 2001-10-11 10:55:31-04 long
23-
Added $log $ for edits to all CFM files that have fusedocs.
24-
25-
2613
||
2714
--->
2815
<cfquery name="delete_profile_module" datasource="#application.datasources.main#">

‎Administration/qry_insert_object_access.cfm

-13
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,6 @@
1010
||
1111
Edits:
1212
$Log$
13-
Revision 1.1 2006/09/15 22:25:13 csy
14-
<>
15-
16-
Revision 1.0 2006-08-16 09:32:13-04 csy
17-
Initial revision
18-
19-
Revision 1.0 2005-02-15 15:27:42-05 daugherty
20-
Initial revision
21-
22-
Revision 1.1 2001-10-11 10:55:29-04 long
23-
Added $log $ for edits to all CFM files that have fusedocs.
24-
25-
2613
||
2714
--->
2815
<cfloop collection="#attributes#" item="field">

‎Application.cfm

+3-5
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
4646
switch(cgi.http_host) {
4747
case "127.0.0.1:8500":
48-
case "nash.hitsshq.com":
49-
case "faad.hitsshq.com": {
48+
case "192.168.1.6:8500":
49+
case "boston:8500": {
5050
variables.environment_name="Development";
5151
variables.sessiontimeout="3";
5252
break;
@@ -59,9 +59,7 @@
5959
break;
6060
}
6161
62-
case "heckler.hq.nasa.gov":
63-
case "faad.hq.nasa.gov":
64-
case "faad.nasa.gov": {
62+
default: {
6563
variables.environment_name="Production";
6664
variables.sessiontimeout="0.04166666666665";
6765
break;

‎CodeSweeper.log

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
End of file encountered while parsing (tag "IMG" with attributes src=file:///p:/work/bin/old/burn/pix/new0009.jpg align=right alt=Diane'>).
22
End of file encountered while parsing (tag "IMG" with attributes src=file:///p:/work/bin/old/burn/pix/new0009.jpg align=right alt=Diane drinks Mr. French's copious load>).
33
End of file encountered while parsing (tag "IMG" with attributes src=file:///p:/work/bin/old/burn/pix/new0009.jpg align=right alt=Diane drinks Mr. French's copious load of>).
4+
Invalid quoted string '127.0.0.1,localhost,boston,192.168.1.6' encountered while parsing (tag "CFIF" with attributes len(cgi.http_referer)= AND= NOT=).
5+
Invalid quoted string '127.0.0.1,localhost,boston,192.168.1.6' encountered while parsing (tag "CFIF" with attributes len(cgi.http_referer)= AND= NOT=).
6+
Invalid quoted string '127.0.0.1,localhost,boston,192.168.1.6' encountered while parsing (tag "CFIF" with attributes len(cgi.http_referer)= AND= NOT=).
7+
Invalid quoted string '127.0.0.1,localhost,boston,192.168.1.6' encountered while parsing (tag "CFIF" with attributes len(cgi.http_referer)= AND= NOT=).
8+
Invalid quoted string '127.0.0.1,localhost,boston,192.168.1.6' encountered while parsing (tag "CFIF" with attributes len(cgi.http_referer)= AND= NOT=).
9+
Invalid quoted string '127.0.0.1,localhost,boston,192.168.1.6' encountered while parsing (tag "CFIF" with attributes len(cgi.http_referer)= AND= NOT=).

‎Customers/act_add_customer.cfm

+12-16
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,33 @@
1010
||
1111
END FUSEDOC --->
1212
<cftransaction isolation="READ_COMMITTED">
13-
<cfif compare(attributes.lname, "")>
13+
<cfif len(attributes.lname)>
1414
<cfquery name="insert_customer_contact" datasource="#application.datasources.main#">
1515
INSERT INTO Emp_Contact (name, lname, emp_contact_type)
1616
VALUES ('#attributes.name#', '#attributes.lname#', 4)
1717
</cfquery>
18-
<cfquery name="get_new_emp_id" datasource="#application.datasources.main#">
19-
SELECT MAX(emp_id) AS emp_id
20-
FROM Emp_contact
21-
</cfquery>
22-
<cfif compare(attributes.phone, "")>
18+
<cfif len(attributes.phone)>
2319
<cfquery name="insert_contact_phone" datasource="#application.datasources.main#">
24-
INSERT INTO phone (phone_number, emp_id, phone_type_id)
25-
VALUES ('#attributes.phone#', #get_new_emp_id.emp_id#, 1)
20+
INSERT INTO Phone (phone_number, emp_id, phone_type_id)
21+
VALUES ('#attributes.phone#', IDENT_CURRENT('Emp_Contact'), 1)
2622
</cfquery>
2723
</cfif>
28-
<cfif compare(attributes.email, "")>
24+
<cfif len(attributes.email)>
2925
<cfquery name="insert_contact_email" datasource="#application.datasources.main#">
30-
INSERT INTO email (email, emp_id, email_type_id)
31-
VALUES ('#attributes.email#', #get_new_emp_id.emp_id#, 1)
26+
INSERT INTO Email (email, emp_id, email_type_id)
27+
VALUES ('#attributes.email#', IDENT_CURRENT('Emp_Contact'), 1)
3228
</cfquery>
3329
</cfif>
3430
</cfif>
35-
<cfquery name="insert_Customer" datasource="#application.datasources.main#">
31+
<cfquery name="insert_customer" datasource="#application.datasources.main#">
3632
INSERT INTO Customer (root_code, description, billable_type_id,
3733
company_id<cfif len(attributes.company_address1)>, company_address1</cfif><cfif len(attributes.company_address2)>, company_address2</cfif><cfif len(attributes.company_city)>, company_city</cfif>, company_state<cfif len(attributes.company_zip)>, company_zip</cfif><cfif len(attributes.lname)>, emp_contact_id</cfif>, active_ind)
38-
VALUES ('#new_code#', '#attributes.description#', #attributes.billable_type_id#,
39-
#attributes.company_id# <cfif len(attributes.company_address1)>, '#attributes.company_address1#'</cfif><cfif len(attributes.company_address2)>, '#attributes.company_address2#'</cfif><cfif len(attributes.company_city)>, '#attributes.company_city#'</cfif>, '#attributes.company_state#'<cfif len(attributes.company_zip)>, '#attributes.company_zip#'</cfif><cfif len(attributes.lname)>, #Get_new_emp_id.emp_id#</cfif>, 1)
34+
VALUES ('#variables.new_code#', '#attributes.description#', #attributes.billable_type_id#,
35+
#attributes.company_id# <cfif len(attributes.company_address1)>, '#attributes.company_address1#'</cfif><cfif len(attributes.company_address2)>, '#attributes.company_address2#'</cfif><cfif len(attributes.company_city)>, '#attributes.company_city#'</cfif>, '#attributes.company_state#'<cfif len(attributes.company_zip)>, '#attributes.company_zip#'</cfif><cfif len(attributes.lname)>, IDENT_CURRENT('Emp_Contact')</cfif>, 1)
4036
</cfquery>
4137
<cfquery name="company_id" datasource="#application.datasources.main#">
42-
INSERT INTO Link_Customer_Company (code, company_id)
43-
SELECT '#new_code#', company_id
38+
INSERT INTO Link_Customer_Company (customer_id, code, company_id)
39+
SELECT IDENT_CURRENT('Customer'), '#variables.new_code#', company_id
4440
FROM REF_Company
4541
WHERE company_id IN (<cfif isdefined("attributes.company_id")>#attributes.company_id#<cfelse>#attributes.company_id#</cfif>)
4642
</cfquery>

‎Customers/act_edit_engagement_custom.cfm

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ WHERE User_Fields.user_field_id=User_Field_Project_Link.user_field_id
3535
<cfset tmpVar=evaluate("attributes.type_#type_id#_num_1_name")>
3636
<cfset tmpVar=Replace(tmpVar, "', /,%", "''", "All")>
3737
<cfquery name="add_custom_fields" datasource="#application.datasources.main#">
38-
INSERT INTO User_Fields(field_type_id, field_title, active_id)
39-
VALUES(#type_id#, '#tmpVar#', 2)
38+
INSERT INTO User_Fields (field_type_id, field_title, active_ind)
39+
VALUES (#type_id#, '#tmpVar#', 2)
4040
</cfquery>
4141
<cfquery name="get_last_custom_field" datasource="#application.datasources.main#">
4242
SELECT MAX(user_field_id) AS current_field

‎Customers/act_edit_engagement_main.cfm

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SET Project.customer_id=#attributes.customer_id#,
2727
Project.status=#attributes.status#,
2828
Project.ie_emp_id=#attributes.ie_emp_id#,
2929
Project.date_updated=GETDATE(),
30-
Project.active_ind=#attributes.active_id#,
30+
Project.active_ind=#attributes.active_ind#,
3131
Project.eng_status=#attributes.eng_status#
3232
<cfif len(attributes.date_go_live)>,Project.date_go_live=#createodbcdatetime(attributes.date_go_live)#</cfif>
3333
<cfif len(variables.file_path)>,Project.file_path='#variables.file_path#'</cfif>

0 commit comments

Comments
 (0)