[OpenbravoERP-commits] erp/devel/pi: 3 new changesets
details: http://code.openbravo.com/erp/devel/pi/rev/c2d06f06ad72
changeset: 3292:c2d06f06ad72
user: areefbasha
date: Tue Mar 03 12:35:19 2009 +0530
description:
Fixes bug 7628 The message has been changed from \"Do you want to procede?\" to
\"Do you want to proceed?\".
details: http://code.openbravo.com/erp/devel/pi/rev/a23aa6581ab7
changeset: 3293:a23aa6581ab7
user: areefbasha
date: Tue Mar 03 13:00:58 2009 +0530
description:
Fixes bug 7628 The message has been changed from \"Do you want to procede?\" to
\"Do you want to proceed?\".
details: http://code.openbravo.com/erp/devel/pi/rev/e166d33f8638
changeset: 3294:e166d33f8638
user: Areef Basha
date: Tue Mar 03 13:04:57 2009 +0530
description:
Resolve conflicts
diffs (truncated from 661 to 300 lines):
diff -r cbbf45c0800c -r e166d33f8638 .hgignore
--- a/.hgignore Mon Mar 02 17:58:37 2009 +0100
+++ b/.hgignore Tue Mar 03 13:04:57 2009 +0530
@@ -12,6 +12,7 @@
srcClient
temp
WebContent
+.ant-targets-build.xml
config/Openbravo.properties
config/log4j.lcf
diff -r cbbf45c0800c -r e166d33f8638 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Mar 02 17:58:37 2009 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Tue Mar 03 13:04:57 2009 +0530
@@ -7983,7 +7983,7 @@
-
+
diff -r cbbf45c0800c -r e166d33f8638 src/build.xml
--- a/src/build.xml Mon Mar 02 17:58:37 2009 +0100
+++ b/src/build.xml Tue Mar 03 13:04:57 2009 +0530
@@ -195,7 +195,10 @@
-
+
+
+
+
@@ -221,6 +224,9 @@
+
+
+
diff -r cbbf45c0800c -r e166d33f8638
src/org/openbravo/dal/service/OBCriteria.java
--- a/src/org/openbravo/dal/service/OBCriteria.java Mon Mar 02 17:58:37
2009 +0100
+++ b/src/org/openbravo/dal/service/OBCriteria.java Tue Mar 03 13:04:57
2009 +0530
@@ -26,24 +26,20 @@
import java.util.List;
import org.apache.log4j.Logger;
-import org.hibernate.CacheMode;
import org.hibernate.Criteria;
-import org.hibernate.FetchMode;
-import org.hibernate.FlushMode;
import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
import org.hibernate.ScrollMode;
import org.hibernate.ScrollableResults;
import org.hibernate.criterion.CriteriaSpecification;
-import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projection;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
-import org.hibernate.transform.ResultTransformer;
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.impl.CriteriaImpl;
import org.openbravo.base.model.Entity;
import org.openbravo.base.structure.BaseOBObject;
import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.core.SessionHandler;
import org.openbravo.model.common.enterprise.Organization;
/**
@@ -61,10 +57,11 @@
* @author mtaal
*/
-public class OBCriteria implements Criteria {
+public class OBCriteria extends CriteriaImpl {
+ private static final long serialVersionUID = 1L;
+
private static final Logger log = Logger.getLogger(OBCriteria.class);
- private Criteria criteria;
private Entity entity;
private boolean filterOnReadableClients = true;
@@ -73,7 +70,13 @@
private List orderBys = new ArrayList();
// package visible
- OBCriteria() {
+
+ public OBCriteria(String entityOrClassName) {
+super(entityOrClassName, (SessionImplementor)
SessionHandler.getInstance().getSession());
+ }
+
+ public OBCriteria(String entityOrClassName, String alias) {
+super(entityOrClassName, alias, (SessionImplementor)
SessionHandler.getInstance().getSession());
}
/**
@@ -82,7 +85,7 @@
@SuppressWarnings("unchecked")
public List list() throws HibernateException {
initialize();
-return criteria.list();
+return super.list();
}
/**
@@ -93,10 +96,9 @@
*/
public int count() {
initialize();
-final Criteria c = getCriteria();
-c.setProjection(Projections.rowCount());
-log.debug("Counting using criteria " + c.toString());
-return ((Number) c.uniqueResult()).intValue();
+setProjection(Projections.rowCount());
+log.debug("Counting using criteria " + toString());
+return ((Number) uniqueResult()).intValue();
}
/**
@@ -104,7 +106,7 @@
*/
public ScrollableResults scroll() throws HibernateException {
initialize();
-return criteria.scroll();
+return super.scroll();
}
/**
@@ -112,7 +114,7 @@
*/
public ScrollableResults scroll(ScrollMode scrollMode) throws
HibernateException {
initialize();
-return criteria.scroll(scrollMode);
+return super.scroll(scrollMode);
}
/**
@@ -120,32 +122,29 @@
*/
public Object uniqueResult() throws HibernateException {
initialize();
-return criteria.uniqueResult();
+return super.uniqueResult();
}
[OpenbravoERP-commits] erp/devel/pi: Fixes issue 7864, OBCriteria class is not always i...
details: http://code.openbravo.com/erp/devel/pi/rev/763b9ba6d969
changeset: 3291:763b9ba6d969
user: Martin Taal
date: Tue Mar 03 07:14:23 2009 +0100
description:
Fixes issue 7864, OBCriteria class is not always initialized when a user calls
createCriteria or another subCriteria creating methods
diffs (truncated from 370 to 300 lines):
diff -r a1ea9a48b6ec -r 763b9ba6d969
src/org/openbravo/dal/service/OBCriteria.java
--- a/src/org/openbravo/dal/service/OBCriteria.java Mon Mar 02 23:27:03
2009 +0100
+++ b/src/org/openbravo/dal/service/OBCriteria.java Tue Mar 03 07:14:23
2009 +0100
@@ -26,24 +26,20 @@
import java.util.List;
import org.apache.log4j.Logger;
-import org.hibernate.CacheMode;
import org.hibernate.Criteria;
-import org.hibernate.FetchMode;
-import org.hibernate.FlushMode;
import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
import org.hibernate.ScrollMode;
import org.hibernate.ScrollableResults;
import org.hibernate.criterion.CriteriaSpecification;
-import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projection;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
-import org.hibernate.transform.ResultTransformer;
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.impl.CriteriaImpl;
import org.openbravo.base.model.Entity;
import org.openbravo.base.structure.BaseOBObject;
import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.core.SessionHandler;
import org.openbravo.model.common.enterprise.Organization;
/**
@@ -61,10 +57,11 @@
* @author mtaal
*/
-public class OBCriteria implements Criteria {
+public class OBCriteria extends CriteriaImpl {
+ private static final long serialVersionUID = 1L;
+
private static final Logger log = Logger.getLogger(OBCriteria.class);
- private Criteria criteria;
private Entity entity;
private boolean filterOnReadableClients = true;
@@ -73,7 +70,13 @@
private List orderBys = new ArrayList();
// package visible
- OBCriteria() {
+
+ public OBCriteria(String entityOrClassName) {
+super(entityOrClassName, (SessionImplementor)
SessionHandler.getInstance().getSession());
+ }
+
+ public OBCriteria(String entityOrClassName, String alias) {
+super(entityOrClassName, alias, (SessionImplementor)
SessionHandler.getInstance().getSession());
}
/**
@@ -82,7 +85,7 @@
@SuppressWarnings("unchecked")
public List list() throws HibernateException {
initialize();
-return criteria.list();
+return super.list();
}
/**
@@ -93,10 +96,9 @@
*/
public int count() {
initialize();
-final Criteria c = getCriteria();
-c.setProjection(Projections.rowCount());
-log.debug("Counting using criteria " + c.toString());
-return ((Number) c.uniqueResult()).intValue();
+setProjection(Projections.rowCount());
+log.debug("Counting using criteria " + toString());
+return ((Number) uniqueResult()).intValue();
}
/**
@@ -104,7 +106,7 @@
*/
public ScrollableResults scroll() throws HibernateException {
initialize();
-return criteria.scroll();
+return super.scroll();
}
/**
@@ -112,7 +114,7 @@
*/
public ScrollableResults scroll(ScrollMode scrollMode) throws
HibernateException {
initialize();
-return criteria.scroll(scrollMode);
+return super.scroll(scrollMode);
}
/**
@@ -120,32 +122,29 @@
*/
public Object uniqueResult() throws HibernateException {
initialize();
-return criteria.uniqueResult();
+return super.uniqueResult();
}
void initialize() {
final OBContext obContext = OBContext.getOBContext();
-final Criteria c = getCriteria();
final Entity e = getEntity();
OBContext.getOBContext().getEntityAccessChecker().checkReadable(e);
if (isFilterOnReadableOrganization() && e.isOrganizationPartOfKey()) {
- getCriteria().add(
- Restrictions.in("id." + PROPERTY_ORGANIZATION + ".id", obContext
- .getReadableOrganizations()));
+ add(Restrictions.in("id." + PROPERTY_ORGANIZATION + ".id", obContext
+ .getReadableOrganizations()));
} else if (isFilterOnReadableOrganization() && e.isOrganizationEnabled()) {
- getCriteria().add(
- Restrictions.in(PROPERTY_ORGANIZATION + ".id",
obContext.getReadableOrganizations()));
+ add(Restrictions.in(PROPERTY_ORGANIZATION + ".id",
obContext.getReadableOrganizations()));
}
if (isFilterOnReadableClients() && getEntity().isClientEnabled()) {
- c.add(Restrictions.in(PROPERTY_CLIENT + ".id",
obContext.getReadableClients()));
+ add(Restrictions.in(PROPERTY_CLIENT + ".id",
obContext.getReadableClients()));
}
if (isFilterOnActive() && e.isActiveEnabled()) {
- c.add(Restrictions.eq(Organization.PROPERTY_ACTIVE, true));
+ add(Restrictions.eq(Organization.PROPERTY_ACTIVE, true))
[OpenbravoERP-commits] erp/devel/pi: Fixed bug 7740: Now movements of several items on ...
details: http://code.openbravo.com/erp/devel/pi/rev/a1ea9a48b6ec
changeset: 3290:a1ea9a48b6ec
user: David Baz Fayos
date: Mon Mar 02 23:27:03 2009 +0100
description:
Fixed bug 7740: Now movements of several items on 'Dimensions' fields are done
in order
diffs (52 lines):
diff -r ce872292c56d -r a1ea9a48b6ec web/js/utils.js
--- a/web/js/utils.js Mon Mar 02 22:21:15 2009 +0100
+++ b/web/js/utils.js Mon Mar 02 23:27:03 2009 +0100
@@ -1667,10 +1667,12 @@
if (sourceList==null || destinationList==null) return false;
if (selectAll==null) selectAll=false;
if (withPrefix==null) withPrefix=false;
- for (var j=sourceList.length-1;j>=0;j--) {
-if (selectAll || sourceList.options[j].selected==true) {
- var text = sourceList.options[j].text;
- var value = sourceList.options[j].value;
+ var sourceListLength = sourceList.length;
+ var i = 0;
+ for (var j=0;j=0;j--) {
-if (selectAll || sourceList.options[j].selected==true) {
- destinationList.options[destinationList.length] = new
Option(sourceList.options[j].text, sourceList.options[j].value);
- sourceList.options[j]=null;
+ var sourceListLength = sourceList.length;
+ var i = 0;
+ for (var j=0;jhttp://p.sf.net/sfu/XcvMzF8H
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/pi: 2 new changesets
details: http://code.openbravo.com/erp/devel/pi/rev/6b81b71b67c1 changeset: 3286:6b81b71b67c1 user: Iván Perdomo date: Mon Mar 02 17:59:42 2009 +0100 description: Added .ant-targets-build.xml file to .hgignore details: http://code.openbravo.com/erp/devel/pi/rev/8ce05ec44e48 changeset: 3287:8ce05ec44e48 user: Iván Perdomo date: Mon Mar 02 18:40:36 2009 +0100 description: Fixes issue 7832: Now generate.entities compiles all java files under src-gen diffs (36 lines): diff -r 20ecf72ab411 -r 8ce05ec44e48 .hgignore --- a/.hgignore Mon Mar 02 18:22:18 2009 +0100 +++ b/.hgignore Mon Mar 02 18:40:36 2009 +0100 @@ -12,6 +12,7 @@ srcClient temp WebContent +.ant-targets-build.xml config/Openbravo.properties config/log4j.lcf diff -r 20ecf72ab411 -r 8ce05ec44e48 src/build.xml --- a/src/build.xml Mon Mar 02 18:22:18 2009 +0100 +++ b/src/build.xml Mon Mar 02 18:40:36 2009 +0100 @@ -195,7 +195,10 @@ - + + + + @@ -221,6 +224,9 @@ + + + -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/pi: Fixed 7898: fixed slow Product selector performanc...
details: http://code.openbravo.com/erp/devel/pi/rev/27857f98b2e3
changeset: 3279:27857f98b2e3
user: Stefan Hühner
date: Mon Mar 02 17:17:25 2009 +0100
description:
Fixed 7898: fixed slow Product selector performance when using BOM
adds missing index to speed up BOM_PRICE{LIST,LIMIT,STD} functions which are
used in the selector
diffs (13 lines):
diff -r 9a161c2aed33 -r 27857f98b2e3
src-db/database/model/tables/M_PRODUCT_BOM.xml
--- a/src-db/database/model/tables/M_PRODUCT_BOM.xmlMon Mar 02 17:08:12
2009 +0100
+++ b/src-db/database/model/tables/M_PRODUCT_BOM.xmlMon Mar 02 17:17:25
2009 +0100
@@ -69,6 +69,9 @@
+
+
+
--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/pi: Fixes bug 0007899: Build Failed in ant target impo...
details: http://code.openbravo.com/erp/devel/pi/rev/cbbf45c0800c changeset: 3282:cbbf45c0800c user: Eduardo Argal Guibert date: Mon Mar 02 17:58:37 2009 +0100 description: Fixes bug 0007899: Build Failed in ant target import.sample.data diffs (22 lines): diff -r 79ce1c20b5d6 -r cbbf45c0800c referencedata/sampledata/Accounting_Test.xml --- a/referencedata/sampledata/Accounting_Test.xml Mon Mar 02 18:46:32 2009 +0200 +++ b/referencedata/sampledata/Accounting_Test.xml Mon Mar 02 17:58:37 2009 +0100 @@ -23574,7 +23574,6 @@ 100 - 140 diff -r 79ce1c20b5d6 -r cbbf45c0800c referencedata/sampledata/SmallBazaar.xml --- a/referencedata/sampledata/SmallBazaar.xml Mon Mar 02 18:46:32 2009 +0200 +++ b/referencedata/sampledata/SmallBazaar.xml Mon Mar 02 17:58:37 2009 +0100 @@ -113587,7 +113587,6 @@ 1 - 100 -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/pi: Bug fixed 0007885: Cannot Import products, gives a...
details: http://code.openbravo.com/erp/devel/pi/rev/79ce1c20b5d6 changeset: 3281:79ce1c20b5d6 user: David Abragimov date: Mon Mar 02 18:46:32 2009 +0200 description: Bug fixed 0007885: Cannot Import products, gives a m_product_po_id NOT NULL Contraint Error diffs (20 lines): diff -r 1dd6a0574314 -r 79ce1c20b5d6 src/org/openbravo/erpCommon/ad_process/ImportProduct_data.xsql --- a/src/org/openbravo/erpCommon/ad_process/ImportProduct_data.xsqlMon Mar 02 17:39:26 2009 +0100 +++ b/src/org/openbravo/erpCommon/ad_process/ImportProduct_data.xsqlMon Mar 02 18:46:32 2009 +0200 @@ -664,14 +664,14 @@
[OpenbravoERP-commits] erp/devel/pi: Fixes bug 0007837: In defaults accounts of schema, ...
details: http://code.openbravo.com/erp/devel/pi/rev/9a161c2aed33 changeset: 3278:9a161c2aed33 user: Eduardo Argal Guibert date: Mon Mar 02 17:08:12 2009 +0100 description: Fixes bug 0007837: In defaults accounts of schema, combo 'status' should be removed. mising column erase diffs (14 lines): diff -r f07cd2421fed -r 9a161c2aed33 src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml --- a/src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml Mon Mar 02 16:58:17 2009 +0100 +++ b/src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml Mon Mar 02 17:08:12 2009 +0100 @@ -285,10 +285,6 @@ - - - - -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/pi: 3 new changesets
details: http://code.openbravo.com/erp/devel/pi/rev/bfbbb85e7117
changeset: 3283:bfbbb85e7117
user: Anthony Wolski
date: Mon Mar 02 16:25:15 2009 +0100
description:
Fixes issue 549. Initially, only display a subset of imported data.
details: http://code.openbravo.com/erp/devel/pi/rev/bc1e6be7d3a0
changeset: 3284:bc1e6be7d3a0
user: Anthony Wolski
date: Mon Mar 02 18:21:18 2009 +0100
description:
Fixes issue 549. Limit number of displayed rows for intermediate results.
details: http://code.openbravo.com/erp/devel/pi/rev/20ecf72ab411
changeset: 3285:20ecf72ab411
user: Anthony Wolski
date: Mon Mar 02 18:22:18 2009 +0100
description:
Merge.
diffs (236 lines):
diff -r 16f4d450de29 -r 20ecf72ab411
referencedata/sampledata/Accounting_Test.xml
--- a/referencedata/sampledata/Accounting_Test.xml Mon Mar 02 12:59:27
2009 +0100
+++ b/referencedata/sampledata/Accounting_Test.xml Mon Mar 02 18:22:18
2009 +0100
@@ -23574,7 +23574,6 @@
100
-
140
diff -r 16f4d450de29 -r 20ecf72ab411 referencedata/sampledata/SmallBazaar.xml
--- a/referencedata/sampledata/SmallBazaar.xml Mon Mar 02 12:59:27 2009 +0100
+++ b/referencedata/sampledata/SmallBazaar.xml Mon Mar 02 18:22:18 2009 +0100
@@ -113587,7 +113587,6 @@
1
-
100
diff -r 16f4d450de29 -r 20ecf72ab411
src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml
--- a/src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml Mon Mar 02
12:59:27 2009 +0100
+++ b/src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml Mon Mar 02
18:22:18 2009 +0100
@@ -285,10 +285,6 @@
-
-
-
-
@@ -481,7 +477,7 @@
-
+
diff -r 16f4d450de29 -r 20ecf72ab411
src-db/database/model/tables/M_PRODUCT_BOM.xml
--- a/src-db/database/model/tables/M_PRODUCT_BOM.xmlMon Mar 02 12:59:27
2009 +0100
+++ b/src-db/database/model/tables/M_PRODUCT_BOM.xmlMon Mar 02 18:22:18
2009 +0100
@@ -69,6 +69,9 @@
+
+
+
diff -r 16f4d450de29 -r 20ecf72ab411
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xmlMon Mar 02 12:59:27
2009 +0100
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xmlMon Mar 02 18:22:18
2009 +0100
@@ -1483,7 +1483,7 @@
-
+
@@ -2515,7 +2515,7 @@
-
+
diff -r 16f4d450de29 -r 20ecf72ab411
src/org/openbravo/erpCommon/ad_forms/FileImport.java
--- a/src/org/openbravo/erpCommon/ad_forms/FileImport.java Mon Mar 02
12:59:27 2009 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/FileImport.java Mon Mar 02
18:22:18 2009 +0100
@@ -44,6 +44,8 @@
private static final long serialVersionUID = 1L;
static boolean firstRowHeaders = true;
+ static final int THRESHOLD = 1000;
+
public void init(ServletConfig config) {
super.init(config);
boolHist = false;
@@ -70,9 +72,8 @@
if (strSeparator.equalsIgnoreCase("F"))
rows = FileImportData.select(this, strAdImpformatId);
fieldsData = new FileLoadData(vars, "inpFile", firstRowHeaders,
strSeparator, rows);
- String texto = procesarFichero(vars, fieldsData.getFieldProvider(),
request, response,
- strAdImpformatId, strFirstLineHeader);
- printPageResult(response, vars, texto, "FIND");
+ printSampleImport(vars, fieldsData.getFieldProvider(), request,
response, strAdImpformatId,
+ strFirstLineHeader);
} else if (vars.commandIn("SAVE")) {
String strAdImpformatId = vars.getStringParameter("inpadImpformatId");
FieldProvider[] rows = null;
@@ -319,20 +320,93 @@
out.close();
}
+ /**
+ * Prints the intermediate output of the .csv import - a manually generated
table. The number of
+ * rows displayed (loaded) is limited to THRESHOLD. Large .csv files can
cause out of memory
+ * exceptions, so we limit what can be loaded in the intermediate step here.
+ *
+ * @param vars
+ * @param data2
+ * @param request
+ * @param response
+ * @param strAdImpformatId
+ * @param strFirstLineHeader
+ * @throws ServletException
+ * @throws IOException
+ */
+ void printSampleImport(VariablesSecureApp vars, FieldProvider[] data2,
+ HttpServletRequest request, HttpServletResponse response, String
strAdImpformatId,
+ String strFirstLineHeader) throws ServletException, IOException {
+
+int count = 0;
+StringBuilder sb = new StringBuilder();
+if (data2 != null) {
+ FileImportData[] data = FileImportData.select(this, strAdImpformatId);
+
+ int constant = 0;
+ sb.append(""
+ + " " + "");
+ if (log4j.isDebugEnabled())
+log4j.debug("data2.length: " + data2.length);
+ for (int i = 0; i < data2.length && i < THRESHOLD; i++) {
+if (log4j.isDeb
[OpenbravoERP-commits] erp/devel/pi: Fixes bug 0007516 Menu shows duplicated entries
details: http://code.openbravo.com/erp/devel/pi/rev/1dd6a0574314 changeset: 3280:1dd6a0574314 user: Ainhoa Pagola date: Mon Mar 02 17:39:26 2009 +0100 description: Fixes bug 0007516 Menu shows duplicated entries diffs (21 lines): diff -r 27857f98b2e3 -r 1dd6a0574314 src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xmlMon Mar 02 17:17:25 2009 +0100 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xmlMon Mar 02 17:39:26 2009 +0100 @@ -1483,7 +1483,7 @@ - + @@ -2515,7 +2515,7 @@ - + -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/pi: Fixes length for src-db/database/model/tables/C_AC...
details: http://code.openbravo.com/erp/devel/pi/rev/f07cd2421fed changeset: 3277:f07cd2421fed user: Eduardo Argal Guibert date: Mon Mar 02 16:58:17 2009 +0100 description: Fixes length for src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml: Unique constraint for AcctSchema diffs (12 lines): diff -r b4a6ec1daef7 -r f07cd2421fed src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml --- a/src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml Mon Mar 02 16:56:51 2009 +0100 +++ b/src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml Mon Mar 02 16:58:17 2009 +0100 @@ -481,7 +481,7 @@ - + -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/pi: Fixed bug 7897: The invoice Taxes Report does not ...
details: http://code.openbravo.com/erp/devel/pi/rev/b4a6ec1daef7
changeset: 3276:b4a6ec1daef7
user: Víctor Martínez Romanos
date: Mon Mar 02 16:56:51 2009 +0100
description:
Fixed bug 7897: The invoice Taxes Report does not work with foreign sales.
diffs (11 lines):
diff -r 16f4d450de29 -r b4a6ec1daef7
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSaleForeign.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSaleForeign.jrxml
Mon Mar 02 12:59:27 2009 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSaleForeign.jrxml
Mon Mar 02 16:56:51 2009 +0100
@@ -162,7 +162,6 @@
AND C_INVOICE.C_DOCTYPE_ID = C_DOCTYPE.C_DOCTYPE_ID
AND C_INVOICE.PROCESSED = 'Y'
AND C_INVOICE.ISACTIVE = 'Y'
- AND C_INVOICE.ISSOTRX = 'N'
AND C_INVOICE.ISSOTRX = 'Y'
AND C_INVOICE.DATEINVOICED >= $P{parDateFrom}
AND C_INVOICE.DATEINVOICED < $P{parDateTo}
--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/pi: Fixes bug 0007669: In multi currency environments, ...
details: http://code.openbravo.com/erp/devel/pi/rev/16f4d450de29 changeset: 3275:16f4d450de29 user: Eduardo Argal Guibert date: Mon Mar 02 12:59:27 2009 +0100 description: Fixes bug 0007669: In multi currency environments, Accounting will not work if conversion rate is different from Spot diffs (205 lines): diff -r 2105bfaecba1 -r 16f4d450de29 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 02 12:39:10 2009 +0100 +++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 02 12:59:27 2009 +0100 @@ -5880,7 +5880,6 @@ - @@ -5903,7 +5902,7 @@ - + @@ -5926,7 +5925,7 @@ - + @@ -5950,7 +5949,7 @@ - + @@ -5976,7 +5975,7 @@ - + @@ -5996,10 +5995,9 @@ - + - @@ -6022,7 +6020,7 @@ - + @@ -6045,7 +6043,7 @@ - + @@ -6068,7 +6066,7 @@ - + @@ -6091,7 +6089,7 @@ - + @@ -15816,7 +15814,6 @@ - @@ -15839,7 +15836,7 @@ - + @@ -15864,7 +15861,7 @@ - + @@ -15887,7 +15884,7 @@ - + @@ -15911,7 +15908,7 @@ - + @@ -15934,7 +15931,7 @@ - + @@ -15957,7 +15954,7 @@ - + @@ -15980,7 +15977,7 @@ - + @@ -16004,7 +16001,7 @@ - + @@ -16025,10 +16022,9 @@ - + - @@ -20560,7 +20556,7 @@ - + @@ -26908,7 +26904,7 @@ - + -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/pi: Fixes 0007843: Print record and email option icons...
details: http://code.openbravo.com/erp/devel/pi/rev/2105bfaecba1
changeset: 3274:2105bfaecba1
user: Gorka Mauleon
date: Mon Mar 02 12:39:10 2009 +0100
description:
Fixes 0007843: Print record and email option icons are visible in Trial Balance
Report page
diffs (108 lines):
diff -r 4e00daed7e3d -r 2105bfaecba1
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.javaMon Mar
02 12:33:46 2009 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.javaMon Mar
02 12:39:10 2009 +0100
@@ -61,7 +61,8 @@
"ReportTrialBalance|AccountFrom", "");
String strAccountTo = vars.getGlobalVariable("inpAccountTo",
"ReportTrialBalance|AccountTo",
ReportTrialBalanceData.selectLastAccount(this,
Utility.getContext(this, vars,
- "#AccessibleOrgTree", "Account"), Utility.getContext(this, vars,
"#User_Client", "Account")));
+ "#AccessibleOrgTree", "Account"), Utility.getContext(this, vars,
"#User_Client",
+ "Account")));
String strcBpartnerId =
vars.getRequestInGlobalVariable("inpcBPartnerId_IN",
"ReportTrialBalance|cBpartnerId");
@@ -170,15 +171,15 @@
discard[1] = "sectionNoBP";
data = ReportTrialBalanceData.selectBP(this, strDateFrom, strDateTo,
strOrg,
strOrgFamily, Utility.getContext(this, vars, "#User_Client",
"ReportTrialBalance"),
- Utility.getContext(this, vars, "#AccessibleOrgTree",
"ReportTrialBalance"), strDateFrom,
- DateTimeData.nDaysAfter(this, strDateTo, "1"), strAccountFrom,
strAccountTo,
- strcBpartnerId, strcAcctSchemaId);
+ Utility.getContext(this, vars, "#AccessibleOrgTree",
"ReportTrialBalance"),
+ strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, "1"),
strAccountFrom,
+ strAccountTo, strcBpartnerId, strcAcctSchemaId);
} else {
data = ReportTrialBalanceData.select(this, strDateFrom, strDateTo,
strOrg,
strTreeAccount, strcAcctSchemaId, strOrgFamily,
Utility.getContext(this, vars,
"#User_Client", "ReportTrialBalance"),
Utility.getContext(this, vars,
- "#AccessibleOrgTree", "ReportTrialBalance"), strDateFrom,
DateTimeData.nDaysAfter(this,
- strDateTo, "1"), strAccountFrom, strAccountTo);
+ "#AccessibleOrgTree", "ReportTrialBalance"), strDateFrom,
DateTimeData
+ .nDaysAfter(this, strDateTo, "1"), strAccountFrom,
strAccountTo);
}
} else {
data = ReportTrialBalanceData.select(this, strDateFrom, strDateTo,
strOrg, strTreeAccount,
@@ -218,7 +219,7 @@
}
ToolBar toolbar = new ToolBar(this, vars.getLanguage(),
"ReportTrialBalance", false, "", "",
-"imprimir();return false;", false, "ad_reports", strReplaceWith,
false, true);
+"", false, "ad_reports", strReplaceWith, false, true);
toolbar.prepareSimpleToolBarTemplate();
xmlDocument.setParameter("toolbar", toolbar.toString());
@@ -250,11 +251,11 @@
}
xmlDocument.setData("reportAccountFrom_ID", "liststructure",
ReportTrialBalanceData
-.selectAccount(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", "Account"), Utility
-.getContext(this, vars, "#User_Client", "Account"), "",
strcAcctSchemaId));
+.selectAccount(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", "Account"),
+Utility.getContext(this, vars, "#User_Client", "Account"), "",
strcAcctSchemaId));
xmlDocument.setData("reportAccountTo_ID", "liststructure",
ReportTrialBalanceData
-.selectAccount(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", "Account"), Utility
-.getContext(this, vars, "#User_Client", "Account"), "",
strcAcctSchemaId));
+.selectAccount(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", "Account"),
+Utility.getContext(this, vars, "#User_Client", "Account"), "",
strcAcctSchemaId));
xmlDocument.setData("reportAD_ORGID", "liststructure",
GeneralAccountingReportsData
.selectCombo(this, vars.getRole()));
xmlDocument.setData("reportC_ACCTSCHEMA_ID", "liststructure",
ReportGeneralLedgerData
@@ -281,17 +282,17 @@
xmlDocument.setParameter("paramAll0", strAll.equals("") ? "0" : "1");
xmlDocument.setData("reportCBPartnerId_IN", "liststructure",
ReportRefundInvoiceCustomerDimensionalAnalysesData.selectBpartner(this,
Utility.getContext(
-this, vars, "#AccessibleOrgTree", ""), Utility.getContext(this,
vars, "#User_Client", ""),
-strcBpartnerIdAux));
+this, vars, "#AccessibleOrgTree", ""), Utility.getContext(this,
vars, "#User_Client",
+""), strcBpartnerIdAux));
-xmlDocument.setParameter("accounFromArray",
-arrayDobleEntrada("arrAccountFrom",
ReportTrialB
[OpenbravoERP-commits] erp/devel/pi: 3 new changesets
details: http://code.openbravo.com/erp/devel/pi/rev/a3c864cc225d
changeset: 3271:a3c864cc225d
user: Gorka Mauleon
date: Mon Mar 02 12:15:41 2009 +0100
description:
Fixes 0007844: Export to excel, print record, Email options are available in
the General Ledger Journal report.
details: http://code.openbravo.com/erp/devel/pi/rev/772deac555c5
changeset: 3272:772deac555c5
user: Gorka Mauleon
date: Mon Mar 02 12:30:51 2009 +0100
description:
merge
details: http://code.openbravo.com/erp/devel/pi/rev/4e00daed7e3d
changeset: 3273:4e00daed7e3d
user: Gorka Mauleon
date: Mon Mar 02 12:33:46 2009 +0100
description:
merge
diffs (truncated from 792 to 300 lines):
diff -r 5ca703de2812 -r 4e00daed7e3d
src-db/database/model/functions/AD_TABLE_IMPORT.xml
--- a/src-db/database/model/functions/AD_TABLE_IMPORT.xml Fri Feb 27
12:32:50 2009 +0100
+++ b/src-db/database/model/functions/AD_TABLE_IMPORT.xml Mon Mar 02
12:33:46 2009 +0100
@@ -250,12 +250,15 @@
WHERE AD_TABLE_ID = Cur_Column.AD_Table_ID;
END IF;
+
IF substr(upper(v_columnName),1,3)='EM_' then
db_prefix :=
substr(v_columnName,4,length(v_columnName)-instr(v_columnName,'_',1,2));
+DBMS_OUTPUT.PUT_LINE('Prefix:'||db_prefix);
select max(ad_module_id)
into v_module_id
from ad_module_dbprefix
- where name = db_prefix;
+ where upper(name) = upper(db_prefix);
+
if v_module_id is null then
v_module_id := v_module_table_id;
end if;
@@ -263,6 +266,8 @@
v_module_id := v_module_table_id;
end if;
+ DBMS_OUTPUT.PUT_LINE('Inserting Column:'||v_columnName||' to
module:'||v_module_id);
+
INSERT
INTO AD_COLUMN
(
@@ -283,7 +288,7 @@
(CASE Cur_Column.Nullable WHEN 'Y' THEN 'N' ELSE 'Y' END),
v_IsIdentifier, v_SeqNo, 'N', 'N', v_IsUpdateable,
v_AD_Reference_Value_ID,
v_AD_Val_Rule_ID, v_DefaultValue, v_IsSessionAttr,
-Cur_Column.COLUMN_ID, v_module_id) ;
+Cur_Column.COLUMN_ID, v_module_id);
--
v_count:=v_count + 1;
-- Added by Ismael Ciordia
diff -r 5ca703de2812 -r 4e00daed7e3d
src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml
--- a/src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml Fri Feb
27 12:32:50 2009 +0100
+++ b/src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml Mon Mar
02 12:33:46 2009 +0100
@@ -171,8 +171,7 @@
NotInvoicedRevenue_Acct=Cur_Acct.NotInvoicedRevenue_Acct,
NotInvoicedReceivables_Acct=Cur_Acct.NotInvoicedReceivables_Acct,
Updated=now(),
-UpdatedBy='0',
-Status=Cur_Acct.Status
+UpdatedBy='0'
WHERE C_BP_Group_Acct.C_AcctSchema_ID=Cur_Acct.C_AcctSchema_ID
AND EXISTS
(SELECT *
@@ -192,7 +191,7 @@
V_Liability_Services_Acct, V_PrePayment_Acct, PayDiscount_Exp_Acct,
PayDiscount_Rev_Acct,
WriteOff_Acct, UnRealizedGain_Acct, UnRealizedLoss_Acct,
RealizedGain_Acct,
RealizedLoss_Acct, NotInvoicedReceipts_Acct, UnEarnedRevenue_Acct,
NotInvoicedRevenue_Acct,
- NotInvoicedReceivables_Acct, Status
+ NotInvoicedReceivables_Acct
)
SELECT get_uuid(), x.C_BP_Group_ID,
Cur_Acct.C_AcctSchema_ID, x.AD_Client_ID, x.AD_Org_ID, 'Y',
@@ -200,8 +199,7 @@
Cur_Acct.C_Receivable_Acct, Cur_Acct.C_PrePayment_Acct,
Cur_Acct.V_Liability_Acct, Cur_Acct.V_Liability_Services_Acct,
Cur_Acct.V_PrePayment_Acct, Cur_Acct.PayDiscount_Exp_Acct,
Cur_Acct.PayDiscount_Rev_Acct, Cur_Acct.WriteOff_Acct,
Cur_Acct.UnRealizedGain_Acct, Cur_Acct.UnRealizedLoss_Acct,
Cur_Acct.RealizedGain_Acct, Cur_Acct.RealizedLoss_Acct,
-Cur_Acct.NotInvoicedReceipts_Acct, Cur_Acct.UnEarnedRevenue_Acct,
Cur_Acct.NotInvoicedRevenue_Acct, Cur_Acct.NotInvoicedReceivables_Acct,
-Cur_Acct.Status
+Cur_Acct.NotInvoicedReceipts_Acct, Cur_Acct.UnEarnedRevenue_Acct,
Cur_Acct.NotInvoicedRevenue_Acct, Cur_Acct.NotInvoicedReceivables_Acct
FROM C_BP_Group x
WHERE AD_Client_ID=Cur_Acct.AD_Client_ID
AND NOT EXISTS
diff -r 5ca703de2812 -r 4e00daed7e3d
src-db/database/model/functions/C_SETTLEMENT_POST.xml
--- a/src-db/database/model/functions/C_SETTLEMENT_POST.xml Fri Feb 27
12:32:50 2009 +0100
+++ b/src-db/database/model/functions/C_SETTLEMENT_POST.xml Mon Mar 02
12:33:46 2009 +0100
@@ -303,6 +303,22 @@
END IF;
END IF;--FINISH_PROCESS
+IF(NOT FINISH_PROCESS) THEN
+ /*
+ * Checking Restrictions
+ */
+ v_ResultStr:='CheckingRestrictions - C_DEBT_PAYMENT MANUAL IS NOT
SPLIT';
+ SELECT COUNT(*), AD_COLUMN_IDENTIFIER_STD ('C_Debt_Payment',
TO_CHAR(MAX(c.C_Debt_Payment_Id)))
+ INTO v_Aux, v_column_identifier
+ FROM C_DEBT_PAYMENT c
+ WHERE c.C_SETTLEMENT_CANCEL_ID=v_Record_ID
+ AND c.ISMANUAL
[OpenbravoERP-commits] erp/devel/pi: 7670: 347 file generated by Openbravo are not correct
details: http://code.openbravo.com/erp/devel/pi/rev/539598909c76 changeset: 3270:539598909c76 user: David Alsasua date: Mon Mar 02 11:51:29 2009 +0100 description: 7670: 347 file generated by Openbravo are not correct diffs (54 lines): diff -r e743f25fc716 -r 539598909c76 src/org/openbravo/erpCommon/ad_reports/GenerateModel347_data.xsql --- a/src/org/openbravo/erpCommon/ad_reports/GenerateModel347_data.xsql Mon Mar 02 11:28:06 2009 +0100 +++ b/src/org/openbravo/erpCommon/ad_reports/GenerateModel347_data.xsql Mon Mar 02 11:51:29 2009 +0100 @@ -291,7 +291,7 @@
[OpenbravoERP-commits] erp/devel/pi: Fixes bug 0007829: Remittance file does not contai...
details: http://code.openbravo.com/erp/devel/pi/rev/e743f25fc716
changeset: 3269:e743f25fc716
user: Eduardo Argal Guibert
date: Mon Mar 02 11:28:06 2009 +0100
description:
Fixes bug 0007829: Remittance file does not contain Contract parameter
diffs (52 lines):
diff -r b64bc48ad35b -r e743f25fc716 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Mar 02 10:39:24 2009 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Mon Mar 02 11:28:06 2009 +0100
@@ -63548,17 +63548,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -63978,6 +63967,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff -r b64bc48ad35b -r e743f25fc716
src/org/openbravo/erpCommon/ad_actionButton/CreateFile.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFile.java Mon Mar
02 10:39:24 2009 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFile.java Mon Mar
02 11:28:06 2009 +0100
@@ -134,7 +134,8 @@
String strContract = CreateFileData.selectParam(this, strKey, "CONTRACT");
if (strCuaderno == null)
strCuaderno = "";
-
+if(strContract == null || strContract.equals("")) advisePopUp(request,
response, "Error", Utility.messageBD(this, "Error", vars.getLanguage()),
+Utility.messageBD(this, "RemittanceTypeContractError",
vars.getLanguage()));
if (strCuaderno.equals("58"))
printPageFind58(response, vars, strKey, strContract);
else if (strCuaderno.equals("19"))
--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/pi: Fixes bug 0007837: In defaults accounts of schema, ...
details: http://code.openbravo.com/erp/devel/pi/rev/b64bc48ad35b changeset: 3268:b64bc48ad35b user: Eduardo Argal Guibert date: Mon Mar 02 10:39:24 2009 +0100 description: Fixes bug 0007837: In defaults accounts of schema, combo 'status' should be removed diffs (125 lines): diff -r a035ff1a077e -r b64bc48ad35b src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml --- a/src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml Fri Feb 27 17:33:20 2009 +0100 +++ b/src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml Mon Mar 02 10:39:24 2009 +0100 @@ -171,8 +171,7 @@ NotInvoicedRevenue_Acct=Cur_Acct.NotInvoicedRevenue_Acct, NotInvoicedReceivables_Acct=Cur_Acct.NotInvoicedReceivables_Acct, Updated=now(), -UpdatedBy='0', -Status=Cur_Acct.Status +UpdatedBy='0' WHERE C_BP_Group_Acct.C_AcctSchema_ID=Cur_Acct.C_AcctSchema_ID AND EXISTS (SELECT * @@ -192,7 +191,7 @@ V_Liability_Services_Acct, V_PrePayment_Acct, PayDiscount_Exp_Acct, PayDiscount_Rev_Acct, WriteOff_Acct, UnRealizedGain_Acct, UnRealizedLoss_Acct, RealizedGain_Acct, RealizedLoss_Acct, NotInvoicedReceipts_Acct, UnEarnedRevenue_Acct, NotInvoicedRevenue_Acct, - NotInvoicedReceivables_Acct, Status + NotInvoicedReceivables_Acct ) SELECT get_uuid(), x.C_BP_Group_ID, Cur_Acct.C_AcctSchema_ID, x.AD_Client_ID, x.AD_Org_ID, 'Y', @@ -200,8 +199,7 @@ Cur_Acct.C_Receivable_Acct, Cur_Acct.C_PrePayment_Acct, Cur_Acct.V_Liability_Acct, Cur_Acct.V_Liability_Services_Acct, Cur_Acct.V_PrePayment_Acct, Cur_Acct.PayDiscount_Exp_Acct, Cur_Acct.PayDiscount_Rev_Acct, Cur_Acct.WriteOff_Acct, Cur_Acct.UnRealizedGain_Acct, Cur_Acct.UnRealizedLoss_Acct, Cur_Acct.RealizedGain_Acct, Cur_Acct.RealizedLoss_Acct, -Cur_Acct.NotInvoicedReceipts_Acct, Cur_Acct.UnEarnedRevenue_Acct, Cur_Acct.NotInvoicedRevenue_Acct, Cur_Acct.NotInvoicedReceivables_Acct, -Cur_Acct.Status +Cur_Acct.NotInvoicedReceipts_Acct, Cur_Acct.UnEarnedRevenue_Acct, Cur_Acct.NotInvoicedRevenue_Acct, Cur_Acct.NotInvoicedReceivables_Acct FROM C_BP_Group x WHERE AD_Client_ID=Cur_Acct.AD_Client_ID AND NOT EXISTS diff -r a035ff1a077e -r b64bc48ad35b src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Feb 27 17:33:20 2009 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Mar 02 10:39:24 2009 +0100 @@ -209603,38 +209603,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r a035ff1a077e -r b64bc48ad35b src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Fri Feb 27 17:33:20 2009 +0100 +++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 02 10:39:24 2009 +0100 @@ -22765,7 +22765,7 @@ - + @@ -22933,7 +22933,7 @@ - + @@ -155819,29 +155819,6 @@ - - - - - - - - - - - - - - - - - - - - - - - -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
