details: /erp/devel/main/rev/39e45260e7ce
changeset: 7381:39e45260e7ce
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Mon May 17 11:36:39 2010 +0530
summary: Fixes Issue 12929: in bank stmt line allows select a debt payment
and g/l item
details: /erp/devel/main/rev/7af1b745c4eb
changeset: 7382:7af1b745c4eb
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Mon May 17 12:46:51 2010 +0530
summary: Break of Fixed issue 12929 is pushed in ad_message
details: /erp/devel/main/rev/a768ad8bc4d8
changeset: 7383:a768ad8bc4d8
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Mon May 17 14:59:02 2010 +0530
summary: Fixes Issue 13190 Before in the trigger the total net amount is not
calculated during the deletion of the trigger.
details: /erp/devel/main/rev/7deb007cd126
changeset: 7384:7deb007cd126
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Mon May 17 15:14:55 2010 +0530
summary: Fixes Issue 12571: Amount quantities are remembered when running
General Ledger Report and Payment Report
details: /erp/devel/main/rev/34a00fbb9f53
changeset: 7385:34a00fbb9f53
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Mon May 17 16:45:55 2010 +0530
summary: Fixes Issue 12606: The names 'Foreign Currency Debit' and 'Foreign
Currency Credit' are not correct.
details: /erp/devel/main/rev/2ccd08241915
changeset: 7386:2ccd08241915
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon May 17 13:54:40 2010 +0200
summary: Related to bug 12683: Revert changes
Backed out changeset 174274efc18c
details: /erp/devel/main/rev/5f15b78035a1
changeset: 7387:5f15b78035a1
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon May 17 14:26:04 2010 +0200
summary: Fixes issue 0013320: Different behaviour when changing decimal
separator
This changeset replaces in the callout how to read the Line Net Amount value.
This value is a numeric value and must be read using the function
getNumericParameter because this function takes into acount the number format
defined in the file Format.xml
details: /erp/devel/main/rev/5511763e8083
changeset: 7388:5511763e8083
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon May 17 16:25:17 2010 +0200
summary: fixed bug 13315: Confusing error message on CE installing community
module depending on commercial one
details: /erp/devel/main/rev/d0bd5c606ec9
changeset: 7389:d0bd5c606ec9
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon May 17 16:35:30 2010 +0200
summary: Reverted fix for issue 13030. To avoid any kind of raising false
positive errors in the build, we will fix this in a different manner. A
separate issue for this has been created with id=13340
details: /erp/devel/main/rev/f985aad3ef14
changeset: 7390:f985aad3ef14
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon May 17 17:03:25 2010 +0200
summary: fixed bug 13315: Fix message installing commercial mods on community
instances
details: /erp/devel/main/rev/3086c7323bbf
changeset: 7391:3086c7323bbf
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon May 17 17:19:20 2010 +0200
summary: Fixes issue 0012705: Phisical Inventory processed twice
It has been modified the M_INVENTORY trigger to avoid to set as unprocessed a
physycal inventory record that has already been processed. This avoids to
process the same record twice
details: /erp/devel/main/rev/d1e14cae6fb7
changeset: 7392:d1e14cae6fb7
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon May 17 18:36:09 2010 +0200
summary: Fixes issue 0013323: Wrong payment conditions when associating a
Project to a Purchase Invoice
This changeset removes the condition that avoided to modify the payment terms
and conditions in purchase invoices. This way the behavior is consistent in all
orders and invoices
details: /erp/devel/main/rev/eb07a438c6dc
changeset: 7393:eb07a438c6dc
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Mon May 17 18:41:28 2010 +0200
summary: Fixed bug 12939: Allow withholding when creating payment from Bank
details: /erp/devel/main/rev/4500c5669307
changeset: 7394:4500c5669307
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon May 10 18:54:06 2010 +0200
summary: File missing license
details: /erp/devel/main/rev/6d4eddcb94f5
changeset: 7395:6d4eddcb94f5
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue May 18 10:46:20 2010 +0200
summary: Fixes bug 0013346: Users are able to edit the Current Balance
details: /erp/devel/main/rev/831f035b0622
changeset: 7396:831f035b0622
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue May 18 10:47:14 2010 +0200
summary: merge
details: /erp/devel/main/rev/60642476a87e
changeset: 7397:60642476a87e
user: Balamurugan Ramadoss <balamurugan.ramadoss <at> openbravo.com>
date: Tue May 18 15:39:12 2010 +0530
summary: Fixes Issue 13069: In general ledger report, the product selected
could not be unselected
details: /erp/devel/main/rev/7203ab098ac5
changeset: 7398:7203ab098ac5
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Tue May 18 16:37:46 2010 +0530
summary: Fixes Issue 13356 Before, a string is appended along with the
name.Now this is removed.
details: /erp/devel/main/rev/d4e0b9369ccf
changeset: 7399:d4e0b9369ccf
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Tue May 18 13:26:54 2010 +0200
summary: Fixes capitalization error in Payment Method field
details: /erp/devel/main/rev/c2c3302e8951
changeset: 7400:c2c3302e8951
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Tue May 18 17:48:39 2010 +0530
summary: Fixes issue 13357: \"create standard\" process does not work in
\"production run\" tab
TRIGGERS are trying to retrieve old data for INSERT operation, which is invalid
and causes error. In order to fix it, new and old data assignment has been
moved into their IF and ELSE block respectively.
details: /erp/devel/main/rev/fb83ef0f2fbc
changeset: 7401:fb83ef0f2fbc
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue May 18 18:04:45 2010 +0200
summary: fixed issue 13367: Allow callout disabilitation on new record
details: /erp/devel/main/rev/72753e7c4861
changeset: 7402:72753e7c4861
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Wed May 19 11:50:42 2010 +0530
summary: Fixes Issue 13203,13221: Regularization was done more than once
details: /erp/devel/main/rev/6d330abd6826
changeset: 7403:6d330abd6826
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed May 19 13:18:08 2010 +0200
summary: fixed bug 13315: fixed message
details: /erp/devel/main/rev/7719a5d32346
changeset: 7404:7719a5d32346
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Wed May 19 17:24:09 2010 +0530
summary: 13362: api check build 393 fails
details: /erp/devel/main/rev/6a7a2295a014
changeset: 7405:6a7a2295a014
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed May 19 16:54:52 2010 +0200
summary: fixed bug 13315: fixed message when installing from obx
details: /erp/devel/main/rev/8c2ca2597470
changeset: 7406:8c2ca2597470
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu May 20 10:40:02 2010 +0200
summary: Merge stable changesets from int to main
details: /erp/devel/main/rev/a7901e097e1a
changeset: 7407:a7901e097e1a
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu May 20 10:40:03 2010 +0200
summary: Update AD_MODULE version for obx generation
diffstat:
build.xml
| 9 +-
config/Openbravo.properties.template
| 4 -
src-db/database/lib/dbsourcemanager.jar
| 0
src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml
| 30 +-
src-db/database/model/tables/AD_COLUMN.xml
| 4 +
src-db/database/model/tables/C_BANKSTATEMENTLINE.xml
| 1 +
src-db/database/model/triggers/C_INVOICELINE_TRG2.xml
| 2 +-
src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml
| 4 +-
src-db/database/model/triggers/MA_PL_IC_TRG.xml
| 4 +-
src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml
| 4 +-
src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml
| 4 +-
src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml
| 4 +-
src-db/database/model/triggers/M_INVENTORY_TRG.xml
| 3 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 9276 +++++++++-
src-db/database/sourcedata/AD_ELEMENT.xml
| 48 +-
src-db/database/sourcedata/AD_FIELD.xml
| 61 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 33 +
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_PROCESS_PARA.xml
| 37 +
src-db/database/sourcedata/AD_TABLE.xml
| 3 +-
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/PaymentGLItemCheck.class
| 0
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/PaymentGLItemCheckData.class
| 0
src-util/buildvalidation/src/org/openbravo/buildvalidation/PaymentGLItemCheck.java
| 50 +
src-util/buildvalidation/src/org/openbravo/buildvalidation/PaymentGLItemCheck_data.xsql
| 36 +
src-util/modulescript/build/classes/org/openbravo/modulescript/CreateDoctypeTemplate.class
| 0
src-util/modulescript/src/org/openbravo/modulescript/CreateDoctypeTemplate.java
| 2 +-
src-wad/build.xml
| 4 +-
src-wad/src/org/openbravo/wad/EditionFields_data.xsql
| 6 +-
src-wad/src/org/openbravo/wad/WadUtility.java
| 1 +
src-wad/src/org/openbravo/wad/controls/WADList.java
| 6 +-
src/build.xml
| 10 -
src/buildAD.xml
| 3 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java
| 67 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql
| 17 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_Project.java
| 14 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Payment_BPartner.java
| 18 +
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
| 82 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.java
| 12 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
| 20 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
| 4 +-
42 files changed, 9735 insertions(+), 156 deletions(-)
diffs (truncated from 75219 to 300 lines):
diff -r 6b25d2db763a -r a7901e097e1a build.xml
--- a/build.xml Sun May 16 21:53:44 2010 +0200
+++ b/build.xml Thu May 20 10:40:03 2010 +0200
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2010 Openbravo SLU
+* All portions are Copyright (C) 2001-2009 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -186,12 +186,6 @@
<equals arg1="${bbdd.rdbms}" arg2="POSTGRE" />
</and>
</condition>
-
- <condition property="java.security.egd" value="">
- <not>
- <isset property="${java.security.egd}" />
- </not>
- </condition>
<path id="project.class.path">
<pathelement path="${build}" />
@@ -669,7 +663,6 @@
<java classname="org.openbravo.erpCommon.modules.ApplyModuleTask"
fork="true" maxmemory="${build.maxmemory}" failonerror="true">
<arg line="'${base.src}'" />
<classpath refid="project.class.path" />
- <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
</target>
diff -r 6b25d2db763a -r a7901e097e1a config/Openbravo.properties.template
--- a/config/Openbravo.properties.template Sun May 16 21:53:44 2010 +0200
+++ b/config/Openbravo.properties.template Thu May 20 10:40:03 2010 +0200
@@ -66,10 +66,6 @@
# bbdd.password=TAD
# bbdd.sessionConfig=ALTER SESSION SET NLS_DATE_FORMAT='DD-MM-YYYY'
NLS_NUMERIC_CHARACTERS='.,'
-# Oracle instances in linux, can delay on getting DB connection (issue
#12683).
-# In these cases this property can be set to solve the problem
-# java.security.egd=file:///dev/urandom
-
bbdd.rdbms=POSTGRE
bbdd.driver=org.postgresql.Driver
bbdd.url=jdbc:postgresql://localhost:5432
diff -r 6b25d2db763a -r a7901e097e1a src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 6b25d2db763a -r a7901e097e1a
src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml
--- a/src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml Sun May 16
21:53:44 2010 +0200
+++ b/src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml Thu May 20
10:40:03 2010 +0200
@@ -48,6 +48,9 @@
v_CBankAccount_ID C_BankStatement.C_BankAccount_ID%TYPE;
v_C_BankCurrency VARCHAR2(32);
v_BS_Date DATE;
+ v_c_withholding_id C_DEBT_PAYMENT.C_Withholding_ID%TYPE;
+ v_withholdingamount C_DEBT_PAYMENT.withholdingamount%TYPE;
+ v_count NUMBER;
BEGIN
-- Update AD_PInstance
DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || p_PInstance_ID)
;
@@ -95,6 +98,12 @@
ELSIF(Cur_Parameter.ParameterName='Status') THEN
v_Status:=Cur_Parameter.p_String;
DBMS_OUTPUT.PUT_LINE(' Status='||v_Status) ;
+ ELSIF(Cur_Parameter.ParameterName='C_Withholding_ID') THEN
+ v_c_withholding_id:=Cur_Parameter.p_String;
+ DBMS_OUTPUT.PUT_LINE(' C_Withholding_ID='||v_c_withholding_id) ;
+ ELSIF(Cur_Parameter.ParameterName='WithholdingAmount') THEN
+ v_withholdingamount:=Cur_Parameter.P_Number;
+ DBMS_OUTPUT.PUT_LINE(' WithholdingAmount='||v_withholdingamount) ;
ELSE
DBMS_OUTPUT.PUT_LINE('*** Unknown Parameter=' ||
Cur_Parameter.ParameterName) ;
END IF;
@@ -112,6 +121,15 @@
C_BankStatement B
WHERE L.C_BankStatementLine_ID=v_Record_ID
AND L.C_BankStatement_ID=B.C_BankStatement_ID;
+ --Check Withholding belongs to Business Partner
+ SELECT COUNT(*)
+ INTO v_count
+ FROM C_BP_Withholding
+ WHERE C_Withholding_ID=v_c_withholding_id
+ AND C_BPartner_ID=v_C_BPartner_ID;
+ IF (v_count=0) THEN
+ RAISE_APPLICATION_ERROR(-20000, '@NOT_BP_WITHHOLDING@');
+ END IF;
--Insert Settlement
v_ResultStr:='InsertingSettlement';
v_SettlementDocType_ID:=Ad_Get_DocType(v_Client_ID, v_AD_Org_ID,
TO_CHAR('STT')) ;
@@ -154,7 +172,8 @@
PAYMENTRULE, ISPAID, AMOUNT, WRITEOFFAMT, DATEPLANNED,
ISMANUAL, ISVALID,
/*C_BANKSTATEMENTLINE_ID,*/
- CHANGESETTLEMENTCANCEL, CANCEL_PROCESSED, GENERATE_PROCESSED,
STATUS_INITIAL
+ CHANGESETTLEMENTCANCEL, CANCEL_PROCESSED, GENERATE_PROCESSED,
STATUS_INITIAL,
+ C_Withholding_ID, WithholdingAmount
)
VALUES
(
@@ -164,7 +183,8 @@
v_C_BPartner_ID, v_C_Currency_ID,
v_PaymentRule, 'N', v_Amount*(-1), 0, v_DatePlanned,
'N', 'Y',
- 'N', 'N', 'Y', v_Status
+ 'N', 'N', 'Y', v_Status,
+ v_c_withholding_id, v_withholdingamount*(-1)
)
;
Ad_Sequence_Next('C_Debt_Payment', v_Record_ID, v_debtPaymentID) ;
@@ -182,7 +202,8 @@
PAYMENTRULE, ISPAID, AMOUNT, WRITEOFFAMT,
DATEPLANNED, ISMANUAL, ISVALID,
/*C_BANKSTATEMENTLINE_ID,*/
- CHANGESETTLEMENTCANCEL, CANCEL_PROCESSED, GENERATE_PROCESSED,
STATUS_INITIAL
+ CHANGESETTLEMENTCANCEL, CANCEL_PROCESSED, GENERATE_PROCESSED,
STATUS_INITIAL,
+ C_Withholding_ID, WithholdingAmount
)
VALUES
(
@@ -193,7 +214,8 @@
v_CBankAccount_ID,
v_PaymentRule, 'N', v_Amount, 0,
v_DatePlanned, 'N', 'Y',
- 'N', 'N', 'Y', v_Status
+ 'N', 'N', 'Y', v_Status,
+ v_c_withholding_id, v_withholdingamount
)
;
C_SETTLEMENT_POST(null, v_settlementID);
diff -r 6b25d2db763a -r a7901e097e1a src-db/database/model/tables/AD_COLUMN.xml
--- a/src-db/database/model/tables/AD_COLUMN.xml Sun May 16 21:53:44
2010 +0200
+++ b/src-db/database/model/tables/AD_COLUMN.xml Thu May 20 10:40:03
2010 +0200
@@ -177,6 +177,10 @@
<default><![CDATA[Y]]></default>
<onCreateDefault><![CDATA['Y']]></onCreateDefault>
</column>
+ <column name="VALIDATEONNEW" primaryKey="false" required="true"
type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+ </column>
<foreign-key foreignTable="AD_CALLOUT" name="AD_COLUMN_AD_CALLOUT">
<reference local="AD_CALLOUT_ID" foreign="AD_CALLOUT_ID"/>
</foreign-key>
diff -r 6b25d2db763a -r a7901e097e1a
src-db/database/model/tables/C_BANKSTATEMENTLINE.xml
--- a/src-db/database/model/tables/C_BANKSTATEMENTLINE.xml Sun May 16
21:53:44 2010 +0200
+++ b/src-db/database/model/tables/C_BANKSTATEMENTLINE.xml Thu May 20
10:40:03 2010 +0200
@@ -129,5 +129,6 @@
<index-column name="C_BANKSTATEMENT_ID"/>
</index>
<check name="C_BANKSTATLN_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
+ <check name="C_BANKSTATLN_PA_GLITEM_ID_CHK"><![CDATA[((C_DEBT_PAYMENT_ID
IS NOT NULL) AND (C_GLITEM_ID IS NULL)) OR (C_DEBT_PAYMENT_ID IS
NULL)]]></check>
</table>
</database>
diff -r 6b25d2db763a -r a7901e097e1a
src-db/database/model/triggers/C_INVOICELINE_TRG2.xml
--- a/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml Sun May 16
21:53:44 2010 +0200
+++ b/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml Thu May 20
10:40:03 2010 +0200
@@ -195,7 +195,7 @@
v_newLineNetAmt:=0;
IF(v_Processed='N') THEN
-- Calculate taxes
- IF(UPDATING) THEN
+ IF(UPDATING OR DELETING) THEN
v_oldLine:= COALESCE(:old.LineNetAmt,0);
END IF;
IF (INSERTING OR UPDATING) THEN
diff -r 6b25d2db763a -r a7901e097e1a
src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml
--- a/src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml Sun May 16
21:53:44 2010 +0200
+++ b/src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml Thu May 20
10:40:03 2010 +0200
@@ -28,12 +28,12 @@
IF AD_isTriggerEnabled()='N' THEN RETURN;
END IF;
- v_New_Plan_ID:=:new.M_ProductionPlan_ID;
- v_Old_Plan_ID:=:old.M_ProductionPlan_ID;
-- Get ID
IF(UPDATING OR INSERTING) THEN
+ v_New_Plan_ID:=:new.M_ProductionPlan_ID;
SELECT mp.M_Production_ID INTO v_ID FROM M_ProductionPlan mp WHERE
mp.M_ProductionPlan_ID = v_New_Plan_ID;
ELSE
+ v_Old_Plan_ID:=:old.M_ProductionPlan_ID;
SELECT mp.M_Production_ID INTO v_ID FROM M_ProductionPlan mp WHERE
mp.M_ProductionPlan_ID = v_Old_Plan_ID;
END IF;
-- ReadOnly Check
diff -r 6b25d2db763a -r a7901e097e1a
src-db/database/model/triggers/MA_PL_IC_TRG.xml
--- a/src-db/database/model/triggers/MA_PL_IC_TRG.xml Sun May 16 21:53:44
2010 +0200
+++ b/src-db/database/model/triggers/MA_PL_IC_TRG.xml Thu May 20 10:40:03
2010 +0200
@@ -28,12 +28,12 @@
IF AD_isTriggerEnabled()='N' THEN RETURN;
END IF;
- v_New_Plan_ID:=:new.M_ProductionPlan_ID;
- v_Old_Plan_ID:=:old.M_ProductionPlan_ID;
-- Get ID
IF(UPDATING OR INSERTING) THEN
+ v_New_Plan_ID:=:new.M_ProductionPlan_ID;
SELECT mp.M_Production_ID INTO v_ID FROM M_ProductionPlan mp WHERE
mp.M_ProductionPlan_ID = v_New_Plan_ID;
ELSE
+ v_Old_Plan_ID:=:old.M_ProductionPlan_ID;
SELECT mp.M_Production_ID INTO v_ID FROM M_ProductionPlan mp WHERE
mp.M_ProductionPlan_ID = v_Old_Plan_ID;
END IF;
-- ReadOnly Check
diff -r 6b25d2db763a -r a7901e097e1a
src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml
--- a/src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml Sun May 16
21:53:44 2010 +0200
+++ b/src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml Thu May 20
10:40:03 2010 +0200
@@ -28,12 +28,12 @@
IF AD_isTriggerEnabled()='N' THEN RETURN;
END IF;
- v_New_Plan_ID:=:new.M_ProductionPlan_ID;
- v_Old_Plan_ID:=:old.M_ProductionPlan_ID;
-- Get ID
IF(UPDATING OR INSERTING) THEN
+ v_New_Plan_ID:=:new.M_ProductionPlan_ID;
SELECT mp.M_Production_ID INTO v_ID FROM M_ProductionPlan mp WHERE
mp.M_ProductionPlan_ID = v_New_Plan_ID;
ELSE
+ v_Old_Plan_ID:=:old.M_ProductionPlan_ID;
SELECT mp.M_Production_ID INTO v_ID FROM M_ProductionPlan mp WHERE
mp.M_ProductionPlan_ID = v_Old_Plan_ID;
END IF;
-- ReadOnly Check
diff -r 6b25d2db763a -r a7901e097e1a
src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml
--- a/src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml Sun May 16
21:53:44 2010 +0200
+++ b/src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml Thu May 20
10:40:03 2010 +0200
@@ -28,12 +28,12 @@
IF AD_isTriggerEnabled()='N' THEN RETURN;
END IF;
- v_New_Plan_ID:=:new.M_ProductionPlan_ID;
- v_Old_Plan_ID:=:old.M_ProductionPlan_ID;
-- Get ID
IF(UPDATING OR INSERTING) THEN
+ v_New_Plan_ID:=:new.M_ProductionPlan_ID;
SELECT mp.M_Production_ID INTO v_ID FROM M_ProductionPlan mp WHERE
mp.M_ProductionPlan_ID = v_New_Plan_ID;
ELSE
+ v_Old_Plan_ID:=:old.M_ProductionPlan_ID;
SELECT mp.M_Production_ID INTO v_ID FROM M_ProductionPlan mp WHERE
mp.M_ProductionPlan_ID = v_Old_Plan_ID;
END IF;
-- ReadOnly Check
diff -r 6b25d2db763a -r a7901e097e1a
src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml
--- a/src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml Sun May 16
21:53:44 2010 +0200
+++ b/src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml Thu May 20
10:40:03 2010 +0200
@@ -28,12 +28,12 @@
IF AD_isTriggerEnabled()='N' THEN RETURN;
END IF;
- v_New_Plan_ID:=:new.M_ProductionPlan_ID;
- v_Old_Plan_ID:=:old.M_ProductionPlan_ID;
-- Get ID
IF(UPDATING OR INSERTING) THEN
+ v_New_Plan_ID:=:new.M_ProductionPlan_ID;
SELECT mp.M_Production_ID INTO v_ID FROM M_ProductionPlan mp WHERE
mp.M_ProductionPlan_ID = v_New_Plan_ID;
ELSE
+ v_Old_Plan_ID:=:old.M_ProductionPlan_ID;
SELECT mp.M_Production_ID INTO v_ID FROM M_ProductionPlan mp WHERE
mp.M_ProductionPlan_ID = v_Old_Plan_ID;
END IF;
-- ReadOnly Check
diff -r 6b25d2db763a -r a7901e097e1a
src-db/database/model/triggers/M_INVENTORY_TRG.xml
--- a/src-db/database/model/triggers/M_INVENTORY_TRG.xml Sun May 16
21:53:44 2010 +0200
+++ b/src-db/database/model/triggers/M_INVENTORY_TRG.xml Thu May 20
10:40:03 2010 +0200
@@ -37,7 +37,8 @@
END IF;
IF UPDATING THEN
IF (:old.PROCESSED = 'Y' AND(
- (COALESCE(:old.MOVEMENTDATE, v_DateNull) <> COALESCE(:new.MOVEMENTDATE,
v_DateNull))
+ (:new.PROCESSED = 'N')
+ OR (COALESCE(:old.MOVEMENTDATE, v_DateNull) <>
COALESCE(:new.MOVEMENTDATE, v_DateNull))
OR (COALESCE(:old.AD_ORGTRX_ID, '0') <> COALESCE(:new.AD_ORGTRX_ID,
'0'))
OR (COALESCE(:old.M_WAREHOUSE_ID, '0') <> COALESCE(:new.M_WAREHOUSE_ID,
'0'))
OR(COALESCE(:old.AD_ORG_ID, '0') <> COALESCE(:new.AD_ORG_ID, '0'))
diff -r 6b25d2db763a -r a7901e097e1a src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Sun May 16 21:53:44 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu May 20 10:40:03 2010 +0200
@@ -29,6 +29,7 @@
<!--100--> <POSITION><![CDATA[1]]></POSITION>
<!--100--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--100--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--100--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--100--></AD_COLUMN>
<!--102--><AD_COLUMN>
@@ -61,6 +62,7 @@
<!--102--> <POSITION><![CDATA[9]]></POSITION>
<!--102--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--102--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--102--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--102--></AD_COLUMN>
<!--103--><AD_COLUMN>
@@ -92,6 +94,7 @@
<!--103--> <POSITION><![CDATA[10]]></POSITION>
<!--103--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--103--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--103--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--103--></AD_COLUMN>
<!--104--><AD_COLUMN>
@@ -123,6 +126,7 @@
<!--104--> <POSITION><![CDATA[11]]></POSITION>
<!--104--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
