details: /erp/devel/int/rev/9f67838a3ea8
changeset: 6535:9f67838a3ea8
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Mar 01 13:24:11 2010 +0100
summary: fixes issue 12507: New customizable references should make it
possible to use a custom hibernate user type
details: /erp/devel/int/rev/aa9268a67b3d
changeset: 6536:aa9268a67b3d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Mar 01 13:25:09 2010 +0100
summary: Added testcase for reading through OBCriteria and testing on
isActive == true as a default
details: /erp/devel/int/rev/e9be931aca0e
changeset: 6537:e9be931aca0e
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Mon Mar 01 13:41:10 2010 +0100
summary: Fixed 12499: Re-add accidently removed generic error-message
details: /erp/devel/int/rev/67ff74400324
changeset: 6538:67ff74400324
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Mar 01 14:34:31 2010 +0100
summary: Fixes issue 0012492: m_get_product_cost error
details: /erp/devel/int/rev/28dfbc300ac0
changeset: 6539:28dfbc300ac0
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Mar 01 14:40:39 2010 +0100
summary: Fixes issue 0012014: Error in Project Profitability
details: /erp/devel/int/rev/8fd835841829
changeset: 6540:8fd835841829
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Mar 01 15:27:14 2010 +0100
summary: Added show/hide left tab bar icon show/hide capabilities
details: /erp/devel/int/rev/163ea059a644
changeset: 6541:163ea059a644
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Mar 01 18:25:17 2010 +0100
summary: Fixed issue 12514. A DROP statement will not be executed. Instead, a
CREATE OR REPLACE will be executed when a function has been changed.
diffstat:
src-db/database/lib/dbsourcemanager.jar |
0
src-db/database/model/functions/M_GET_PRODUCT_COST.xml |
2 +-
src-db/database/model/tables/C_PROJECT.xml |
8 +
src-db/database/sourcedata/AD_CALLOUT.xml |
9 +
src-db/database/sourcedata/AD_COLUMN.xml |
66 +-
src-db/database/sourcedata/AD_ELEMENT.xml |
30 +-
src-db/database/sourcedata/AD_FIELD.xml |
68 +-
src-db/database/sourcedata/AD_MESSAGE.xml |
11 +
src-db/database/sourcedata/AD_MODEL_OBJECT.xml |
12 +
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml |
10 +
src-db/database/sourcedata/AD_TEXTINTERFACES.xml |
11 +
src-test/org/openbravo/test/AllAntTaskTests.java |
2 +
src-test/org/openbravo/test/AllTests.java |
2 +
src-test/org/openbravo/test/AntTaskTests.java |
2 +
src-test/org/openbravo/test/dal/ReadByNameTest.java |
148 +
src/org/openbravo/base/model/Property.java |
14 +
src/org/openbravo/base/model/domaintype/BasePrimitiveDomainType.java |
9 +
src/org/openbravo/base/model/domaintype/PrimitiveDomainType.java |
9 +
src/org/openbravo/dal/core/DalMappingGenerator.java |
14 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Project_Service.java |
36 +
src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java |
179 +
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.jrxml |
3102 +++++----
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql |
63 +-
src/org/openbravo/erpCommon/security/Login_F1.html |
2 +-
src/org/openbravo/erpCommon/security/Login_FS.html |
1 +
web/js/utils.js |
115 +-
web/skins/Default/Openbravo_ERP_250.css |
20 +
27 files changed, 2413 insertions(+), 1532 deletions(-)
diffs (truncated from 4966 to 300 lines):
diff -r 7470dce633ac -r 163ea059a644 src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 7470dce633ac -r 163ea059a644
src-db/database/model/functions/M_GET_PRODUCT_COST.xml
--- a/src-db/database/model/functions/M_GET_PRODUCT_COST.xml Mon Mar 01
11:36:14 2010 +0100
+++ b/src-db/database/model/functions/M_GET_PRODUCT_COST.xml Mon Mar 01
18:25:17 2010 +0100
@@ -58,7 +58,7 @@
(SELECT COST
FROM M_COSTING
WHERE DATEFROM <= p_MovementDate
- AND DATETO >= p_MovementDate
+ AND DATETO > p_MovementDate
AND M_PRODUCT_ID = p_Product_ID
AND(v_CostType IS NULL
OR v_CostType = COSTTYPE)
diff -r 7470dce633ac -r 163ea059a644 src-db/database/model/tables/C_PROJECT.xml
--- a/src-db/database/model/tables/C_PROJECT.xml Mon Mar 01 11:36:14
2010 +0100
+++ b/src-db/database/model/tables/C_PROJECT.xml Mon Mar 01 18:25:17
2010 +0100
@@ -273,6 +273,14 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="SERVSERCOST" primaryKey="false" required="false"
type="DECIMAL" autoIncrement="false">
+ <default/>
+ <onCreateDefault><![CDATA[SERVCOST]]></onCreateDefault>
+ </column>
+ <column name="SERVOUTCOST" primaryKey="false" required="false"
type="DECIMAL" autoIncrement="false">
+ <default/>
+ <onCreateDefault><![CDATA[0]]></onCreateDefault>
+ </column>
<foreign-key foreignTable="C_LOCATION" name="C_LOCATION_PROJECT">
<reference local="C_LOCATION_ID" foreign="C_LOCATION_ID"/>
</foreign-key>
diff -r 7470dce633ac -r 163ea059a644 src-db/database/sourcedata/AD_CALLOUT.xml
--- a/src-db/database/sourcedata/AD_CALLOUT.xml Mon Mar 01 11:36:14 2010 +0100
+++ b/src-db/database/sourcedata/AD_CALLOUT.xml Mon Mar 01 18:25:17 2010 +0100
@@ -776,6 +776,15 @@
<!--3585710F23F244D9B179A28D18242583-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--3585710F23F244D9B179A28D18242583--></AD_CALLOUT>
+<!--4B3FBD8DE0C045EEB9E540BF4C873B6E--><AD_CALLOUT>
+<!--4B3FBD8DE0C045EEB9E540BF4C873B6E-->
<AD_CALLOUT_ID><![CDATA[4B3FBD8DE0C045EEB9E540BF4C873B6E]]></AD_CALLOUT_ID>
+<!--4B3FBD8DE0C045EEB9E540BF4C873B6E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4B3FBD8DE0C045EEB9E540BF4C873B6E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4B3FBD8DE0C045EEB9E540BF4C873B6E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4B3FBD8DE0C045EEB9E540BF4C873B6E-->
<NAME><![CDATA[SL_Project_Service]]></NAME>
+<!--4B3FBD8DE0C045EEB9E540BF4C873B6E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4B3FBD8DE0C045EEB9E540BF4C873B6E--></AD_CALLOUT>
+
<!--52415CD3A31640B8906555725299FED7--><AD_CALLOUT>
<!--52415CD3A31640B8906555725299FED7-->
<AD_CALLOUT_ID><![CDATA[52415CD3A31640B8906555725299FED7]]></AD_CALLOUT_ID>
<!--52415CD3A31640B8906555725299FED7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 7470dce633ac -r 163ea059a644 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Mar 01 11:36:14 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Mar 01 18:25:17 2010 +0100
@@ -218217,8 +218217,8 @@
<!--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--> <HELP><![CDATA[Expected cost of services provided. The real
number will originate from all expense sheets (lines marked as Time Sheet)
related to this project.]]></HELP>
+<!--803244--> <NAME><![CDATA[Total 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>
<!--803244--> <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
@@ -249138,6 +249138,37 @@
<!--3585B480A13011DD9CA97FE6868E2BF3-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--3585B480A13011DD9CA97FE6868E2BF3--></AD_COLUMN>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB--><AD_COLUMN>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<AD_COLUMN_ID><![CDATA[364D08C6BCCB4FDC8BE84B4A945B8BAB]]></AD_COLUMN_ID>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB--> <NAME><![CDATA[Outsourced
Cost]]></NAME>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB--> <HELP><![CDATA[Expected cost of
services outsourced. The real number will originate from all expense sheets
(lines marked as Time Sheet) related to this project.]]></HELP>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<COLUMNNAME><![CDATA[Servoutcost]]></COLUMNNAME>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<AD_TABLE_ID><![CDATA[203]]></AD_TABLE_ID>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB--> <SEQNO><![CDATA[281]]></SEQNO>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<AD_ELEMENT_ID><![CDATA[69C0AB4BC5474357B8119A12E75FBBA9]]></AD_ELEMENT_ID>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<AD_CALLOUT_ID><![CDATA[4B3FBD8DE0C045EEB9E540BF4C873B6E]]></AD_CALLOUT_ID>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB--> <POSITION><![CDATA[70]]></POSITION>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--364D08C6BCCB4FDC8BE84B4A945B8BAB--></AD_COLUMN>
+
<!--379FB64EDAE34511BF519A46C721394C--><AD_COLUMN>
<!--379FB64EDAE34511BF519A46C721394C-->
<AD_COLUMN_ID><![CDATA[379FB64EDAE34511BF519A46C721394C]]></AD_COLUMN_ID>
<!--379FB64EDAE34511BF519A46C721394C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -277756,6 +277787,37 @@
<!--DA4F35FA56AB11DEA15BF76C2FF29E52-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--DA4F35FA56AB11DEA15BF76C2FF29E52--></AD_COLUMN>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD--><AD_COLUMN>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<AD_COLUMN_ID><![CDATA[DDD1D5A0F25942B8B2C5D1DDF78AE9CD]]></AD_COLUMN_ID>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD--> <NAME><![CDATA[Service Cost]]></NAME>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD--> <HELP><![CDATA[Expected cost of
services provided. The real number will originate from all expense sheets
(lines marked as Time Sheet) related to this project.]]></HELP>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<COLUMNNAME><![CDATA[Servsercost]]></COLUMNNAME>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<AD_TABLE_ID><![CDATA[203]]></AD_TABLE_ID>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD--> <SEQNO><![CDATA[271]]></SEQNO>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<AD_ELEMENT_ID><![CDATA[53066A102E244DA3B414196A502849C0]]></AD_ELEMENT_ID>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<AD_CALLOUT_ID><![CDATA[4B3FBD8DE0C045EEB9E540BF4C873B6E]]></AD_CALLOUT_ID>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD--> <POSITION><![CDATA[69]]></POSITION>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD--></AD_COLUMN>
+
<!--DDEFF6832ABE4477AB7C33CF71344334--><AD_COLUMN>
<!--DDEFF6832ABE4477AB7C33CF71344334-->
<AD_COLUMN_ID><![CDATA[DDEFF6832ABE4477AB7C33CF71344334]]></AD_COLUMN_ID>
<!--DDEFF6832ABE4477AB7C33CF71344334-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 7470dce633ac -r 163ea059a644 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Mon Mar 01 11:36:14 2010 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Mon Mar 01 18:25:17 2010 +0100
@@ -19058,9 +19058,9 @@
<!--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[Service cost]]></PRINTNAME>
-<!--800697--> <HELP><![CDATA[Expected cost of services provided. The real
number will originate from all expense sheets (lines marked as Time Sheet)
related to this project.]]></HELP>
+<!--800697--> <NAME><![CDATA[Total Service Cost]]></NAME>
+<!--800697--> <PRINTNAME><![CDATA[Total 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>
@@ -22930,6 +22930,18 @@
<!--5221067DBEFE52DEE040007F01001FE1-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--5221067DBEFE52DEE040007F01001FE1--></AD_ELEMENT>
+<!--53066A102E244DA3B414196A502849C0--><AD_ELEMENT>
+<!--53066A102E244DA3B414196A502849C0-->
<AD_ELEMENT_ID><![CDATA[53066A102E244DA3B414196A502849C0]]></AD_ELEMENT_ID>
+<!--53066A102E244DA3B414196A502849C0-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--53066A102E244DA3B414196A502849C0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--53066A102E244DA3B414196A502849C0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--53066A102E244DA3B414196A502849C0-->
<COLUMNNAME><![CDATA[Servsercost]]></COLUMNNAME>
+<!--53066A102E244DA3B414196A502849C0--> <NAME><![CDATA[Service Cost]]></NAME>
+<!--53066A102E244DA3B414196A502849C0--> <PRINTNAME><![CDATA[Service
Cost]]></PRINTNAME>
+<!--53066A102E244DA3B414196A502849C0--> <HELP><![CDATA[Expected cost of
services provided. The real number will originate from all expense sheets
(lines marked as Time Sheet) related to this project.]]></HELP>
+<!--53066A102E244DA3B414196A502849C0-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--53066A102E244DA3B414196A502849C0--></AD_ELEMENT>
+
<!--560E22375F1DFE66E040007F01002367--><AD_ELEMENT>
<!--560E22375F1DFE66E040007F01002367-->
<AD_ELEMENT_ID><![CDATA[560E22375F1DFE66E040007F01002367]]></AD_ELEMENT_ID>
<!--560E22375F1DFE66E040007F01002367-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -24647,6 +24659,18 @@
<!--6860321CEBD211DD85DF0016D4EE9DB3-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--6860321CEBD211DD85DF0016D4EE9DB3--></AD_ELEMENT>
+<!--69C0AB4BC5474357B8119A12E75FBBA9--><AD_ELEMENT>
+<!--69C0AB4BC5474357B8119A12E75FBBA9-->
<AD_ELEMENT_ID><![CDATA[69C0AB4BC5474357B8119A12E75FBBA9]]></AD_ELEMENT_ID>
+<!--69C0AB4BC5474357B8119A12E75FBBA9-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--69C0AB4BC5474357B8119A12E75FBBA9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--69C0AB4BC5474357B8119A12E75FBBA9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--69C0AB4BC5474357B8119A12E75FBBA9-->
<COLUMNNAME><![CDATA[Servoutcost]]></COLUMNNAME>
+<!--69C0AB4BC5474357B8119A12E75FBBA9--> <NAME><![CDATA[Outsourced
Cost]]></NAME>
+<!--69C0AB4BC5474357B8119A12E75FBBA9--> <PRINTNAME><![CDATA[Outsourced
Cost]]></PRINTNAME>
+<!--69C0AB4BC5474357B8119A12E75FBBA9--> <HELP><![CDATA[Expected cost of
services outsourced. The real number will originate from all expense sheets
(lines marked as Time Sheet) related to this project.]]></HELP>
+<!--69C0AB4BC5474357B8119A12E75FBBA9-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--69C0AB4BC5474357B8119A12E75FBBA9--></AD_ELEMENT>
+
<!--6A9B2495752F4B609B0E4B9EB10A6D0F--><AD_ELEMENT>
<!--6A9B2495752F4B609B0E4B9EB10A6D0F-->
<AD_ELEMENT_ID><![CDATA[6A9B2495752F4B609B0E4B9EB10A6D0F]]></AD_ELEMENT_ID>
<!--6A9B2495752F4B609B0E4B9EB10A6D0F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 7470dce633ac -r 163ea059a644 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 01 11:36:14 2010 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 01 18:25:17 2010 +0100
@@ -81435,7 +81435,7 @@
<!--6544--> <DISPLAYLOGIC><![cda...@issummary@='N']]></DISPLAYLOGIC>
<!--6544--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--6544--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--6544--> <SEQNO><![CDATA[400]]></SEQNO>
+<!--6544--> <SEQNO><![CDATA[420]]></SEQNO>
<!--6544--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--6544--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--6544--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -81459,7 +81459,7 @@
<!--6545--> <DISPLAYLOGIC><![cda...@processed@='N' &
@projectsta...@!'OC']]></DISPLAYLOGIC>
<!--6545--> <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH>
<!--6545--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--6545--> <SEQNO><![CDATA[440]]></SEQNO>
+<!--6545--> <SEQNO><![CDATA[460]]></SEQNO>
<!--6545--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--6545--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--6545--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -81507,7 +81507,7 @@
<!--6547--> <DISPLAYLOGIC><![cda...@issummary@='N']]></DISPLAYLOGIC>
<!--6547--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--6547--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--6547--> <SEQNO><![CDATA[410]]></SEQNO>
+<!--6547--> <SEQNO><![CDATA[430]]></SEQNO>
<!--6547--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--6547--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--6547--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -81555,7 +81555,7 @@
<!--6549--> <DISPLAYLOGIC><![cda...@issummary@='N']]></DISPLAYLOGIC>
<!--6549--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--6549--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--6549--> <SEQNO><![CDATA[420]]></SEQNO>
+<!--6549--> <SEQNO><![CDATA[440]]></SEQNO>
<!--6549--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--6549--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--6549--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -162566,15 +162566,15 @@
<!--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[Service Cost]]></NAME>
-<!--803587--> <HELP><![CDATA[Service cost]]></HELP>
+<!--803587--> <NAME><![CDATA[Total 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>
<!--803587--> <AD_COLUMN_ID><![CDATA[803244]]></AD_COLUMN_ID>
<!--803587--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--803587--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
-<!--803587--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--803587--> <SEQNO><![CDATA[360]]></SEQNO>
+<!--803587--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--803587--> <SEQNO><![CDATA[380]]></SEQNO>
<!--803587--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--803587--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--803587--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -162596,7 +162596,7 @@
<!--803588--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--803588--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
<!--803588--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--803588--> <SEQNO><![CDATA[370]]></SEQNO>
+<!--803588--> <SEQNO><![CDATA[390]]></SEQNO>
<!--803588--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--803588--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--803588--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -162640,7 +162640,7 @@
<!--803590--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--803590--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
<!--803590--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--803590--> <SEQNO><![CDATA[380]]></SEQNO>
+<!--803590--> <SEQNO><![CDATA[400]]></SEQNO>
<!--803590--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--803590--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--803590--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -162662,7 +162662,7 @@
<!--803591--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--803591--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
<!--803591--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--803591--> <SEQNO><![CDATA[390]]></SEQNO>
+<!--803591--> <SEQNO><![CDATA[410]]></SEQNO>
<!--803591--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--803591--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--803591--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -164384,7 +164384,7 @@
<!--803670--> <DISPLAYLOGIC><![cda...@processed@='N']]></DISPLAYLOGIC>
<!--803670--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--803670--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--803670--> <SEQNO><![CDATA[430]]></SEQNO>
+<!--803670--> <SEQNO><![CDATA[450]]></SEQNO>
<!--803670--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--803670--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--803670--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -182326,6 +182326,28 @@
<!--2828AC0401C54F0FBE5B4E8CFC799B76-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--2828AC0401C54F0FBE5B4E8CFC799B76--></AD_FIELD>
+<!--280BB3827CDC4C34AC53167B360BF850--><AD_FIELD>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<AD_FIELD_ID><![CDATA[280BB3827CDC4C34AC53167B360BF850]]></AD_FIELD_ID>
+<!--280BB3827CDC4C34AC53167B360BF850-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--280BB3827CDC4C34AC53167B360BF850--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--280BB3827CDC4C34AC53167B360BF850--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--280BB3827CDC4C34AC53167B360BF850--> <NAME><![CDATA[Service Cost]]></NAME>
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
