Attached Files | Issue_15030.diff [^] (24,507 bytes) 2010-12-07 10:14 [Show Content] [Hide Content]diff -r 684e5a29d6e9 src-db/database/model/triggers/C_PROJECTLINE_TRG2.xml
--- a/src-db/database/model/triggers/C_PROJECTLINE_TRG2.xml Thu Dec 02 12:16:42 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
- <database name="TRIGGER C_PROJECTLINE_TRG2">
- <trigger name="C_PROJECTLINE_TRG2" table="C_PROJECTLINE" fires="after" insert="true" update="true" delete="false" foreach="statement">
- <body><![CDATA[
-
-BEGIN
-
- IF AD_isTriggerEnabled()='N' THEN RETURN;
- END IF;
-
-
- /*************************************************************************
- * The contents of this file are subject to the Compiere Public
- * License 1.1 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License in
- * the legal folder of your Openbravo installation.
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing rights
- * and limitations under the License.
- * The Original Code is Compiere ERP & Business Solution
- * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc.
- * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
- * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
- * All Rights Reserved.
- * Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2008 Openbravo, S.L.U.
- *
- * Specifically, this derivative work is based upon the following Compiere
- * file and version.
- *************************************************************************
- * $Id: C_ProjectLine_Trg2.sql,v 1.2 2003/05/26 22:31:15 jjanke Exp $
- ***
- * Title: Trigger recalculation of all projects
- * Description:
- * Where lines were updated in the last minute
- ************************************************************************/
- UPDATE C_Project
- SET Updated=now()
- WHERE EXISTS
- (
- SELECT *
- FROM C_ProjectLine l
- WHERE C_Project.C_Project_ID=l.C_Project_ID
- AND Updated > now() -1/1440
- )
- ;
-END C_PROJECTLINE_TRG2
-]]></body>
- </trigger>
- </database>
diff -r 684e5a29d6e9 src-db/database/model/triggers/C_PROJECT_TRG2.xml
--- a/src-db/database/model/triggers/C_PROJECT_TRG2.xml Thu Dec 02 12:16:42 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
- <database name="TRIGGER C_PROJECT_TRG2">
- <trigger name="C_PROJECT_TRG2" table="C_PROJECT" fires="before" insert="false" update="true" delete="false" foreach="row">
- <body><![CDATA[
- /*************************************************************************
- * The contents of this file are subject to the Compiere Public
- * License 1.1 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License in
- * the legal folder of your Openbravo installation.
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing rights
- * and limitations under the License.
- * The Original Code is Compiere ERP & Business Solution
- * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc.
- * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
- * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
- * All Rights Reserved.
- * Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2008 Openbravo, S.L.U.
- *
- * Specifically, this derivative work is based upon the following Compiere
- * file and version.
- *************************************************************************
- * $Id: C_Project_Trg2.sql,v 1.2 2003/05/26 22:31:15 jjanke Exp $
- ***
- * Title: Recalculate Totals
- * Description:
- ************************************************************************/
- v_Count NUMBER;
-
-BEGIN
-
- IF AD_isTriggerEnabled()='N' THEN RETURN;
- END IF;
-
-
- SELECT COUNT(*)
- INTO v_Count
- FROM C_PROJECTLINE
- WHERE C_Project_ID=:NEW.C_Project_ID;
- IF(v_Count > 0) THEN
- -- Update Summary Info
- SELECT SUM(PlannedAmt),
- SUM(PlannedQty), ((SUM(COALESCE(PLANNEDPRICE,0))-SUM(COALESCE(PLANNEDPOPRICE,0)))*100/SUM(COALESCE(PLANNEDPRICE,1))), SUM(CommittedAmt),
- SUM(CommittedQty), SUM(InvoicedAmt), SUM(InvoicedQty),
- (SUM(COALESCE(PlannedPrice, 0) *PlannedQty))
- INTO :NEW.PlannedAmt,
- :NEW.PlannedQty, :NEW.PlannedMarginAmt, :NEW.CommittedAmt,
- :NEW.CommittedQty, :NEW.InvoicedAmt, :NEW.InvoicedQty,
- :NEW.PlannedPOAmt
- FROM C_PROJECTLINE
- WHERE C_Project_ID=:NEW.C_Project_ID;
- END IF;
- /*
- SELECT MAX(UPDATED)
- INTO :NEW.LASTPLANNEDPROPOSALDATE
- FROM C_PROJECTPROPOSALTASK T
- WHERE EXISTS (SELECT 1 FROM C_PROJECTPROPOSAL P
- WHERE P.C_PROJECTPROPOSAL_ID=T.C_PROJECTPROPOSAL_ID
- AND P.C_PROJECT_ID=:NEW.C_PROJECT_ID);*/
-END C_PROJECT_TRG2
-]]></body>
- </trigger>
- </database>
diff -r 684e5a29d6e9 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Dec 02 12:16:42 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Dec 02 18:52:08 2010 +0530
@@ -232188,7 +232188,7 @@
<!--803243--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--803243--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--803243--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803243--> <NAME><![CDATA[Service Revenue]]></NAME>
+<!--803243--> <NAME><![CDATA[Planned Service Revenue]]></NAME>
<!--803243--> <HELP><![CDATA[Expected revenue of services provided to the client. Real numbers will originate from invoices of services (products of type "service") sent out to the client.]]></HELP>
<!--803243--> <COLUMNNAME><![CDATA[Servrevenue]]></COLUMNNAME>
<!--803243--> <AD_TABLE_ID><![CDATA[203]]></AD_TABLE_ID>
@@ -232221,7 +232221,7 @@
<!--803244--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--803244--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--803244--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803244--> <NAME><![CDATA[Service Cost]]></NAME>
+<!--803244--> <NAME><![CDATA[Planned Service Cost]]></NAME>
<!--803244--> <HELP><![CDATA[Expected total cost of services provided. The real number will originate from all expense sheets (lines marked as Time Sheet) related to this project.]]></HELP>
<!--803244--> <COLUMNNAME><![CDATA[Servcost]]></COLUMNNAME>
<!--803244--> <AD_TABLE_ID><![CDATA[203]]></AD_TABLE_ID>
@@ -232254,7 +232254,7 @@
<!--803245--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--803245--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--803245--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803245--> <NAME><![CDATA[Service Margin %]]></NAME>
+<!--803245--> <NAME><![CDATA[Planned Service Margin %]]></NAME>
<!--803245--> <HELP><![CDATA[Expected service margin. Real number will be calculated from actual service revenue and costs.]]></HELP>
<!--803245--> <COLUMNNAME><![CDATA[Servmargin]]></COLUMNNAME>
<!--803245--> <AD_TABLE_ID><![CDATA[203]]></AD_TABLE_ID>
@@ -232287,7 +232287,7 @@
<!--803246--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--803246--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--803246--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803246--> <NAME><![CDATA[Reinvoiced Expenses]]></NAME>
+<!--803246--> <NAME><![CDATA[Planned Reinvoiced Expenses]]></NAME>
<!--803246--> <HELP><![CDATA[Amount of expenses we plan to invoice back to the client. Real number will originate from sales invoices for this particular client and project that include products of type "expense" (such as telephone, electricity, etc)]]></HELP>
<!--803246--> <COLUMNNAME><![CDATA[Expreinvoicing]]></COLUMNNAME>
<!--803246--> <AD_TABLE_ID><![CDATA[203]]></AD_TABLE_ID>
@@ -232353,7 +232353,7 @@
<!--803248--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--803248--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--803248--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803248--> <NAME><![CDATA[Expenses Margin %]]></NAME>
+<!--803248--> <NAME><![CDATA[Planned Expenses Margin %]]></NAME>
<!--803248--> <HELP><![CDATA[Expected margin for expenses.]]></HELP>
<!--803248--> <COLUMNNAME><![CDATA[Expmargin]]></COLUMNNAME>
<!--803248--> <AD_TABLE_ID><![CDATA[203]]></AD_TABLE_ID>
diff -r 684e5a29d6e9 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Thu Dec 02 12:16:42 2010 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Thu Dec 02 18:52:08 2010 +0530
@@ -19022,7 +19022,7 @@
<!--800694--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--800694--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--800694--> <COLUMNNAME><![CDATA[Expreinvoicing]]></COLUMNNAME>
-<!--800694--> <NAME><![CDATA[Reinvoiced Expenses]]></NAME>
+<!--800694--> <NAME><![CDATA[Planned Reinvoiced Expenses]]></NAME>
<!--800694--> <PRINTNAME><![CDATA[Reinvoicing]]></PRINTNAME>
<!--800694--> <HELP><![CDATA[Amount of expenses we plan to invoice back to the client. Real number will originate from sales invoices for this particular client and project that include products of type "expense" (such as telephone, electricity, etc)]]></HELP>
<!--800694--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -19046,8 +19046,8 @@
<!--800696--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--800696--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--800696--> <COLUMNNAME><![CDATA[Expmargin]]></COLUMNNAME>
-<!--800696--> <NAME><![CDATA[Expenses Margin %]]></NAME>
-<!--800696--> <PRINTNAME><![CDATA[Expected Margin %]]></PRINTNAME>
+<!--800696--> <NAME><![CDATA[Planned Expenses Margin %]]></NAME>
+<!--800696--> <PRINTNAME><![CDATA[Planned Expected Margin %]]></PRINTNAME>
<!--800696--> <HELP><![CDATA[Expected margin for expenses.]]></HELP>
<!--800696--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--800696--></AD_ELEMENT>
@@ -19058,8 +19058,8 @@
<!--800697--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--800697--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--800697--> <COLUMNNAME><![CDATA[Servcost]]></COLUMNNAME>
-<!--800697--> <NAME><![CDATA[Service Cost]]></NAME>
-<!--800697--> <PRINTNAME><![CDATA[Total Service cost]]></PRINTNAME>
+<!--800697--> <NAME><![CDATA[Planned Service Cost]]></NAME>
+<!--800697--> <PRINTNAME><![CDATA[Total Planned Service cost]]></PRINTNAME>
<!--800697--> <HELP><![CDATA[Expected total cost of services provided. The real number will originate from all expense sheets (lines marked as Time Sheet) related to this project.]]></HELP>
<!--800697--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--800697--></AD_ELEMENT>
@@ -19082,8 +19082,8 @@
<!--800699--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--800699--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--800699--> <COLUMNNAME><![CDATA[Servmargin]]></COLUMNNAME>
-<!--800699--> <NAME><![CDATA[Service Margin %]]></NAME>
-<!--800699--> <PRINTNAME><![CDATA[Service Margin %]]></PRINTNAME>
+<!--800699--> <NAME><![CDATA[Planned Service Margin %]]></NAME>
+<!--800699--> <PRINTNAME><![CDATA[Planned Service Margin %]]></PRINTNAME>
<!--800699--> <HELP><![CDATA[Expected service margin. Real number will be calculated from actual service revenue and costs.]]></HELP>
<!--800699--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--800699--></AD_ELEMENT>
@@ -19094,8 +19094,8 @@
<!--800700--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--800700--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--800700--> <COLUMNNAME><![CDATA[Servrevenue]]></COLUMNNAME>
-<!--800700--> <NAME><![CDATA[Service Revenue]]></NAME>
-<!--800700--> <PRINTNAME><![CDATA[Service revenue]]></PRINTNAME>
+<!--800700--> <NAME><![CDATA[Planned Service Revenue]]></NAME>
+<!--800700--> <PRINTNAME><![CDATA[Planned Service revenue]]></PRINTNAME>
<!--800700--> <HELP><![CDATA[Expected revenue of services provided to the client. Real numbers will originate from invoices of services (products of type "service") sent out to the client.]]></HELP>
<!--800700--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--800700--></AD_ELEMENT>
diff -r 684e5a29d6e9 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Thu Dec 02 12:16:42 2010 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Thu Dec 02 18:52:08 2010 +0530
@@ -35270,6 +35270,7 @@
<!--3068--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--3068--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
<!--3068--> <AD_COLUMN_ID><![CDATA[3904]]></AD_COLUMN_ID>
+<!--3068--> <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
<!--3068--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--3068--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--3068--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
@@ -54251,7 +54252,7 @@
<!--4455--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
<!--4455--> <AD_COLUMN_ID><![CDATA[5755]]></AD_COLUMN_ID>
<!--4455--> <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
-<!--4455--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4455--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--4455--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--4455--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--4455--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
@@ -54275,7 +54276,7 @@
<!--4456--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--4456--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
<!--4456--> <AD_COLUMN_ID><![CDATA[5757]]></AD_COLUMN_ID>
-<!--4456--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4456--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--4456--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--4456--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--4456--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
@@ -54300,7 +54301,7 @@
<!--4457--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
<!--4457--> <AD_COLUMN_ID><![CDATA[5756]]></AD_COLUMN_ID>
<!--4457--> <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
-<!--4457--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4457--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--4457--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--4457--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--4457--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
@@ -81321,7 +81322,7 @@
<!--6544--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
<!--6544--> <AD_COLUMN_ID><![CDATA[8753]]></AD_COLUMN_ID>
<!--6544--> <AD_FIELDGROUP_ID><![CDATA[105]]></AD_FIELDGROUP_ID>
-<!--6544--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6544--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--6544--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--6544--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--6544--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
@@ -81393,7 +81394,7 @@
<!--6547--> <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
<!--6547--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
<!--6547--> <AD_COLUMN_ID><![CDATA[8756]]></AD_COLUMN_ID>
-<!--6547--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6547--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--6547--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--6547--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--6547--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
@@ -81441,7 +81442,7 @@
<!--6549--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--6549--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
<!--6549--> <AD_COLUMN_ID><![CDATA[8758]]></AD_COLUMN_ID>
-<!--6549--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6549--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--6549--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--6549--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--6549--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
@@ -108147,7 +108148,7 @@
<!--800049--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--800049--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--800049--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
-<!--800049--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--800049--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
<!--800049--> <SEQNO><![CDATA[320]]></SEQNO>
<!--800049--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--800049--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -108430,7 +108431,7 @@
<!--800061--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--800061--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--800061--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
-<!--800061--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--800061--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
<!--800061--> <SEQNO><![CDATA[330]]></SEQNO>
<!--800061--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--800061--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -108592,7 +108593,7 @@
<!--800068--> <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
<!--800068--> <AD_TAB_ID><![CDATA[800002]]></AD_TAB_ID>
<!--800068--> <AD_COLUMN_ID><![CDATA[8756]]></AD_COLUMN_ID>
-<!--800068--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--800068--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--800068--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--800068--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--800068--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
@@ -108643,7 +108644,7 @@
<!--800070--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--800070--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--800070--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
-<!--800070--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--800070--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
<!--800070--> <SEQNO><![CDATA[340]]></SEQNO>
<!--800070--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--800070--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -108665,7 +108666,7 @@
<!--800071--> <AD_TAB_ID><![CDATA[800002]]></AD_TAB_ID>
<!--800071--> <AD_COLUMN_ID><![CDATA[8753]]></AD_COLUMN_ID>
<!--800071--> <AD_FIELDGROUP_ID><![CDATA[105]]></AD_FIELDGROUP_ID>
-<!--800071--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--800071--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--800071--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--800071--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--800071--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
@@ -108713,7 +108714,7 @@
<!--800073--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--800073--> <AD_TAB_ID><![CDATA[800002]]></AD_TAB_ID>
<!--800073--> <AD_COLUMN_ID><![CDATA[8758]]></AD_COLUMN_ID>
-<!--800073--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--800073--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--800073--> <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
<!--800073--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--800073--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
@@ -127363,7 +127364,7 @@
<!--801075--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--801075--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--801075--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801075--> <NAME><![CDATA[Expenses Margin %]]></NAME>
+<!--801075--> <NAME><![CDATA[Planned Expenses Margin %]]></NAME>
<!--801075--> <HELP><![CDATA[Expected margin for expenses.]]></HELP>
<!--801075--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--801075--> <AD_TAB_ID><![CDATA[800002]]></AD_TAB_ID>
@@ -162126,7 +162127,7 @@
<!--803586--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--803586--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--803586--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803586--> <NAME><![CDATA[Service Revenue]]></NAME>
+<!--803586--> <NAME><![CDATA[Planned Service Revenue]]></NAME>
<!--803586--> <HELP><![CDATA[Revenue services]]></HELP>
<!--803586--> <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
<!--803586--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
@@ -162148,7 +162149,7 @@
<!--803587--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--803587--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--803587--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803587--> <NAME><![CDATA[Total Service Cost]]></NAME>
+<!--803587--> <NAME><![CDATA[Total Planned Service Cost]]></NAME>
<!--803587--> <HELP><![CDATA[Expected total cost of services provided. The real number will originate from all expense sheets (lines marked as Time Sheet) related to this project.]]></HELP>
<!--803587--> <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
<!--803587--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
@@ -162170,7 +162171,7 @@
<!--803588--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--803588--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--803588--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803588--> <NAME><![CDATA[Reinvoiced Expenses]]></NAME>
+<!--803588--> <NAME><![CDATA[Planned Reinvoiced Expenses]]></NAME>
<!--803588--> <HELP><![CDATA[Reinvoicing Expenses]]></HELP>
<!--803588--> <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
<!--803588--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
@@ -162214,7 +162215,7 @@
<!--803590--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--803590--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--803590--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803590--> <NAME><![CDATA[Service Margin %]]></NAME>
+<!--803590--> <NAME><![CDATA[Planned Service Margin %]]></NAME>
<!--803590--> <HELP><![CDATA[Expected service margin. Real number will be calculated from actual service revenue and costs.]]></HELP>
<!--803590--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--803590--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
@@ -162236,7 +162237,7 @@
<!--803591--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--803591--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--803591--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803591--> <NAME><![CDATA[Expenses Margin %]]></NAME>
+<!--803591--> <NAME><![CDATA[Planned Expenses Margin %]]></NAME>
<!--803591--> <HELP><![CDATA[Expected margin for expenses.]]></HELP>
<!--803591--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--803591--> <AD_TAB_ID><![CDATA[157]]></AD_TAB_ID>
@@ -180282,7 +180283,7 @@
<!--1005900009--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--1005900009--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--1005900009--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1005900009--> <NAME><![CDATA[Reinvoiced Expenses]]></NAME>
+<!--1005900009--> <NAME><![CDATA[Planned Reinvoiced Expenses]]></NAME>
<!--1005900009--> <HELP><![CDATA[Reinvoicing Expenses]]></HELP>
<!--1005900009--> <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
<!--1005900009--> <AD_TAB_ID><![CDATA[800002]]></AD_TAB_ID>
@@ -180328,7 +180329,7 @@
<!--1005900011--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--1005900011--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--1005900011--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1005900011--> <NAME><![CDATA[Service Cost]]></NAME>
+<!--1005900011--> <NAME><![CDATA[Planned Service Cost]]></NAME>
<!--1005900011--> <HELP><![CDATA[Service cost]]></HELP>
<!--1005900011--> <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
<!--1005900011--> <AD_TAB_ID><![CDATA[800002]]></AD_TAB_ID>
@@ -180350,7 +180351,7 @@
<!--1005900012--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--1005900012--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--1005900012--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1005900012--> <NAME><![CDATA[Service Margin %]]></NAME>
+<!--1005900012--> <NAME><![CDATA[Planned Service Margin %]]></NAME>
<!--1005900012--> <HELP><![CDATA[Expected service margin. Real number will be calculated from actual service revenue and costs.]]></HELP>
<!--1005900012--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--1005900012--> <AD_TAB_ID><![CDATA[800002]]></AD_TAB_ID>
@@ -180372,7 +180373,7 @@
<!--1005900013--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--1005900013--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--1005900013--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1005900013--> <NAME><![CDATA[Service Revenue]]></NAME>
+<!--1005900013--> <NAME><![CDATA[Planned Service Revenue]]></NAME>
<!--1005900013--> <HELP><![CDATA[Revenue services]]></HELP>
<!--1005900013--> <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
<!--1005900013--> <AD_TAB_ID><![CDATA[800002]]></AD_TAB_ID>
C_PROJECTLINE_TRG3.xml [^] (5,132 bytes) 2010-12-07 10:15 |