details: https://code.openbravo.com/erp/devel/pi/rev/04c54d425498
changeset: 18502:04c54d425498
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Thu Nov 08 11:29:24 2012 +0100
summary: Fixed issue 22232 Journal Entries lines are not duplicated
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java |
28 ++++++---
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql |
3 +
2 files changed, 21 insertions(+), 10 deletions(-)
diffs (105 lines):
diff -r 842c35bdcc07 -r 04c54d425498
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
Wed Nov 07 18:50:29 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
Thu Nov 08 11:29:24 2012 +0100
@@ -26,6 +26,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.TreeSet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -343,8 +344,10 @@
} else if (vars.commandIn("DOC")) {
String org = vars.getStringParameter("inpOrg");
String accSchema = vars.getStringParameter("inpcAcctSchemaId");
- List<DocumentType> doctype = getDocuments(org, accSchema);
- String combobox = getJSONComboBox(doctype, null, false);
+ String strDocument = vars.getRequestGlobalVariable("inpDocument",
+ "ReportGeneralLedgerJournal|Document");
+ Set<String> docbasetypes = getDocuments(org, accSchema);
+ String combobox = getJSONComboBox(docbasetypes, strDocument, false,
vars);
response.setContentType("text/html; charset=UTF-8");
PrintWriter out = response.getWriter();
@@ -721,8 +724,8 @@
return strCheck;
}
- private <T extends BaseOBObject> String getJSONComboBox(List<T> obObjectList,
- String selectedValue, boolean isMandatory) {
+ private <T extends BaseOBObject> String getJSONComboBox(Set<String>
docbseTypes,
+ String selectedValue, boolean isMandatory, VariablesSecureApp vars) {
JSONObject json = new JSONObject();
JSONArray select = new JSONArray();
@@ -737,11 +740,11 @@
select.put(i, attr);
i++;
}
- for (T ob : obObjectList) {
+ for (String dbt : docbseTypes) {
attr = new HashMap<String, String>();
- attr.put("value", ob.getId().toString());
- attr.put("selected", (ob.getId().equals(selectedValue)) ? "true" :
"false");
- attr.put("text", ob.getIdentifier());
+ attr.put("value", dbt);
+ attr.put("selected", (dbt.equals(selectedValue)) ? "true" : "false");
+ attr.put("text", Utility.getListValueName("C_DocType DocBaseType",
dbt, vars.getLanguage()));
select.put(i, attr);
json.put("optionlist", select);
i++;
@@ -755,7 +758,7 @@
return json.toString();
}
- public static List<DocumentType> getDocuments(String org, String accSchema) {
+ public static Set<String> getDocuments(String org, String accSchema) {
final StringBuilder whereClause = new StringBuilder();
final List<Object> parameters = new ArrayList<Object>();
@@ -783,11 +786,16 @@
whereClause.append(" in (" + Utility.getInStrSet(orgStrct) + ")");
whereClause.append(" and ca." + AcctSchemaTable.PROPERTY_ORGANIZATION +
".id");
whereClause.append(" in (" + Utility.getInStrSet(orgStrct) + ")");
+ whereClause.append(" order by cd." +
DocumentType.PROPERTY_DOCUMENTCATEGORY);
final OBQuery<DocumentType> obqDt =
OBDal.getInstance().createQuery(DocumentType.class,
whereClause.toString());
obqDt.setParameters(parameters);
obqDt.setFilterOnReadableOrganization(false);
- return obqDt.list();
+ TreeSet<String> docBaseTypes = new TreeSet<String>();
+ for (DocumentType doc : obqDt.list()) {
+ docBaseTypes.add(doc.getDocumentCategory());
+ }
+ return docBaseTypes;
} finally {
OBContext.restorePreviousMode();
diff -r 842c35bdcc07 -r 04c54d425498
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
---
a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
Wed Nov 07 18:50:29 2012 +0100
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
Thu Nov 08 11:29:24 2012 +0100
@@ -50,6 +50,7 @@
HAVING (sum(F.AMTACCTDR) <> 0 OR sum(F.AMTACCTCR) <> 0)) AA,
AD_REF_LIST_V AR
WHERE AR.VALUE=AA.DOCBASETYPE
+ AND AR.AD_REFERENCE_ID = '183'
AND AD_LANGUAGE=?
ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, ORD, SEQNO
]]></Sql>
@@ -175,6 +176,7 @@
HAVING (sum(F.AMTACCTDR) <> 0 OR sum(F.AMTACCTCR) <> 0)) AA,
AD_REF_LIST_V AR
WHERE AR.VALUE=AA.DOCBASETYPE
+ AND AR.AD_REFERENCE_ID = '183'
AND AD_LANGUAGE=?
ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, ORD, SEQNO
]]></Sql>
@@ -239,6 +241,7 @@
HAVING (sum(F.AMTACCTDR) <> 0 OR sum(F.AMTACCTCR) <> 0)) AA,
AD_REF_LIST_V AR
WHERE AR.VALUE=AA.DOCBASETYPE
+ AND AR.AD_REFERENCE_ID = '183'
AND AD_LANGUAGE=?
ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, ORD, SEQNO
]]></Sql>
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_nov
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
