details: https://code.openbravo.com/erp/devel/pi/rev/818c28db518e changeset: 16144:818c28db518e user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Apr 17 18:06:07 2012 +0200 summary: Fixed issue 5231 Select a correct project after selecting a business partner Select a correct project, project phase, project task after selecting a business partner
details: https://code.openbravo.com/erp/devel/pi/rev/f179cd5a8223 changeset: 16145:f179cd5a8223 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Fri Apr 20 12:16:11 2012 +0200 summary: Fixed issue 15539 Delete not necessary lines in C_INVOICE_POST details: https://code.openbravo.com/erp/devel/pi/rev/3af549246975 changeset: 16146:3af549246975 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Apr 17 14:03:55 2012 +0200 summary: Fixed issue 20025 Change the default value in C_BPartner_Discount details: https://code.openbravo.com/erp/devel/pi/rev/a5e16ddab191 changeset: 16147:a5e16ddab191 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Apr 18 13:59:31 2012 +0200 summary: Fixed issue 20298 Change display logic in Project Phase and Project Task Change display logic in Project Phase and Project Task in Expense Sheet lines, because now this combos have a wrong behaviour. details: https://code.openbravo.com/erp/devel/pi/rev/7a22ad895103 changeset: 16148:7a22ad895103 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Fri Apr 20 14:30:02 2012 +0200 summary: Related to issue 5231: code review details: https://code.openbravo.com/erp/devel/pi/rev/33a11a6caf22 changeset: 16149:33a11a6caf22 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Fri Apr 20 14:33:11 2012 +0200 summary: Related to issue 15836: code review. details: https://code.openbravo.com/erp/devel/pi/rev/5982a9759592 changeset: 16150:5982a9759592 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Fri Apr 20 15:32:46 2012 +0200 summary: Fix OrganizationCombo_data.xsql file license text diffstat: src-db/database/model/functions/C_INVOICE_POST.xml | 7 --- src-db/database/model/functions/C_LOCATION_DESCRIPTION.xml | 20 +++------- src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_FIELD.xml | 4 +- src/org/openbravo/erpCommon/ad_callouts/SE_Expense_BP_Project.java | 8 +-- src/org/openbravo/erpCommon/ad_combos/OrganizationCombo_data.xsql | 4 +- 6 files changed, 14 insertions(+), 31 deletions(-) diffs (145 lines): diff -r 819c15be77d9 -r 5982a9759592 src-db/database/model/functions/C_INVOICE_POST.xml --- a/src-db/database/model/functions/C_INVOICE_POST.xml Fri Mar 23 11:12:07 2012 +0100 +++ b/src-db/database/model/functions/C_INVOICE_POST.xml Fri Apr 20 15:32:46 2012 +0200 @@ -1217,7 +1217,6 @@ Cur_MultiTax RECORD; xTaxBaseAmt NUMBER:=0; xTaxAmt NUMBER:=0; - v_TaxNoRecalculable NUMBER:=0; v_PreviousTaxAmt NUMBER:=0; HeaderNotAdded BOOLEAN:=TRUE; v_LineNo NUMBER:=0; @@ -1258,17 +1257,11 @@ C_INVOICELINETAX_INSERT(v_Org_ID, v_Record_ID, Cur_Tax.C_InvoiceLine_ID, v_UpdatedBy, Cur_Tax.C_Tax_ID, Cur_Tax.C_Tax_ID, Cur_Tax.LineNetAmt, Cur_Tax.TaxBaseAmt, Cur_Tax.StdPrecision); END LOOP; -- Insert New Taxes -- Update Header - SELECT COALESCE(SUM(TaxAmt),0) INTO v_TaxNoRecalculable - FROM C_INVOICETAX - WHERE C_Invoice_ID = v_Record_ID - AND Recalculate = 'N'; IF (v_IsSOTrx = 'N') THEN SELECT c_getwithholding(v_record_id) INTO withholdamount FROM dual; ELSE withholdamount:=0; END IF; - - v_GrandTotal:=C_Currency_Round(v_GrandTotal+v_TaxNoRecalculable, v_Currency_ID, NULL) ; SELECT COALESCE(SUM(TAXAMT), 0) INTO v_GrandTotal FROM C_INVOICETAX WHERE C_INVOICE_ID = v_Record_ID; diff -r 819c15be77d9 -r 5982a9759592 src-db/database/model/functions/C_LOCATION_DESCRIPTION.xml --- a/src-db/database/model/functions/C_LOCATION_DESCRIPTION.xml Fri Mar 23 11:12:07 2012 +0100 +++ b/src-db/database/model/functions/C_LOCATION_DESCRIPTION.xml Fri Apr 20 15:32:46 2012 +0200 @@ -36,15 +36,10 @@ ) || ( CASE WHEN COALESCE(TO_CHAR(L.POSTAL), TO_CHAR(L.CITY), TO_CHAR(R.NAME)) IS NULL THEN '' - ELSE CHR(10) || ( - CASE - WHEN L.POSTAL IS NULL THEN '' - ELSE TO_CHAR(L.POSTAL) - END - ) || ( + ELSE CHR(10) || COALESCE(TO_CHAR(L.POSTAL), '') + || ( CASE - WHEN L.POSTAL IS NULL THEN '' - WHEN L.CITY IS NULL AND R.NAME IS NULL THEN '' + WHEN (L.POSTAL IS NULL) OR (L.CITY IS NULL AND R.NAME IS NULL) THEN '' ELSE ' - ' END ) || ( @@ -54,13 +49,10 @@ END ) || ( CASE - WHEN L.CITY IS NULL THEN '' - ELSE ' ' - END - ) || ( - CASE WHEN R.NAME IS NULL THEN '' - ELSE '('||TO_CHAR(R.NAME) || ')' + ELSE (CASE WHEN L.CITY IS NOT NULL THEN ' ('||TO_CHAR(R.NAME) || ')' + ELSE '('||TO_CHAR(R.NAME) || ')' + END) END ) END diff -r 819c15be77d9 -r 5982a9759592 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Mar 23 11:12:07 2012 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Apr 20 15:32:46 2012 +0200 @@ -140585,7 +140585,7 @@ <!--800805--> <AD_TABLE_ID><![CDATA[800046]]></AD_TABLE_ID> <!--800805--> <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID> <!--800805--> <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH> -<!--800805--> <DEFAULTVALUE><![CDATA[@SQL=SELECT COALESCE(MAX(LINE),0)+10 AS DefaultValue FROM C_BPARTNER_DISCOUNT WHERE C_BPARTNER_DISCOUNT_ID=@C_BPARTNER_DISCOUNT_ID@]]></DEFAULTVALUE> +<!--800805--> <DEFAULTVALUE><![CDATA[@SQL=SELECT COALESCE(MAX(LINE),0)+10 AS DefaultValue FROM C_BPARTNER_DISCOUNT WHERE C_BPARTNER_ID=@C_BPARTNER_ID@]]></DEFAULTVALUE> <!--800805--> <ISKEY><![CDATA[N]]></ISKEY> <!--800805--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--800805--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> diff -r 819c15be77d9 -r 5982a9759592 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Fri Mar 23 11:12:07 2012 +0100 +++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Apr 20 15:32:46 2012 +0200 @@ -76442,7 +76442,7 @@ <!--6575--> <AD_TAB_ID><![CDATA[413]]></AD_TAB_ID> <!--6575--> <AD_COLUMN_ID><![CDATA[8842]]></AD_COLUMN_ID> <!--6575--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--6575--> <DISPLAYLOGIC><![CDATA[@C_Project_ID@!'' | @C_Project_ID@!0]]></DISPLAYLOGIC> +<!--6575--> <DISPLAYLOGIC><![CDATA[@C_Project_ID@!'' ]]></DISPLAYLOGIC> <!--6575--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH> <!--6575--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--6575--> <SEQNO><![CDATA[140]]></SEQNO> @@ -76497,7 +76497,7 @@ <!--6577--> <AD_TAB_ID><![CDATA[413]]></AD_TAB_ID> <!--6577--> <AD_COLUMN_ID><![CDATA[8843]]></AD_COLUMN_ID> <!--6577--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--6577--> <DISPLAYLOGIC><![CDATA[@C_ProjectPhase_ID@!'' | @C_ProjectPhase_ID@!0]]></DISPLAYLOGIC> +<!--6577--> <DISPLAYLOGIC><![CDATA[@C_ProjectPhase_ID@!'' ]]></DISPLAYLOGIC> <!--6577--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH> <!--6577--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--6577--> <SEQNO><![CDATA[150]]></SEQNO> diff -r 819c15be77d9 -r 5982a9759592 src/org/openbravo/erpCommon/ad_callouts/SE_Expense_BP_Project.java --- a/src/org/openbravo/erpCommon/ad_callouts/SE_Expense_BP_Project.java Fri Mar 23 11:12:07 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Expense_BP_Project.java Fri Apr 20 15:32:46 2012 +0200 @@ -11,7 +11,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) 2008-2010 Openbravo SLU + * All portions are Copyright (C) 2008-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -111,14 +111,12 @@ // business partner (if any). strReset = "1"; strProject = SEExpenseBPProjectData.selectProjectId(this, strBPartnerId); - if (strProject != null && !strProject.equals("")) { - strProjectId = strProject; - } + resultado.append("new Array(\"inpcProjectId\", \"" + strProject + "\"),\n"); } if (strReset.equals("1")) { // Reset Project Phase and Project Task fields resultado.append("new Array(\"inpcProjectphaseId\", \"\"),\n"); - resultado.append("new Array(\"inpcProjecttaskId\", \"\"),\n"); + resultado.append("new Array(\"inpcProjecttaskId\", \"\")\n"); } } } diff -r 819c15be77d9 -r 5982a9759592 src/org/openbravo/erpCommon/ad_combos/OrganizationCombo_data.xsql --- a/src/org/openbravo/erpCommon/ad_combos/OrganizationCombo_data.xsql Fri Mar 23 11:12:07 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_combos/OrganizationCombo_data.xsql Fri Apr 20 15:32:46 2012 +0200 @@ -12,9 +12,9 @@ * 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-2012 Openbravo SLU * All Rights Reserved. - * Contributor(s): ______________________________________. AND (LPAD(TO_CHAR(R.USERLEVEL), 1, '1')='S' OR A_R_O.AD_ORG_ID <> '0') + * Contributor(s): ______________________________________. ************************************************************************ --> ------------------------------------------------------------------------------ For Developers, A Lot Can Happen In A Second. Boundary is the first to Know...and Tell You. Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! http://p.sf.net/sfu/Boundary-d2dvs2 _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
