details:   /erp/devel/pi/rev/4500c5669307
changeset: 7393: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/pi/rev/6d4eddcb94f5
changeset: 7394: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/pi/rev/831f035b0622
changeset: 7395:831f035b0622
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Tue May 18 10:47:14 2010 +0200
summary:   merge

diffstat:

 .hgsigs                                                                     |  
  4 +
 .hgtags                                                                     |  
  4 +
 build.xml                                                                   |  
 10 +-
 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/functions/C_INVOICE_CREATE.xml                        |  
 13 +-
 src-db/database/model/functions/C_PAYMENTDUEDATE.xml                        |  
  2 +-
 src-db/database/model/tables/C_BANKSTATEMENTLINE.xml                        |  
  1 +
 src-db/database/model/tables/FIN_PAYMENT_DETAIL.xml                         |  
  2 +-
 src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml                 |  
  2 +-
 src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml           |  
  2 +-
 src-db/database/model/triggers/C_INVOICELINE_TRG2.xml                       |  
  2 +-
 src-db/database/model/triggers/C_INVOICELINE_TRG3.xml                       |  
  3 +-
 src-db/database/model/triggers/C_INVOICETAX_TRG2.xml                        |  
  3 +-
 src-db/database/model/triggers/C_TAXREGISTERLINE_TRG.xml                    |  
  3 +-
 src-db/database/model/triggers/C_TAXREGISTER_TRG.xml                        |  
  3 +-
 src-db/database/model/triggers/M_INOUTLINE_TRG.xml                          |  
 11 +
 src-db/database/model/triggers/M_INVENTORY_TRG.xml                          |  
  3 +-
 src-db/database/sourcedata/AD_COLUMN.xml                                    |  
 12 +-
 src-db/database/sourcedata/AD_ELEMENT.xml                                   |  
 29 +-
 src-db/database/sourcedata/AD_FIELD.xml                                     |  
 18 +-
 src-db/database/sourcedata/AD_MESSAGE.xml                                   |  
 24 +-
 src-db/database/sourcedata/AD_MODULE.xml                                    |  
  2 +-
 src-db/database/sourcedata/AD_PROCESS_PARA.xml                              |  
 37 +
 src-db/database/sourcedata/AD_REF_LIST.xml                                  |  
 12 -
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml                            |  
132 ++++
 src-test/org/openbravo/test/dal/IssuesTest.java                             |  
 37 +
 src-test/org/openbravo/test/dal/OBContextTest.java                          |  
 30 +-
 src-test/org/openbravo/test/dal/test_13281.xml                              |  
 75 ++
 src-wad/build.xml                                                           |  
  4 +-
 src/build.xml                                                               |  
 30 +-
 src/buildAD.xml                                                             |  
  3 +-
 src/org/openbravo/base/secureApp/LoginUtils.java                            |  
  2 +-
 src/org/openbravo/dal/core/DalUtil.java                                     |  
 20 +
 src/org/openbravo/dal/core/OBContext.java                                   |  
 67 ++-
 src/org/openbravo/dal/xml/XMLEntityConverter.java                           |  
271 +++++----
 src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.java         |  
  4 +-
 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_callouts/SL_WorkRequirement_Conversion.java  |  
  2 +-
 src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java                  |  
 59 +-
 src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html  |  
  2 +-
 src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java                |  
  7 +-
 src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.html               |  
 20 +-
 src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.java               |  
 18 +-
 src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.jrxml              |  
156 +++-
 src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.xml                |  
  8 +
 src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_BankAcc.jrxml      |  
126 +++-
 src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_NoBP.jrxml         |  
126 +++-
 src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_NoBP_BankAcc.jrxml |  
128 +++-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java             |  
 16 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java              |  
  4 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceExcel.jrxml        |  
 31 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml          |  
 49 +-
 src/org/openbravo/erpCommon/info/Account.java                               |  
  6 +-
 src/org/openbravo/erpCommon/modules/ImportModule.java                       |  
  6 +-
 src/org/openbravo/erpCommon/obps/ActivationKey.java                         |  
  3 +
 src/org/openbravo/erpCommon/utility/ReferencedLink.java                     |  
 38 +-
 src/org/openbravo/erpCommon/utility/UsedByLink.java                         |  
 10 +
 src/org/openbravo/scheduling/OBScheduler.java                               |  
 21 +-
 src/org/openbravo/scheduling/Trigger_data.xsql                              |  
 23 +-
 src/org/openbravo/service/system/ModuleValidator.java                       |  
  2 +-
 64 files changed, 1325 insertions(+), 481 deletions(-)

diffs (truncated from 4040 to 300 lines):

diff -r 00afb0f636b4 -r 831f035b0622 .hgsigs
--- a/.hgsigs   Sun May 09 23:59:17 2010 +0200
+++ b/.hgsigs   Tue May 18 10:47:14 2010 +0200
@@ -14,3 +14,7 @@
 4a5dd51c34fbbf64e9f933f9b7d54589ef5fb7b9 0 
iEYEABECAAYFAkuM+1EACgkQCX/oGf+2qkPHfgCdFKV1PxtXcckQ3R3+kJgXnRFAtgkAoM6eWuR1ZA3nRphHH7sX2SGoufA5
 75b887d57378e59138c0362b928a504db568ed9b 0 
iEYEABECAAYFAkuSHAsACgkQCX/oGf+2qkOEpwCeM6aKuQ/VK5ywylW5Jiki2L5YX0UAoPtzt8ELfu+2n0hTB2E36NgVq1IU
 8df12cedf6a200183c73497ae0cefa3fee0a0427 0 
iEYEABECAAYFAkuzHu4ACgkQCX/oGf+2qkNkzwCeJC2mfV4HG3jDDH4B9ovaplpzyWwAoOQY9wuMO2XNnVJ9xw7JS+Qjy52k
+5c7276ed55f2605be4e0163a90820437ae51b35a 0 
iEYEABECAAYFAkvoPD0ACgkQCX/oGf+2qkPJwwCgvsSfRbgj8XvBTAe0D98MuzYC9X0AnR61u2gYKK5GgGlgo6B6S7dfDCUr
+a56977f8bc9c70b88f49eccc4e05d4703926df8b 0 
iEYEABECAAYFAkvpHhQACgkQCX/oGf+2qkNE2gCfRUvL9gvk0xEg6OjMlTbJbplKpNkAnAz8f8WZ4NY9NFmiefa6afLiiyIG
+8594549ee5becd6e51d6a295a6b473c42bacbbb9 0 
iEYEABECAAYFAkvq4o4ACgkQCX/oGf+2qkPvLACfdPEl+S1cRY59u90LiQRmROPIL8cAniZtSjiAg13GifqOFZCZZ+zilCep
+9f343a616b2f998c3867661467de5dd9daeb7112 0 
iEYEABECAAYFAkvq7PIACgkQCX/oGf+2qkMcHQCg3eHGql848ExhA5oOgtqfjIE3toUAn0GiWHkItn3YxPFitn8+e0IfOEaj
diff -r 00afb0f636b4 -r 831f035b0622 .hgtags
--- a/.hgtags   Sun May 09 23:59:17 2010 +0200
+++ b/.hgtags   Tue May 18 10:47:14 2010 +0200
@@ -24,3 +24,7 @@
 1a6428c78a5521471084e7b93a42a03a74543495 2.50MP12
 65aa17bbe739f7d3370aba319e68474c2356fdf2 2.50MP13
 17a70403b6d39988147a0b8a11bb3a57ed04c373 2.50MP14
+66ff592fb792f3bc13a076db81cd1f5729f1b881 2.50MP15
+30fd49cdc1b1a5d3ff7233f2569e8afb8d0523f3 2.50MP16
+8a6462c8520ce811b77ee562c87387a7f0663d39 2.50MP16
+41915c2f5ec639dadab8e797a1e5f1e0922fa029 2.50MP17
diff -r 00afb0f636b4 -r 831f035b0622 build.xml
--- a/build.xml Sun May 09 23:59:17 2010 +0200
+++ b/build.xml Tue May 18 10:47:14 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):  ______________________________________.
 ************************************************************************
@@ -68,7 +68,6 @@
   <property name="base.src.trl" location="src-trl" />
   <property name="base.src.wad" location="src-wad" />
   <property name="base.src.gen" location="src-gen" />
-  <property name="base.src.test" location="src-test" />
   <property name="base.client.src" location="srcClient" />
   <property name="base.db" location="src-db/database" />
   <property name="base.web" location="web" />
@@ -187,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}" />
@@ -670,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 00afb0f636b4 -r 831f035b0622 config/Openbravo.properties.template
--- a/config/Openbravo.properties.template      Sun May 09 23:59:17 2010 +0200
+++ b/config/Openbravo.properties.template      Tue May 18 10:47:14 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 00afb0f636b4 -r 831f035b0622 src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 00afb0f636b4 -r 831f035b0622 
src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml
--- a/src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml Sun May 09 
23:59:17 2010 +0200
+++ b/src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml Tue May 18 
10:47:14 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 00afb0f636b4 -r 831f035b0622 
src-db/database/model/functions/C_INVOICE_CREATE.xml
--- a/src-db/database/model/functions/C_INVOICE_CREATE.xml      Sun May 09 
23:59:17 2010 +0200
+++ b/src-db/database/model/functions/C_INVOICE_CREATE.xml      Tue May 18 
10:47:14 2010 +0200
@@ -378,6 +378,7 @@
               */
               -- Get Order DocType Info - approved from Invoice DocType
               BEGIN
+              v_DocType_ID:=NULL;
               v_ResultStr:='GetDocTypeInfo - ' || Cur_Order.C_DocType_ID;  
SELECT od.C_DocTypeInvoice_ID,
                 od.DocSubTypeSO
               INTO v_DocType_ID,
@@ -389,8 +390,11 @@
                 AND ID.IsActive='Y';
               EXCEPTION
               WHEN OTHERS THEN
+                v_DocType_ID:=NULL;
+              END;
+              IF (v_DocType_ID IS NULL) THEN
                 RAISE_APPLICATION_ERROR(-20000, '@NoDocumentTypeFound@') ;
-              END;
+              END IF;
               --
               Ad_Sequence_Next('C_Invoice', Cur_Order.AD_Client_ID, 
p_Invoice_ID) ;
               Ad_Sequence_Doctype(v_DocType_ID, Cur_Order.AD_Client_ID, 'Y', 
v_DocumentNo) ;
@@ -902,6 +906,7 @@
                   END;
                 ELSE
                   BEGIN
+                  v_DocType_ID:=NULL;
                   SELECT od.C_DocTypeInvoice_ID
                   INTO v_DocType_ID
                   FROM C_DOCTYPE od,
@@ -913,8 +918,12 @@
                     AND ID.IsActive='Y';
                   EXCEPTION
                   WHEN OTHERS THEN
+                    v_DocType_ID:=NULL;
+                  END;
+                  IF (v_DocType_ID IS NULL) THEN
                     RAISE_APPLICATION_ERROR(-20000, '@NoDocumentTypeFound@') ;
-                  END;
+                  END IF;
+
                 END IF;
                 IF(NOT FINISH_PROCESS) THEN
                   -- Get other defaults
diff -r 00afb0f636b4 -r 831f035b0622 
src-db/database/model/functions/C_PAYMENTDUEDATE.xml
--- a/src-db/database/model/functions/C_PAYMENTDUEDATE.xml      Sun May 09 
23:59:17 2010 +0200
+++ b/src-db/database/model/functions/C_PAYMENTDUEDATE.xml      Tue May 18 
10:47:14 2010 +0200
@@ -99,7 +99,7 @@
     v_DueDate := C_Datedayinmonth(v_FixMonthDay, TO_DATE(v_docDate)) ;
   ELSE
     v_DueDate := TRUNC(p_DocDate) + COALESCE(p_netDays, 0) ;
-    v_DueDate := ADD_MONTHS(v_DueDate, COALESCE(p_fixMonthOffset, 0)) ;
+    v_DueDate := C_ADD_MONTHS2(v_DueDate, COALESCE(p_fixMonthOffset, 0)) ;
     WHILE(TO_CHAR(v_DueDate, 'D') NOT LIKE p_netDay)
     LOOP
       v_DueDate := v_DueDate + 1;
diff -r 00afb0f636b4 -r 831f035b0622 
src-db/database/model/tables/C_BANKSTATEMENTLINE.xml
--- a/src-db/database/model/tables/C_BANKSTATEMENTLINE.xml      Sun May 09 
23:59:17 2010 +0200
+++ b/src-db/database/model/tables/C_BANKSTATEMENTLINE.xml      Tue May 18 
10:47:14 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 00afb0f636b4 -r 831f035b0622 
src-db/database/model/tables/FIN_PAYMENT_DETAIL.xml
--- a/src-db/database/model/tables/FIN_PAYMENT_DETAIL.xml       Sun May 09 
23:59:17 2010 +0200
+++ b/src-db/database/model/tables/FIN_PAYMENT_DETAIL.xml       Tue May 18 
10:47:14 2010 +0200
@@ -46,7 +46,7 @@
         <onCreateDefault/>
       </column>
       <column name="WRITEOFFAMT" primaryKey="false" required="false" 
type="DECIMAL" autoIncrement="false">
-        <default/>
+        <default><![CDATA[0]]></default>
         <onCreateDefault/>
       </column>
       <column name="C_GLITEM_ID" primaryKey="false" required="false" 
type="VARCHAR" size="32" autoIncrement="false">
diff -r 00afb0f636b4 -r 831f035b0622 
src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml
--- a/src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml       Sun May 
09 23:59:17 2010 +0200
+++ b/src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml       Tue May 
18 10:47:14 2010 +0200
@@ -50,7 +50,7 @@
         <onCreateDefault/>
       </column>
       <column name="WRITEOFFAMT" primaryKey="false" required="false" 
type="DECIMAL" autoIncrement="false">
-        <default/>
+        <default><![CDATA[0]]></default>
         <onCreateDefault/>
       </column>
       <foreign-key foreignTable="AD_CLIENT" 
name="FIN_AD_CLIENT_SCHEDULEDETAIL">
diff -r 00afb0f636b4 -r 831f035b0622 
src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml
--- a/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml Sun May 
09 23:59:17 2010 +0200
+++ b/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml Tue May 
18 10:47:14 2010 +0200
@@ -80,7 +80,7 @@
     :NEW.LineNetAmt:=ROUND(:NEW.LineNetAmt, v_Prec) ;
     :NEW.ChargeAmt:=ROUND(:NEW.ChargeAmt, v_Prec) ;
 
-    IF (ROUND(TO_NUMBER(:NEW.QTYINVOICED) * 
TO_NUMBER(:NEW.PRICEACTUAL),v_Prec)!=TO_NUMBER(:NEW.LINENETAMT)) THEN
+    IF (:NEW.ISEDITLINENETAMT='Y' AND ROUND(TO_NUMBER(:NEW.QTYINVOICED) * 
TO_NUMBER(:NEW.PRICEACTUAL),v_Prec)!=TO_NUMBER(:NEW.LINENETAMT)) THEN
       RAISE_APPLICATION_ERROR(-20000, '@LineAmountNotCorrect@') ;
     END IF;
   END IF;
diff -r 00afb0f636b4 -r 831f035b0622 
src-db/database/model/triggers/C_INVOICELINE_TRG2.xml
--- a/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml     Sun May 09 
23:59:17 2010 +0200
+++ b/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml     Tue May 18 
10:47:14 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 00afb0f636b4 -r 831f035b0622 
src-db/database/model/triggers/C_INVOICELINE_TRG3.xml
--- a/src-db/database/model/triggers/C_INVOICELINE_TRG3.xml     Sun May 09 
23:59:17 2010 +0200
+++ b/src-db/database/model/triggers/C_INVOICELINE_TRG3.xml     Tue May 18 
10:47:14 2010 +0200
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
   <database name="TRIGGER C_INVOICELINE_TRG3">
     <trigger name="C_INVOICELINE_TRG3" table="C_INVOICELINE" fires="after" 
insert="true" update="true" delete="true" foreach="row">
-      
<body><![CDATA[/*************************************************************************
+      <body><![CDATA[
+/*************************************************************************
 * The contents of this file are subject to the Openbravo  Public  License
 * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
 * Version 1.1  with a permitted attribution clause; you may not  use this
diff -r 00afb0f636b4 -r 831f035b0622 
src-db/database/model/triggers/C_INVOICETAX_TRG2.xml
--- a/src-db/database/model/triggers/C_INVOICETAX_TRG2.xml      Sun May 09 
23:59:17 2010 +0200
+++ b/src-db/database/model/triggers/C_INVOICETAX_TRG2.xml      Tue May 18 
10:47:14 2010 +0200
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
   <database name="TRIGGER C_INVOICETAX_TRG2">
     <trigger name="C_INVOICETAX_TRG2" table="C_INVOICETAX" fires="after" 
insert="true" update="true" delete="true" foreach="row">
-      
<body><![CDATA[/*************************************************************************
+      <body><![CDATA[
+/*************************************************************************

------------------------------------------------------------------------------

_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to