details: /erp/devel/main/rev/3b6e4f163a47
changeset: 8845:3b6e4f163a47
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Tue Nov 09 17:09:29 2010 +0530
summary: Fixes issue 14946: Possible to delete manage requisition line when
manage requisition is completed
Condition has been added that will not allow lines to be deleted if document
status is completed
details: /erp/devel/main/rev/755f20f544d1
changeset: 8846:755f20f544d1
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Tue Nov 09 17:13:02 2010 +0530
summary: Fixes Issue 14889: Organization filter does not work properly in
general ledger report
details: /erp/devel/main/rev/98bebb8e5927
changeset: 8847:98bebb8e5927
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Nov 09 19:38:24 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml | 4 ++++
src-db/database/sourcedata/AD_MODULE.xml | 4 ++--
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html | 8 ++------
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 3 +++
4 files changed, 11 insertions(+), 8 deletions(-)
diffs (87 lines):
diff -r 38bc1ad2e842 -r 98bebb8e5927
src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml
--- a/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml Tue Nov 09
12:32:11 2010 +0530
+++ b/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml Tue Nov 09
19:38:24 2010 +0000
@@ -46,6 +46,10 @@
IF (v_DocStatus = 'CO' AND INSERTING) THEN
RAISE_APPLICATION_ERROR(-20525, 'It is not possible insert a new line in a
completed requisition');
END IF;
+
+ IF (v_DocStatus = 'CO' AND DELETING) THEN
+ RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted');
+ END IF;
IF (v_ReqStatus = 'P') THEN
RAISE_APPLICATION_ERROR(-20526, 'It is not possible to modify planned
requisition lines');
diff -r 38bc1ad2e842 -r 98bebb8e5927 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Tue Nov 09 12:32:11 2010 +0530
+++ b/src-db/database/sourcedata/AD_MODULE.xml Tue Nov 09 19:38:24 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[Core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.18840]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18846]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r 38bc1ad2e842 -r 98bebb8e5927
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html Tue Nov
09 12:32:11 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html Tue Nov
09 19:38:24 2010 +0000
@@ -74,11 +74,7 @@
setWindowElementFocus(frm.inpDateTo);
showJSMessage(7);
return false;
- }else if (inputValue(frm.inpOrg)==null || inputValue(frm.inpOrg)=="") {
- setWindowElementFocus(frm.inpOrg);
- showJSMessage(7);
- return false;
- } else if (frm.inpcAcctSchemaId.value == null ||
frm.inpcAcctSchemaId.value == ""){
+ }else if (frm.inpcAcctSchemaId.value == null || frm.inpcAcctSchemaId.value
== ""){
setWindowElementFocus(frm.inpcAcctSchemaId);
showJSMessage(7);
return false;
@@ -354,7 +350,7 @@
</tr>
<tr>
<td class="TitleCell"><span
class="LabelText">Organization</span></td>
- <td class="Combo_ContentCell" colspan="2"> <select name="inpOrg"
id="inpOrg" class="ComboKey Combo_TwoCells_width">
+ <td class="Combo_ContentCell" colspan="2"> <select name="inpOrg"
id="inpOrg" class="Combo Combo_TwoCells_width">
<option value=""> <div id="reportAD_ORGID"></div></option>
</select>
</td>
diff -r 38bc1ad2e842 -r 98bebb8e5927
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Tue Nov
09 12:32:11 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Tue Nov
09 19:38:24 2010 +0000
@@ -77,6 +77,7 @@
strcelementvaluetodes = (strcelementvaluetodes.equals("null")) ? "" :
strcelementvaluetodes;
vars.setSessionValue("inpElementValueIdFrom_DES",
strcelementvaluefromdes);
vars.setSessionValue("inpElementValueIdTo_DES", strcelementvaluetodes);
+ vars.removeSessionValue("ReportGeneralLedger|Org");
String strOrg = vars.getGlobalVariable("inpOrg",
"ReportGeneralLedger|Org", "0");
String strcBpartnerId = vars.getInGlobalVariable("inpcBPartnerId_IN",
"ReportGeneralLedger|cBpartnerId", "", IsIDFilter.instance);
@@ -114,6 +115,7 @@
strcelementvalueto);
vars.setSessionValue("inpElementValueIdFrom_DES",
strcelementvaluefromdes);
vars.setSessionValue("inpElementValueIdTo_DES", strcelementvaluetodes);
+ vars.removeSessionValue("ReportGeneralLedger|Org");
String strOrg = vars.getGlobalVariable("inpOrg",
"ReportGeneralLedger|Org", "0");
String strcBpartnerId =
vars.getRequestInGlobalVariable("inpcBPartnerId_IN",
"ReportGeneralLedger|cBpartnerId", IsIDFilter.instance);
@@ -179,6 +181,7 @@
"ReportGeneralLedger|C_ElementValue_IDFROM");
String strcelementvalueto =
vars.getRequestGlobalVariable("inpcElementValueIdTo",
"ReportGeneralLedger|C_ElementValue_IDTO");
+ vars.removeSessionValue("ReportGeneralLedger|Org");
String strOrg = vars.getGlobalVariable("inpOrg",
"ReportGeneralLedger|Org", "0");
String strcBpartnerId =
vars.getRequestInGlobalVariable("inpcBPartnerId_IN",
"ReportGeneralLedger|cBpartnerId", IsIDFilter.instance);
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
