details: https://code.openbravo.com/erp/devel/pi/rev/f5745012a5fd
changeset: 35833:f5745012a5fd
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon May 20 12:04:07 2019 +0200
summary: related to issue 40290: fixed merge
diffstat:
src/org/openbravo/base/model/Property.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diffs (11 lines):
diff -r 2357e260529d -r f5745012a5fd src/org/openbravo/base/model/Property.java
--- a/src/org/openbravo/base/model/Property.java Mon May 20 11:36:24
2019 +0200
+++ b/src/org/openbravo/base/model/Property.java Mon May 20 12:04:07
2019 +0200
@@ -126,6 +126,7 @@
private boolean usedSequence;
private boolean isProxy;
private boolean allowedCrossOrgReference;
+ private boolean isChildPropertyInParent;
/**
* Initializes this Property using the information from the Column.
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
