details: https://code.openbravo.com/erp/devel/pi/rev/af7c14e31dff
changeset: 35600:af7c14e31dff
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Mar 28 22:31:55 2019 +0100
summary: Related to issue 40174: Upload data: product into discount, business
partner set, import bp into bp set
Updated dataset to export client sample data, set hard limit to 50000 records
when uploading
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/ProcessUploadedFile.java
| 3 +
src-db/database/sourcedata/AD_DATASET_TABLE.xml
| 42 ++++++++++
2 files changed, 45 insertions(+), 0 deletions(-)
diffs (79 lines):
diff -r 6348d359da21 -r af7c14e31dff
modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/ProcessUploadedFile.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/ProcessUploadedFile.java
Sat Mar 16 23:49:58 2019 -0400
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/ProcessUploadedFile.java
Thu Mar 28 22:31:55 2019 +0100
@@ -235,6 +235,9 @@
public void incTotalCount() {
lineCount++;
+ if (lineCount > 50000) {
+ throw new OBException("Maximum number of lines (50000) in upload
reached");
+ }
}
public void incErrorCount() {
diff -r 6348d359da21 -r af7c14e31dff
src-db/database/sourcedata/AD_DATASET_TABLE.xml
--- a/src-db/database/sourcedata/AD_DATASET_TABLE.xml Sat Mar 16 23:49:58
2019 -0400
+++ b/src-db/database/sourcedata/AD_DATASET_TABLE.xml Thu Mar 28 22:31:55
2019 +0100
@@ -1229,6 +1229,20 @@
<!--6CFD9E37121E4805AB0536168B7C0FB1-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--6CFD9E37121E4805AB0536168B7C0FB1--></AD_DATASET_TABLE>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB--><AD_DATASET_TABLE>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB-->
<AD_DATASET_TABLE_ID><![CDATA[6D6A6066165D45818FDC0C9C5DBB65AB]]></AD_DATASET_TABLE_ID>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB-->
<AD_DATASET_ID><![CDATA[D81C5C810AEF47C690E4F688ABC8AAC8]]></AD_DATASET_ID>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB-->
<AD_TABLE_ID><![CDATA[8AB0D69F5CB64406B858BB09702EDBB2]]></AD_TABLE_ID>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB-->
<INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB-->
<WHERECLAUSE><![CDATA[client.id=:ClientID]]></WHERECLAUSE>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB-->
<EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB-->
<ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6D6A6066165D45818FDC0C9C5DBB65AB--></AD_DATASET_TABLE>
+
<!--6D9A95189B5711DD8552001B388C61A4--><AD_DATASET_TABLE>
<!--6D9A95189B5711DD8552001B388C61A4-->
<AD_DATASET_TABLE_ID><![CDATA[6D9A95189B5711DD8552001B388C61A4]]></AD_DATASET_TABLE_ID>
<!--6D9A95189B5711DD8552001B388C61A4-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6284,6 +6298,20 @@
<!--ADFFA6D325D046FE8AF64F3558292176-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--ADFFA6D325D046FE8AF64F3558292176--></AD_DATASET_TABLE>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA--><AD_DATASET_TABLE>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA-->
<AD_DATASET_TABLE_ID><![CDATA[AE4B23093AA54D1AA96CC3B91B7B8CBA]]></AD_DATASET_TABLE_ID>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA-->
<AD_DATASET_ID><![CDATA[D81C5C810AEF47C690E4F688ABC8AAC8]]></AD_DATASET_ID>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA-->
<AD_TABLE_ID><![CDATA[87B5A4145C3840E98A8E4F90F511CA34]]></AD_TABLE_ID>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA-->
<INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA-->
<WHERECLAUSE><![CDATA[client.id=:ClientID]]></WHERECLAUSE>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA-->
<EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA-->
<ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AE4B23093AA54D1AA96CC3B91B7B8CBA--></AD_DATASET_TABLE>
+
<!--B4B10DB866F444B7BBEDE296299B1EEB--><AD_DATASET_TABLE>
<!--B4B10DB866F444B7BBEDE296299B1EEB-->
<AD_DATASET_TABLE_ID><![CDATA[B4B10DB866F444B7BBEDE296299B1EEB]]></AD_DATASET_TABLE_ID>
<!--B4B10DB866F444B7BBEDE296299B1EEB-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6902,6 +6930,20 @@
<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--F15D91BC7A8743DC9F5F72541F5E3FDD--></AD_DATASET_TABLE>
+<!--F172750EC653444EB5E75C51EF7B42AF--><AD_DATASET_TABLE>
+<!--F172750EC653444EB5E75C51EF7B42AF-->
<AD_DATASET_TABLE_ID><![CDATA[F172750EC653444EB5E75C51EF7B42AF]]></AD_DATASET_TABLE_ID>
+<!--F172750EC653444EB5E75C51EF7B42AF-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F172750EC653444EB5E75C51EF7B42AF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F172750EC653444EB5E75C51EF7B42AF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F172750EC653444EB5E75C51EF7B42AF-->
<AD_DATASET_ID><![CDATA[D81C5C810AEF47C690E4F688ABC8AAC8]]></AD_DATASET_ID>
+<!--F172750EC653444EB5E75C51EF7B42AF-->
<AD_TABLE_ID><![CDATA[85A79D292BB04D16B7371B7FEEA43B8D]]></AD_TABLE_ID>
+<!--F172750EC653444EB5E75C51EF7B42AF-->
<INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--F172750EC653444EB5E75C51EF7B42AF-->
<WHERECLAUSE><![CDATA[client.id=:ClientID]]></WHERECLAUSE>
+<!--F172750EC653444EB5E75C51EF7B42AF-->
<EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
+<!--F172750EC653444EB5E75C51EF7B42AF-->
<ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--F172750EC653444EB5E75C51EF7B42AF-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F172750EC653444EB5E75C51EF7B42AF--></AD_DATASET_TABLE>
+
<!--F20434BE96E111DDBFA8001B388C61A4--><AD_DATASET_TABLE>
<!--F20434BE96E111DDBFA8001B388C61A4-->
<AD_DATASET_TABLE_ID><![CDATA[F20434BE96E111DDBFA8001B388C61A4]]></AD_DATASET_TABLE_ID>
<!--F20434BE96E111DDBFA8001B388C61A4-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
