[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/ac90098fce28
changeset: 14252:ac90098fce28
user: Ioritz Cia ioritz.cia at openbravo.com
date: Fri Nov 11 14:35:56 2011 +0100
summary: Fixes issue 18613: Default PaymentTerm is not working.
details: https://code.openbravo.com/erp/devel/pi/rev/a650496b7e3b
changeset: 14253:a650496b7e3b
user: Ioritz Cia ioritz.cia at openbravo.com
date: Mon Nov 14 13:43:37 2011 +0100
summary: Fixes issue 18788: Suggested Work Requirement with zero quantity
should not become Work Requirement.
diffstat:
src-db/database/model/functions/MRP_WORKREQUIREMENT.xml| 1 +
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 7 +++
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 23
++---
src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql | 13 +
4 files changed, 37 insertions(+), 7 deletions(-)
diffs (110 lines):
diff -r 99105c8bf13a -r a650496b7e3b
src-db/database/model/functions/MRP_WORKREQUIREMENT.xml
--- a/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml Tue Nov 15
02:58:42 2011 +0100
+++ b/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml Mon Nov 14
13:43:37 2011 +0100
@@ -77,6 +77,7 @@
AND MRP_RUN_PRODUCTION_ID = v_Record_ID
AND INOUTTRXTYPE = 'WP'
AND MA_WORKREQUIREMENT_ID IS NULL
+AND MRP_RUN_PRODUCTIONLINE.QTY 0
ORDER BY PLANNEDDATE
) LOOP
v_ResultStr:='Create Work Requirement';
diff -r 99105c8bf13a -r a650496b7e3b
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java Tue Nov
15 02:58:42 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java Mon Nov
14 13:43:37 2011 +0100
@@ -127,6 +127,13 @@
resultado.append(new Array(\inpfinPaymentmethodId\, \ +
strFinPaymentMethodId + \),);
String PaymentTerm = (strIsSOTrx.equals(Y) ? data[0].cPaymenttermId
: data[0].poPaymenttermId);
+ if (PaymentTerm.equalsIgnoreCase()) {
+BpartnerMiscData[] paymentTerm =
BpartnerMiscData.selectPaymentTerm(this, strOrgId,
+vars.getClient());
+if (paymentTerm.length != 0) {
+ PaymentTerm = PaymentTerm.equals() ? paymentTerm[0].cPaymenttermId
: PaymentTerm;
+}
+ }
resultado.append(new Array(\inpcPaymenttermId\, \ + PaymentTerm +
\),);
FieldProvider[] tdv = null;
try {
diff -r 99105c8bf13a -r a650496b7e3b
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.javaTue Nov
15 02:58:42 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.javaMon Nov
14 13:43:37 2011 +0100
@@ -66,11 +66,12 @@
String strInvoiceRule = vars.getStringParameter(inpinvoicerule);
String strPriceList = vars.getStringParameter(inpmPricelistId);
String strDeliveryViaRule =
vars.getStringParameter(inpdeliveryviarule);
+ String strOrgId = vars.getStringParameter(inpadOrgId);
try {
printPage(response, vars, strBPartner, strOrderType, strIsSOTrx,
strWindowId, strLocation,
strContact, strProjectId, strTabId, strDeliveryRule, strUserRep,
strPaymentrule,
-strPaymentterm, strInvoiceRule, strPriceList, strDeliveryViaRule);
+strPaymentterm, strInvoiceRule, strPriceList, strDeliveryViaRule,
strOrgId);
} catch (ServletException ex) {
pageErrorCallOut(response);
}
@@ -82,7 +83,8 @@
String strOrderType, String strIsSOTrx, String strWindowId, String
strLocation,
String strContact, String strProjectId, String strTabId, String
strDeliveryRule0,
String strUserRep0, String strPaymentrule0, String strPaymentterm0,
String strInvoiceRule0,
- String strPriceList0, String strDeliveryViaRule0) throws IOException,
ServletException {
+ String strPriceList0, String strDeliveryViaRule0, String strOrgId)
throws IOException,
+ ServletException {
if (log4j.isDebugEnabled())
log4j.debug(Output: dataSheet);
@@ -100,8 +102,19 @@
strUserRep = strUserRep.equals() ? strUserRep0 : strUserRep;
strPaymentrule = (strIsSOTrx.equals(Y) ? data[0].paymentrule :
data[0].paymentrulepo);
strPaymentrule = strPaymentrule.equals() ? strPaymentrule0 :
strPaymentrule;
+
strPaymentterm = (strIsSOTrx.equals(Y) ? data[0].cPaymenttermId :
data[0].poPaymenttermId);
+ if (strPaymentterm.equalsIgnoreCase()) {
+BpartnerMiscData[] paymentTerm =
BpartnerMiscData.selectPaymentTerm(this, strOrgId,
+vars.getClient());
+if (paymentTerm.length != 0) {
+ strPaymentterm = strPaymentterm.equals() ?
paymentTerm[0].cPaymenttermId
+ : strPaymentterm;
+}
+ }
+
strPaymentterm = strPaymentterm.equals() ? strPaymentterm0 :
strPaymentterm;
+
[OpenbravoERP-commits] stable/2.50: 2 new changesets
details: https://code.openbravo.com/erp/stable/2.50/rev/64d0b576207d
changeset: 9739:64d0b576207d
user: Ioritz Cia ioritz.cia at openbravo.com
date: Mon Nov 14 09:23:11 2011 +0100
summary: Fixes issue 18614: Default PaymentTerm is not working.
details: https://code.openbravo.com/erp/stable/2.50/rev/8b69b4fea671
changeset: 9740:8b69b4fea671
user: Ioritz Cia ioritz.cia at openbravo.com
date: Tue Nov 15 10:47:14 2011 +0100
summary: Fixes issue 18789: Suggested Work Requirement with zero quantity
should not become Work Requirement.
diffstat:
src-db/database/model/functions/MRP_WORKREQUIREMENT.xml| 1 +
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 7 +++
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 20
+++--
src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql | 13 ++
4 files changed, 36 insertions(+), 5 deletions(-)
diffs (107 lines):
diff -r 882fa1c6f142 -r 8b69b4fea671
src-db/database/model/functions/MRP_WORKREQUIREMENT.xml
--- a/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml Mon Nov 14
09:23:39 2011 +0100
+++ b/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml Tue Nov 15
10:47:14 2011 +0100
@@ -77,6 +77,7 @@
AND MRP_RUN_PRODUCTION_ID = v_Record_ID
AND INOUTTRXTYPE = 'WP'
AND MA_WORKREQUIREMENT_ID IS NULL
+AND MRP_RUN_PRODUCTIONLINE.QTY 0
ORDER BY PLANNEDDATE
) LOOP
v_ResultStr:='Create Work Requirement';
diff -r 882fa1c6f142 -r 8b69b4fea671
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java Mon Nov
14 09:23:39 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java Tue Nov
15 10:47:14 2011 +0100
@@ -131,6 +131,13 @@
resultado.append(new Array(\inpfinPaymentmethodId\, \ +
strFinPaymentMethodId + \),);
String PaymentTerm = (strIsSOTrx.equals(Y) ? data[0].cPaymenttermId
: data[0].poPaymenttermId);
+ if (PaymentTerm.equalsIgnoreCase()) {
+BpartnerMiscData[] paymentTerm =
BpartnerMiscData.selectPaymentTerm(this, strOrgId, vars
+.getClient());
+if (paymentTerm.length != 0) {
+ PaymentTerm = PaymentTerm.equals() ? paymentTerm[0].cPaymenttermId
: PaymentTerm;
+}
+ }
resultado.append(new Array(\inpcPaymenttermId\, \ + PaymentTerm +
\),);
FieldProvider[] tdv = null;
try {
diff -r 882fa1c6f142 -r 8b69b4fea671
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.javaMon Nov
14 09:23:39 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.javaTue Nov
15 10:47:14 2011 +0100
@@ -66,11 +66,12 @@
String strInvoiceRule = vars.getStringParameter(inpinvoicerule);
String strPriceList = vars.getStringParameter(inpmPricelistId);
String strDeliveryViaRule =
vars.getStringParameter(inpdeliveryviarule);
+ String strOrgId = vars.getStringParameter(inpadOrgId);
try {
printPage(response, vars, strBPartner, strOrderType, strIsSOTrx,
strWindowId, strLocation,
strContact, strProjectId, strTabId, strDeliveryRule, strUserRep,
strPaymentrule,
-strPaymentterm, strInvoiceRule, strPriceList, strDeliveryViaRule);
+strPaymentterm, strInvoiceRule, strPriceList, strDeliveryViaRule,
strOrgId);
} catch (ServletException ex) {
pageErrorCallOut(response);
}
@@ -82,7 +83,8 @@
String strOrderType, String strIsSOTrx, String strWindowId, String
strLocation,
String strContact, String strProjectId, String strTabId, String
strDeliveryRule0,
String strUserRep0, String strPaymentrule0, String strPaymentterm0,
String strInvoiceRule0,
- String strPriceList0, String strDeliveryViaRule0) throws IOException,
ServletException {
+ String strPriceList0, String strDeliveryViaRule0, String strOrgId)
throws IOException,
+ ServletException {
if (log4j.isDebugEnabled())
log4j.debug(Output: dataSheet);
@@ -100,8 +102,18 @@
strUserRep = strUserRep.equals() ? strUserRep0 : strUserRep;
strPaymentrule = (strIsSOTrx.equals(Y) ? data[0].paymentrule :
data[0].paymentrulepo);
strPaymentrule = strPaymentrule.equals() ? strPaymentrule0 :
strPaymentrule;
+
strPaymentterm = (strIsSOTrx.equals(Y) ? data[0].cPaymenttermId :
data[0].poPaymenttermId);
+ if (strPaymentterm.equalsIgnoreCase()) {
+BpartnerMiscData[] paymentTerm =
BpartnerMiscData.selectPaymentTerm(this, strOrgId, vars
+.getClient());
+if (paymentTerm.length != 0) {
+ strPaymentterm = strPaymentterm.equals() ?
paymentTerm[0].cPaymenttermId
+ : strPaymentterm;
+}
+ }
strPaymentterm = strPaymentterm.equals() ? strPaymentterm0 :
[OpenbravoERP-commits] stable/2.50: Fixed decimal separator issue in Credit to be used ...
details: https://code.openbravo.com/erp/stable/2.50/rev/679a0bcc50a4 changeset: 9741:679a0bcc50a4 user: Víctor Martínez Romanos victor.martinez at openbravo.com date: Tue Nov 15 11:02:57 2011 +0100 summary: Fixed decimal separator issue in Credit to be used field diffstat: src/org/openbravo/erpCommon/ad_actionButton/CreditPaymentGrid.html | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 8b69b4fea671 -r 679a0bcc50a4 src/org/openbravo/erpCommon/ad_actionButton/CreditPaymentGrid.html --- a/src/org/openbravo/erpCommon/ad_actionButton/CreditPaymentGrid.html Tue Nov 15 10:47:14 2011 +0100 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreditPaymentGrid.html Tue Nov 15 11:02:57 2011 +0100 @@ -245,6 +245,8 @@ input type=hidden name=inpwindowId value= id=window/input input type=hidden name=inpTabId value= id=tab/input input type=hidden name=inpadOrgId value= id=adOrgId/input +!-- Dummy value for FIN_Utilities.initFIN_Utilities() -- +input type=hidden name=isReceipt value=Y id=fieldReceipt/ div class=Popup_ContentPane_CircleLogo div class=Popup_WindowLogo -- RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixed decimal separator issue in Credit to be used field
details: https://code.openbravo.com/erp/devel/pi/rev/bedd10a9b003 changeset: 14254:bedd10a9b003 user: Víctor Martínez Romanos victor.martinez at openbravo.com date: Tue Nov 15 11:03:56 2011 +0100 summary: Fixed decimal separator issue in Credit to be used field diffstat: src/org/openbravo/erpCommon/ad_actionButton/CreditPaymentGrid.html | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r a650496b7e3b -r bedd10a9b003 src/org/openbravo/erpCommon/ad_actionButton/CreditPaymentGrid.html --- a/src/org/openbravo/erpCommon/ad_actionButton/CreditPaymentGrid.html Mon Nov 14 13:43:37 2011 +0100 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreditPaymentGrid.html Tue Nov 15 11:03:56 2011 +0100 @@ -247,6 +247,8 @@ input type=hidden name=inpwindowId value= id=window/input input type=hidden name=inpTabId value= id=tab/input input type=hidden name=inpadOrgId value= id=adOrgId/input +!-- Dummy value for FIN_Utilities.initFIN_Utilities() -- +input type=hidden name=isReceipt value=Y id=fieldReceipt/ div class=Popup_ContentPane_CircleLogo div class=Popup_WindowLogo -- RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 18878: Added advanced feature definition
details: https://code.openbravo.com/erp/devel/pi/rev/15d911f25076 changeset: 14255:15d911f25076 user: Asier Lostalé asier.lostale at openbravo.com date: Tue Nov 15 11:33:06 2011 +0100 summary: related to issue 18878: Added advanced feature definition diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FORM.xml |2 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml | 22 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PARAMETER.xml |3 - modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_IMPL.xml |4 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 37 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 31 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml |3 + modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml |2 + modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_WINDOW.xml |1 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_WINDOW.xml |2 + modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_PROCESS.xml |1 + modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_PROCESS.xml |1 + modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_WINDOW.xml |1 + modules/org.openbravo.service.integration.google/src-db/database/model/functions/OBSEIG_UPDATE_ACCESS.xml |3 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_WINDOW.xml |1 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml |1 + src-db/database/model/functions/AD_UPDATE_ACCESS.xml |9 +- src-db/database/model/tables/AD_FORM.xml |4 + src-db/database/model/tables/AD_PROCESS.xml |4 + src-db/database/model/tables/AD_ROLE.xml |4 + src-db/database/model/tables/AD_WINDOW.xml |4 + src-db/database/model/triggers/AD_ROLE_TRG.xml | 27 +- src-db/database/sourcedata/AD_COLUMN.xml | 147 +- src-db/database/sourcedata/AD_ELEMENT.xml | 16 + src-db/database/sourcedata/AD_FIELD.xml | 140 - src-db/database/sourcedata/AD_FORM.xml | 24 + src-db/database/sourcedata/AD_PROCESS.xml | 279 ++ src-db/database/sourcedata/AD_WINDOW.xml | 172 ++ 28 files changed, 914 insertions(+), 31 deletions(-) diffs (truncated from 4922 to 300 lines): diff -r bedd10a9b003 -r 15d911f25076 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FORM.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FORM.xml Tue Nov 15 11:03:56 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FORM.xml Tue Nov 15 11:33:06 2011 +0100 @@ -10,6 +10,7 @@ !--4201E189318E443297F6B23F03CABB9D-- ACCESSLEVEL![CDATA[3]]/ACCESSLEVEL !--4201E189318E443297F6B23F03CABB9D-- CLASSNAME![CDATA[org.openbravo.advpaymentmngt.ad_forms.Transactions]]/CLASSNAME !--4201E189318E443297F6B23F03CABB9D-- AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID +!--4201E189318E443297F6B23F03CABB9D-- ISADVANCEDFEATURE![CDATA[N]]/ISADVANCEDFEATURE !--4201E189318E443297F6B23F03CABB9D--/AD_FORM !--FE9623C32FE749DD803ED7C64CCD7405--AD_FORM @@ -23,6 +24,7 @@ !--FE9623C32FE749DD803ED7C64CCD7405-- ACCESSLEVEL![CDATA[3]]/ACCESSLEVEL !--FE9623C32FE749DD803ED7C64CCD7405-- CLASSNAME![CDATA[org.openbravo.advpaymentmngt.ad_forms.BatchPaymentExecution]]/CLASSNAME !--FE9623C32FE749DD803ED7C64CCD7405-- AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID +!--FE9623C32FE749DD803ED7C64CCD7405-- ISADVANCEDFEATURE![CDATA[N]]/ISADVANCEDFEATURE
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/234dc1964e6d
changeset: 14256:234dc1964e6d
user: Asier Lostalé asier.lostale at openbravo.com
date: Tue Nov 15 12:18:34 2011 +0100
summary: related to issue 18878: isAdvanced col is mandatory and has check
details: https://code.openbravo.com/erp/devel/pi/rev/c61120f1c12c
changeset: 14257:c61120f1c12c
user: Asier Lostalé asier.lostale at openbravo.com
date: Tue Nov 15 12:19:02 2011 +0100
summary: related to issue 18878: isAdvanced col is mandatory and has check
diffstat:
modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_IMPL.xml
| 3 ++-
src-db/database/model/tables/AD_FORM.xml
| 3 ++-
src-db/database/model/tables/AD_PROCESS.xml
| 3 ++-
src-db/database/model/tables/AD_WINDOW.xml
| 1 +
4 files changed, 7 insertions(+), 3 deletions(-)
diffs (71 lines):
diff -r 15d911f25076 -r c61120f1c12c
modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_IMPL.xml
---
a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_IMPL.xml
Tue Nov 15 11:33:06 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_IMPL.xml
Tue Nov 15 12:19:02 2011 +0100
@@ -53,7 +53,7 @@
default/
onCreateDefault/
/column
- column name=ISADVANCEDFEATURE primaryKey=false required=false
type=CHAR size=1 autoIncrement=false
+ column name=ISADVANCEDFEATURE primaryKey=false required=true
type=CHAR size=1 autoIncrement=false
default![CDATA[N]]/default
onCreateDefault![CDATA['N']]/onCreateDefault
/column
@@ -74,6 +74,7 @@
unique-column name=AD_MODULE_ID/
unique-column name=NAME/
/unique
+ check name=OBUIAPP_ADV_CHCK![CDATA[ISADVANCEDFEATURE IN ('Y',
'N')]]/check
check name=OBUIAPP_VI_ISACTIVE_CHECK![CDATA[ISACTIVE IN ('Y',
'N')]]/check
/table
/database
diff -r 15d911f25076 -r c61120f1c12c src-db/database/model/tables/AD_FORM.xml
--- a/src-db/database/model/tables/AD_FORM.xml Tue Nov 15 11:33:06 2011 +0100
+++ b/src-db/database/model/tables/AD_FORM.xml Tue Nov 15 12:19:02 2011 +0100
@@ -57,7 +57,7 @@
default![CDATA[0]]/default
onCreateDefault![CDATA[SELECT AD_MODULE_ID FROM AD_MODULE WHERE
AD_MODULE_ID'0' AND TYPE='M']]/onCreateDefault
/column
- column name=ISADVANCEDFEATURE primaryKey=false required=false
type=CHAR size=1 autoIncrement=false
+ column name=ISADVANCEDFEATURE primaryKey=false required=true
type=CHAR size=1 autoIncrement=false
default![CDATA[N]]/default
onCreateDefault![CDATA['N']]/onCreateDefault
/column
@@ -70,6 +70,7 @@
foreign-key foreignTable=AD_ORG name=AD_FORM_AD_ORG
reference local=AD_ORG_ID foreign=AD_ORG_ID/
/foreign-key
+ check name=AD_FORM_ADV_CHCK![CDATA[ISADVANCEDFEATURE IN ('Y',
'N')]]/check
check name=AD_FORM_ISACTIVE_CHECK![CDATA[ISACTIVE IN ('Y',
'N')]]/check
/table
/database
diff -r 15d911f25076 -r c61120f1c12c src-db/database/model/tables/AD_PROCESS.xml
--- a/src-db/database/model/tables/AD_PROCESS.xml Tue Nov 15 11:33:06
2011 +0100
+++ b/src-db/database/model/tables/AD_PROCESS.xml Tue Nov 15 12:19:02
2011 +0100
@@ -105,7 +105,7 @@
default![CDATA[S]]/default
onCreateDefault![CDATA[CASE WHEN PROCEDURENAME IS NOT NULL THEN 'S'
WHEN ISJASPER='Y' THEN 'S' ELSE 'M' END]]/onCreateDefault
/column
- column name=ISADVANCEDFEATURE primaryKey=false required=false
type=CHAR size=1 autoIncrement=false
+ column name=ISADVANCEDFEATURE primaryKey=false required=true
type=CHAR size=1 autoIncrement=false
default![CDATA[N]]/default
onCreateDefault![CDATA['N']]/onCreateDefault
/column
@@ -118,6 +118,7 @@
foreign-key foreignTable=AD_ORG name=AD_PROCESS_AD_ORG
reference local=AD_ORG_ID foreign=AD_ORG_ID/
/foreign-key
+ check name=AD_PROCESS_ADV_CHCK![CDATA[ISADVANCEDFEATURE IN ('Y',
'N')]]/check
check name=AD_PROCESS_ISACTIVE_CHK![CDATA[ISACTIVE IN ('Y',
'N')]]/check
check name=AD_PROCESS_ISBACKGROUND_CHK![CDATA[ISBACKGROUND IN ('Y',
'N')]]/check
check name=AD_PROCESS_ISDIRECTPRINT_CHK![CDATA[ISDIRECTPRINT IN
('Y', 'N')]]/check
diff -r 15d911f25076 -r c61120f1c12c src-db/database/model/tables/AD_WINDOW.xml
--- a/src-db/database/model/tables/AD_WINDOW.xmlTue Nov 15 11:33:06
2011 +0100
+++ b/src-db/database/model/tables/AD_WINDOW.xmlTue Nov 15 12:19:02
2011 +0100
@@ -94,6 +94,7 @@
unique-column name=NAME/
unique-column name=AD_MODULE_ID/
/unique
+ check name=AD_WINDOW_ADV_CHCK![CDATA[ISADVANCEDFEATURE IN ('Y',
'N')]]/check
check
[OpenbravoERP-commits] stable/2.50: Fixes issue 0018869: The General Ledger Report does...
details: https://code.openbravo.com/erp/stable/2.50/rev/4aef77ce4df8
changeset: 9742:4aef77ce4df8
user: Jon Alegría jon.alegria at openbravo.com
date: Tue Nov 15 12:37:08 2011 +0100
summary: Fixes issue 0018869: The General Ledger Report does not show
properly data
depending of the organization, when the organization is *
In html format, a warning is shown when the fiscal year initial date can
not be found regarding the date from selected in the filter.
diffstat:
src-db/database/sourcedata/AD_MESSAGE.xml| 11
+
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 21
++---
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql | 5 +-
3 files changed, 29 insertions(+), 8 deletions(-)
diffs (94 lines):
diff -r 679a0bcc50a4 -r 4aef77ce4df8 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Tue Nov 15 11:02:57 2011 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Tue Nov 15 12:37:08 2011 +0100
@@ -32547,6 +32547,17 @@
!--8DA2AC3A69BF4686A821CA634149C501--
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
!--8DA2AC3A69BF4686A821CA634149C501--/AD_MESSAGE
+!--8DACEA313A3D4A94877E7218881DCCC2--AD_MESSAGE
+!--8DACEA313A3D4A94877E7218881DCCC2--
AD_MESSAGE_ID![CDATA[8DACEA313A3D4A94877E7218881DCCC2]]/AD_MESSAGE_ID
+!--8DACEA313A3D4A94877E7218881DCCC2--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--8DACEA313A3D4A94877E7218881DCCC2-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--8DACEA313A3D4A94877E7218881DCCC2-- ISACTIVE![CDATA[Y]]/ISACTIVE
+!--8DACEA313A3D4A94877E7218881DCCC2--
VALUE![CDATA[InitialDateNotFoundCalendar]]/VALUE
+!--8DACEA313A3D4A94877E7218881DCCC2-- MSGTEXT![CDATA[The initial date
for the fiscal calendar can not be retrieved. The initial balance could not
show the real initial balance.]]/MSGTEXT
+!--8DACEA313A3D4A94877E7218881DCCC2-- MSGTYPE![CDATA[W]]/MSGTYPE
+!--8DACEA313A3D4A94877E7218881DCCC2--
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
+!--8DACEA313A3D4A94877E7218881DCCC2--/AD_MESSAGE
+
!--8DB007EDD43F487790B3E304D41C39E6--AD_MESSAGE
!--8DB007EDD43F487790B3E304D41C39E6--
AD_MESSAGE_ID![CDATA[8DB007EDD43F487790B3E304D41C39E6]]/AD_MESSAGE_ID
!--8DB007EDD43F487790B3E304D41C39E6--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
diff -r 679a0bcc50a4 -r 4aef77ce4df8
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Tue Nov
15 11:02:57 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Tue Nov
15 12:37:08 2011 +0100
@@ -244,11 +244,11 @@
// String strTreeAccount = ReportTrialBalanceData.treeAccount(this,
vars.getClient());
String strOrgFamily = getFamily(strTreeOrg, strOrg);
String strFinancialOrgFamily = getFinancialFamily(strTreeOrg, strOrg,
vars.getClient());
-String strYearInitialDate = ReportGeneralLedgerData.yearInitialDate(this,
vars
+String strExistsInitialDate =
ReportGeneralLedgerData.yearInitialDate(this, vars
.getSessionValue(#AD_SqlDateFormat), strDateFrom,
Utility.getContext(this, vars,
#User_Client, ReportGeneralLedger), strFinancialOrgFamily);
-if (strYearInitialDate.equals())
- strYearInitialDate = strDateFrom;
+String strYearInitialDate = strDateFrom;
+if (strExistsInitialDate.equals()) strYearInitialDate =
strExistsInitialDate;
String toDatePlusOne = DateTimeData.nDaysAfter(this, strDateTo, 1);
String strGroupByText = (strGroupBy.equals(BPartner) ?
Utility.messageBD(this, BusPartner,
@@ -461,6 +461,13 @@
log4j.debug(data.length: + data.length);
if (data != null data.length 0) {
+ if (strExistsInitialDate.equals() vars.commandIn(FIND)) {
+xmlDocument.setParameter(messageType, WARNING);
+ xmlDocument.setParameter(messageTitle,
+ Utility.messageBD(this, ProcessStatus-W, vars.getLanguage()));
+ xmlDocument.setParameter(messageMessage,
+ Utility.messageBD(this, InitialDateNotFoundCalendar,
vars.getLanguage()));
+ }
if (strGroupBy.equals())
xmlDocument.setData(structure1, data);
else
@@ -506,8 +513,8 @@
String strYearInitialDate = ReportGeneralLedgerData.yearInitialDate(this,
vars
.getSessionValue(#AD_SqlDateFormat), strDateFrom,
Utility.getContext(this, vars,
#User_Client, ReportGeneralLedger), strFinancialOrgFamily);
-if (strYearInitialDate.equals())
- strYearInitialDate = strDateFrom;
+if (strYearInitialDate.equals()) strYearInitialDate = strDateFrom;
+
String toDatePlusOne = DateTimeData.nDaysAfter(this, strDateTo, 1);
String strGroupByText = (strGroupBy.equals(BPartner) ?
Utility.messageBD(this, BusPartner,
@@ -608,8 +615,8 @@
String strYearInitialDate = ReportGeneralLedgerData.yearInitialDate(this,
vars
.getSessionValue(#AD_SqlDateFormat), strDateFrom,
Utility.getContext(this, vars,
#User_Client,
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/fca96e7640ff
changeset: 14259:fca96e7640ff
user: Asier Lostalé asier.lostale at openbravo.com
date: Tue Nov 15 12:44:56 2011 +0100
summary: added boolean check to ad_element.isGlossary
details: https://code.openbravo.com/erp/devel/pi/rev/bc8969312b17
changeset: 14260:bc8969312b17
user: Asier Lostalé asier.lostale at openbravo.com
date: Tue Nov 15 12:45:27 2011 +0100
summary: related to issue 18878: added boolean check to ad_role.isAdvanced
diffstat:
src-db/database/model/tables/AD_ELEMENT.xml | 1 +
src-db/database/model/tables/AD_ROLE.xml| 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diffs (21 lines):
diff -r 014ff1ba6d49 -r bc8969312b17 src-db/database/model/tables/AD_ELEMENT.xml
--- a/src-db/database/model/tables/AD_ELEMENT.xml Tue Nov 15 12:27:11
2011 +0100
+++ b/src-db/database/model/tables/AD_ELEMENT.xml Tue Nov 15 12:45:27
2011 +0100
@@ -97,5 +97,6 @@
index-column name=NAME/
/index
check name=AD_ELEMENT_ISACTIVE_CHECK![CDATA[ISACTIVE IN ('Y',
'N')]]/check
+ check name=AD_EMENT_GLOSSARY_CHCK![CDATA[ISGLOSSARY IN ('Y',
'N')]]/check
/table
/database
diff -r 014ff1ba6d49 -r bc8969312b17 src-db/database/model/tables/AD_ROLE.xml
--- a/src-db/database/model/tables/AD_ROLE.xml Tue Nov 15 12:27:11 2011 +0100
+++ b/src-db/database/model/tables/AD_ROLE.xml Tue Nov 15 12:45:27 2011 +0100
@@ -97,6 +97,7 @@
unique-column name=AD_CLIENT_ID/
unique-column name=NAME/
/unique
+ check name=AD_FORM_ADV_CHCK![CDATA[ISADVANCED IN ('Y',
'N')]]/check
check name=AD_ROLE_ISACTIVE_CHECK![CDATA[ISACTIVE IN ('Y',
'N')]]/check
check name=AD_ROLE_ISCLIENTADMIN_CHECK![CDATA[IS_CLIENT_ADMIN IN
('Y', 'N')]]/check
/table
--
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] stable/2.50: Fixes issue 0018956: Generate Standards process sho...
details: https://code.openbravo.com/erp/stable/2.50/rev/94de727f4381 changeset: 9743:94de727f4381 user: Jon Alegría jon.alegria at openbravo.com date: Tue Nov 15 12:55:20 2011 +0100 summary: Fixes issue 0018956: Generate Standards process should not consider production lines with qty zero diffstat: src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 4aef77ce4df8 -r 94de727f4381 src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml --- a/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml Tue Nov 15 12:37:08 2011 +0100 +++ b/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml Tue Nov 15 12:55:20 2011 +0100 @@ -87,6 +87,7 @@ AND M_PRODUCTIONLINE.C_UOM_ID = C_UOM.C_UOM_ID AND M_PRODUCTION_ID = v_Production_Id AND M_PRODUCTIONPLAN.line v_Line + AND M_PRODUCTIONLINE.movementqty 0 AND M_PRODUCTIONLINE.M_PRODUCT_ID = v_product_old AND M_PRODUCTIONLINE.C_UOM_ID = v_UOM_Old AND (v_Product_UOM_old IS NULL OR M_PRODUCTIONLINE.M_Product_UOM_id = v_Product_UOM_old) -- RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixed typos
details: https://code.openbravo.com/erp/devel/pi/rev/5b6a5b76293a
changeset: 14261:5b6a5b76293a
user: Asier Lostalé asier.lostale at openbravo.com
date: Tue Nov 15 13:06:27 2011 +0100
summary: fixed typos
diffstat:
src-db/database/model/tables/AD_ELEMENT.xml | 2 +-
src-db/database/model/tables/AD_ROLE.xml| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diffs (23 lines):
diff -r bc8969312b17 -r 5b6a5b76293a src-db/database/model/tables/AD_ELEMENT.xml
--- a/src-db/database/model/tables/AD_ELEMENT.xml Tue Nov 15 12:45:27
2011 +0100
+++ b/src-db/database/model/tables/AD_ELEMENT.xml Tue Nov 15 13:06:27
2011 +0100
@@ -97,6 +97,6 @@
index-column name=NAME/
/index
check name=AD_ELEMENT_ISACTIVE_CHECK![CDATA[ISACTIVE IN ('Y',
'N')]]/check
- check name=AD_EMENT_GLOSSARY_CHCK![CDATA[ISGLOSSARY IN ('Y',
'N')]]/check
+ check name=AD_ELEMENT_GLOSSARY_CHCK![CDATA[ISGLOSSARY IN ('Y',
'N')]]/check
/table
/database
diff -r bc8969312b17 -r 5b6a5b76293a src-db/database/model/tables/AD_ROLE.xml
--- a/src-db/database/model/tables/AD_ROLE.xml Tue Nov 15 12:45:27 2011 +0100
+++ b/src-db/database/model/tables/AD_ROLE.xml Tue Nov 15 13:06:27 2011 +0100
@@ -97,7 +97,7 @@
unique-column name=AD_CLIENT_ID/
unique-column name=NAME/
/unique
- check name=AD_FORM_ADV_CHCK![CDATA[ISADVANCED IN ('Y',
'N')]]/check
+ check name=AD_ROLE_ADV_CHCK![CDATA[ISADVANCED IN ('Y',
'N')]]/check
check name=AD_ROLE_ISACTIVE_CHECK![CDATA[ISACTIVE IN ('Y',
'N')]]/check
check name=AD_ROLE_ISCLIENTADMIN_CHECK![CDATA[IS_CLIENT_ADMIN IN
('Y', 'N')]]/check
/table
--
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] stable/2.50: Fixes issue 0018970: Campaign accounting dimension ...
details: https://code.openbravo.com/erp/stable/2.50/rev/27920a54cb71 changeset: 9744:27920a54cb71 user: Jon Alegría jon.alegria at openbravo.com date: Tue Nov 15 14:44:16 2011 +0100 summary: Fixes issue 0018970: Campaign accounting dimension is not properly carried when posting matched invoice diffstat: src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 94de727f4381 -r 27920a54cb71 src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql --- a/src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsqlTue Nov 15 12:55:20 2011 +0100 +++ b/src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsqlTue Nov 15 14:44:16 2011 +0100 @@ -48,7 +48,7 @@ M.UPDATEDBY, M.M_INOUTLINE_ID, M.C_INVOICELINE_ID, M.M_PRODUCT_ID, M.DATETRX, M.QTY, M.PROCESSING, M.PROCESSED, M.POSTED, M.DATETRX AS DATEACCT, M.DATETRX AS DATEDOC, I.C_BPARTNER_ID, IO.DATEACCT as orderAcctDate, IO.DOCSTATUS AS INOUTSTATUS, I.DOCSTATUS AS INVOICESTATUS, IOL.MOVEMENTQTY, IL.QTYINVOICED, -I.C_PROJECT_ID, IO.C_PROJECT_ID AS INOUTPROJECT +I.C_PROJECT_ID, IO.C_PROJECT_ID AS INOUTPROJECT, I.C_CAMPAIGN_ID FROM M_MATCHINV M, C_INVOICELINE IL, C_INVOICE I, M_INOUTLINE IOL, M_INOUT IO WHERE IL.C_INVOICELINE_ID = M.C_INVOICELINE_ID AND IL.C_INVOICE_ID = I.C_INVOICE_ID -- RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 0019073: Campaign accounting dimension is ...
details: https://code.openbravo.com/erp/devel/pi/rev/30794ce2a5a6 changeset: 14262:30794ce2a5a6 user: Jon Alegría jon.alegria at openbravo.com date: Tue Nov 15 14:59:23 2011 +0100 summary: Fixes issue 0019073: Campaign accounting dimension is not properly carried when posting matched invoice diffstat: src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5b6a5b76293a -r 30794ce2a5a6 src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql --- a/src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsqlTue Nov 15 13:06:27 2011 +0100 +++ b/src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsqlTue Nov 15 14:59:23 2011 +0100 @@ -48,7 +48,7 @@ M.UPDATEDBY, M.M_INOUTLINE_ID, M.C_INVOICELINE_ID, M.M_PRODUCT_ID, M.DATETRX, M.QTY, M.PROCESSING, M.PROCESSED, M.POSTED, M.DATETRX AS DATEACCT, M.DATETRX AS DATEDOC, I.C_BPARTNER_ID, IO.DATEACCT as orderAcctDate, IO.DOCSTATUS AS INOUTSTATUS, I.DOCSTATUS AS INVOICESTATUS, IOL.MOVEMENTQTY, IL.QTYINVOICED, -I.C_PROJECT_ID, IO.C_PROJECT_ID AS INOUTPROJECT +I.C_PROJECT_ID, IO.C_PROJECT_ID AS INOUTPROJECT, I.C_CAMPAIGN_ID FROM M_MATCHINV M, C_INVOICELINE IL, C_INVOICE I, M_INOUTLINE IOL, M_INOUT IO WHERE IL.C_INVOICELINE_ID = M.C_INVOICELINE_ID AND IL.C_INVOICE_ID = I.C_INVOICE_ID -- RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixed db inconsistency
details: https://code.openbravo.com/erp/devel/pi/rev/d966900b1e6b
changeset: 14263:d966900b1e6b
user: Asier Lostalé asier.lostale at openbravo.com
date: Tue Nov 15 15:17:29 2011 +0100
summary: fixed db inconsistency
diffstat:
src-db/database/model/tables/AD_ELEMENT.xml | 2 +-
src-db/database/model/tables/AD_ROLE.xml| 2 +-
src-db/database/sourcedata/AD_COLUMN.xml| 1 +
src-db/database/sourcedata/AD_ELEMENT.xml | 14 ++
4 files changed, 17 insertions(+), 2 deletions(-)
diffs (59 lines):
diff -r 30794ce2a5a6 -r d966900b1e6b src-db/database/model/tables/AD_ELEMENT.xml
--- a/src-db/database/model/tables/AD_ELEMENT.xml Tue Nov 15 14:59:23
2011 +0100
+++ b/src-db/database/model/tables/AD_ELEMENT.xml Tue Nov 15 15:17:29
2011 +0100
@@ -96,7 +96,7 @@
index name=AD_ELEMENT_NAME unique=false
index-column name=NAME/
/index
+ check name=AD_ELEMENT_GLOSSARY_CHCK![CDATA[ISGLOSSARY IN ('Y',
'N')]]/check
check name=AD_ELEMENT_ISACTIVE_CHECK![CDATA[ISACTIVE IN ('Y',
'N')]]/check
- check name=AD_ELEMENT_GLOSSARY_CHCK![CDATA[ISGLOSSARY IN ('Y',
'N')]]/check
/table
/database
diff -r 30794ce2a5a6 -r d966900b1e6b src-db/database/model/tables/AD_ROLE.xml
--- a/src-db/database/model/tables/AD_ROLE.xml Tue Nov 15 14:59:23 2011 +0100
+++ b/src-db/database/model/tables/AD_ROLE.xml Tue Nov 15 15:17:29 2011 +0100
@@ -97,7 +97,7 @@
unique-column name=AD_CLIENT_ID/
unique-column name=NAME/
/unique
- check name=AD_ROLE_ADV_CHCK![CDATA[ISADVANCED IN ('Y',
'N')]]/check
+ check name=AD_FORM_ADV_CHCK![CDATA[ISADVANCED IN ('Y',
'N')]]/check
check name=AD_ROLE_ISACTIVE_CHECK![CDATA[ISACTIVE IN ('Y',
'N')]]/check
check name=AD_ROLE_ISCLIENTADMIN_CHECK![CDATA[IS_CLIENT_ADMIN IN
('Y', 'N')]]/check
/table
diff -r 30794ce2a5a6 -r d966900b1e6b src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Nov 15 14:59:23 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Nov 15 15:17:29 2011 +0100
@@ -238341,6 +238341,7 @@
!--6C31A2B3095F4691895B92C158391497--
ISTRANSLATED![CDATA[N]]/ISTRANSLATED
!--6C31A2B3095F4691895B92C158391497--
ISENCRYPTED![CDATA[N]]/ISENCRYPTED
!--6C31A2B3095F4691895B92C158391497--
ISSELECTIONCOLUMN![CDATA[N]]/ISSELECTIONCOLUMN
+!--6C31A2B3095F4691895B92C158391497--
AD_ELEMENT_ID![CDATA[B99E543EAE5B4F97A3B7B5EEF28E5249]]/AD_ELEMENT_ID
!--6C31A2B3095F4691895B92C158391497--
ISSESSIONATTR![CDATA[N]]/ISSESSIONATTR
!--6C31A2B3095F4691895B92C158391497--
ISSECONDARYKEY![CDATA[N]]/ISSECONDARYKEY
!--6C31A2B3095F4691895B92C158391497--
ISDESENCRYPTABLE![CDATA[N]]/ISDESENCRYPTABLE
diff -r 30794ce2a5a6 -r d966900b1e6b src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Tue Nov 15 14:59:23 2011 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Tue Nov 15 15:17:29 2011 +0100
@@ -27205,6 +27205,20 @@
!--B7E8DC4F085C46F3842E1AF96300D78B-- ISGLOSSARY![CDATA[N]]/ISGLOSSARY
!--B7E8DC4F085C46F3842E1AF96300D78B--/AD_ELEMENT
+!--B99E543EAE5B4F97A3B7B5EEF28E5249--AD_ELEMENT
+!--B99E543EAE5B4F97A3B7B5EEF28E5249--
AD_ELEMENT_ID![CDATA[B99E543EAE5B4F97A3B7B5EEF28E5249]]/AD_ELEMENT_ID
+!--B99E543EAE5B4F97A3B7B5EEF28E5249--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--B99E543EAE5B4F97A3B7B5EEF28E5249-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--B99E543EAE5B4F97A3B7B5EEF28E5249-- ISACTIVE![CDATA[Y]]/ISACTIVE
+!--B99E543EAE5B4F97A3B7B5EEF28E5249--
COLUMNNAME![CDATA[IsAdvanced]]/COLUMNNAME
+!--B99E543EAE5B4F97A3B7B5EEF28E5249-- NAME![CDATA[Advanced]]/NAME
+!--B99E543EAE5B4F97A3B7B5EEF28E5249--
PRINTNAME![CDATA[Advanced]]/PRINTNAME
+!--B99E543EAE5B4F97A3B7B5EEF28E5249-- DESCRIPTION![CDATA[Automatic
advanced roles are granted with advanced features]]/DESCRIPTION
+!--B99E543EAE5B4F97A3B7B5EEF28E5249-- HELP![CDATA[Automatic (non manual)
advanced roles are granted with features checked as advanced.]]/HELP
+!--B99E543EAE5B4F97A3B7B5EEF28E5249--
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
+!--B99E543EAE5B4F97A3B7B5EEF28E5249-- ISGLOSSARY![CDATA[N]]/ISGLOSSARY
+!--B99E543EAE5B4F97A3B7B5EEF28E5249--/AD_ELEMENT
+
!--BD2D5C4D0AED4962B1EDF25726015579--AD_ELEMENT
!--BD2D5C4D0AED4962B1EDF25726015579--
AD_ELEMENT_ID![CDATA[BD2D5C4D0AED4962B1EDF25726015579]]/AD_ELEMENT_ID
!--BD2D5C4D0AED4962B1EDF25726015579--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
--
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixed issue 0018796: User interface is the old one, wh...
details: https://code.openbravo.com/erp/devel/pi/rev/4dc329755d04 changeset: 14264:4dc329755d04 user: David Miguelez david.miguelez at openbravo.com date: Mon Nov 14 13:17:08 2011 +0100 summary: Fixed issue 0018796: User interface is the old one, when navigating from general ledger report. diffstat: src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 24 +- src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 20 src-db/database/sourcedata/AD_PROCESS.xml | 3 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html | 23 +- 4 files changed, 46 insertions(+), 24 deletions(-) diffs (138 lines): diff -r d966900b1e6b -r 4dc329755d04 src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xmlTue Nov 15 15:17:29 2011 +0100 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xmlMon Nov 14 13:17:08 2011 +0100 @@ -1656,18 +1656,6 @@ !--801011-- OBJECT_TYPE![CDATA[S]]/OBJECT_TYPE !--801011--/AD_MODEL_OBJECT -!--801013--AD_MODEL_OBJECT -!--801013-- AD_MODEL_OBJECT_ID![CDATA[801013]]/AD_MODEL_OBJECT_ID -!--801013-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID -!--801013-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID -!--801013-- ISACTIVE![CDATA[Y]]/ISACTIVE -!--801013-- ACTION![CDATA[R]]/ACTION -!--801013-- CLASSNAME![CDATA[org.openbravo.erpCommon.ad_reports.ReportGeneralLedgerJournalDetail]]/CLASSNAME -!--801013-- ISDEFAULT![CDATA[N]]/ISDEFAULT -!--801013-- AD_PROCESS_ID![CDATA[80]]/AD_PROCESS_ID -!--801013-- OBJECT_TYPE![CDATA[S]]/OBJECT_TYPE -!--801013--/AD_MODEL_OBJECT - !--801017--AD_MODEL_OBJECT !--801017-- AD_MODEL_OBJECT_ID![CDATA[801017]]/AD_MODEL_OBJECT_ID !--801017-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID @@ -4042,6 +4030,18 @@ !--CE710B1C239D491F8A7D98407283FACE-- OBJECT_TYPE![CDATA[S]]/OBJECT_TYPE !--CE710B1C239D491F8A7D98407283FACE--/AD_MODEL_OBJECT +!--D8CFF08E85FF4B39A9E841EC2FA20017--AD_MODEL_OBJECT +!--D8CFF08E85FF4B39A9E841EC2FA20017-- AD_MODEL_OBJECT_ID![CDATA[D8CFF08E85FF4B39A9E841EC2FA20017]]/AD_MODEL_OBJECT_ID +!--D8CFF08E85FF4B39A9E841EC2FA20017-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID +!--D8CFF08E85FF4B39A9E841EC2FA20017-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID +!--D8CFF08E85FF4B39A9E841EC2FA20017-- ISACTIVE![CDATA[Y]]/ISACTIVE +!--D8CFF08E85FF4B39A9E841EC2FA20017-- ACTION![CDATA[R]]/ACTION +!--D8CFF08E85FF4B39A9E841EC2FA20017-- CLASSNAME![CDATA[org.openbravo.erpCommon.ad_reports.ReportGeneralLedgerJournalDetail]]/CLASSNAME +!--D8CFF08E85FF4B39A9E841EC2FA20017-- ISDEFAULT![CDATA[N]]/ISDEFAULT +!--D8CFF08E85FF4B39A9E841EC2FA20017-- AD_PROCESS_ID![CDATA[800133]]/AD_PROCESS_ID +!--D8CFF08E85FF4B39A9E841EC2FA20017-- OBJECT_TYPE![CDATA[S]]/OBJECT_TYPE +!--D8CFF08E85FF4B39A9E841EC2FA20017--/AD_MODEL_OBJECT + !--DF2601D0FF9041F49B069600B7603FE0--AD_MODEL_OBJECT !--DF2601D0FF9041F49B069600B7603FE0-- AD_MODEL_OBJECT_ID![CDATA[DF2601D0FF9041F49B069600B7603FE0]]/AD_MODEL_OBJECT_ID !--DF2601D0FF9041F49B069600B7603FE0-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID diff -r d966900b1e6b -r 4dc329755d04 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xmlTue Nov 15 15:17:29 2011 +0100 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xmlMon Nov 14 13:17:08 2011 +0100 @@ -1550,16 +1550,6 @@ !--801303-- ISDEFAULT![CDATA[N]]/ISDEFAULT !--801303--/AD_MODEL_OBJECT_MAPPING -!--801306--AD_MODEL_OBJECT_MAPPING -!--801306-- AD_MODEL_OBJECT_MAPPING_ID![CDATA[801306]]/AD_MODEL_OBJECT_MAPPING_ID -!--801306-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID -!--801306-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID -!--801306-- ISACTIVE![CDATA[Y]]/ISACTIVE -!--801306-- AD_MODEL_OBJECT_ID![CDATA[801013]]/AD_MODEL_OBJECT_ID -!--801306-- MAPPINGNAME![CDATA[/ad_reports/ReportGeneralLedgerJournalDetail.html]]/MAPPINGNAME -!--801306-- ISDEFAULT![CDATA[Y]]/ISDEFAULT -!--801306--/AD_MODEL_OBJECT_MAPPING - !--801317--AD_MODEL_OBJECT_MAPPING !--801317-- AD_MODEL_OBJECT_MAPPING_ID![CDATA[801317]]/AD_MODEL_OBJECT_MAPPING_ID !--801317-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID @@ -3680,6 +3670,16 @@ !--332827CF4E354EF8A92A4A708E166BA0-- ISDEFAULT![CDATA[N]]/ISDEFAULT !--332827CF4E354EF8A92A4A708E166BA0--/AD_MODEL_OBJECT_MAPPING +!--33A86B8C20B541B89FDEA5176D4394F5--AD_MODEL_OBJECT_MAPPING +!--33A86B8C20B541B89FDEA5176D4394F5-- AD_MODEL_OBJECT_MAPPING_ID![CDATA[33A86B8C20B541B89FDEA5176D4394F5]]/AD_MODEL_OBJECT_MAPPING_ID +!--33A86B8C20B541B89FDEA5176D4394F5-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID +!--33A86B8C20B541B89FDEA5176D4394F5-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID +!--33A86B8C20B541B89FDEA5176D4394F5-- ISACTIVE![CDATA[Y]]/ISACTIVE +!--33A86B8C20B541B89FDEA5176D4394F5-- AD_MODEL_OBJECT_ID![CDATA[D8CFF08E85FF4B39A9E841EC2FA20017]]/AD_MODEL_OBJECT_ID +!--33A86B8C20B541B89FDEA5176D4394F5--
[OpenbravoERP-commits] devel/main: 6 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/f063ce238a94 changeset: 14249:f063ce238a94 user: Jon Alegría jon.alegria at openbravo.com date: Mon Nov 14 18:51:04 2011 +0100 summary: Fixes issue 0019062: Report General Ledger shows a NullPointerException The null pointer exception is solved. In html format, a warning is shown when the fiscal year initial date can not be found regarding the date from selected in the filter. details: https://code.openbravo.com/erp/devel/main/rev/2f7cfb5ae81b changeset: 14250:2f7cfb5ae81b user: David Baz Fayos david.baz at openbravo.com date: Mon Nov 14 21:30:27 2011 +0100 summary: Fixed issue 15348: no scrollbars in STD community branding details: https://code.openbravo.com/erp/devel/main/rev/99105c8bf13a changeset: 14251:99105c8bf13a user: RM packaging bot staff.rm at openbravo.com date: Tue Nov 15 02:58:42 2011 +0100 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/ac90098fce28 changeset: 14252:ac90098fce28 user: Ioritz Cia ioritz.cia at openbravo.com date: Fri Nov 11 14:35:56 2011 +0100 summary: Fixes issue 18613: Default PaymentTerm is not working. details: https://code.openbravo.com/erp/devel/main/rev/a650496b7e3b changeset: 14253:a650496b7e3b user: Ioritz Cia ioritz.cia at openbravo.com date: Mon Nov 14 13:43:37 2011 +0100 summary: Fixes issue 18788: Suggested Work Requirement with zero quantity should not become Work Requirement. details: https://code.openbravo.com/erp/devel/main/rev/22d704d9f2e8 changeset: 14254:22d704d9f2e8 user: RM packaging bot staff.rm at openbravo.com date: Tue Nov 15 16:55:39 2011 +0100 summary: CI: update AD_MODULE to version 14253 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/22d704d9f2e8 changeset: 14265:22d704d9f2e8 user: RM packaging bot staff.rm at openbravo.com date: Tue Nov 15 16:55:39 2011 +0100 summary: CI: update AD_MODULE to version 14253 details: https://code.openbravo.com/erp/devel/pi/rev/468f665414af changeset: 14266:468f665414af user: RM packaging bot staff.rm at openbravo.com date: Tue Nov 15 17:03:51 2011 +0100 summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FORM.xml |2 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml | 22 + modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_IMPL.xml |5 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 37 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 31 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml |3 + modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml |2 + modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |6 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_WINDOW.xml |1 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |4 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_WINDOW.xml |2 + modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_PROCESS.xml |1 + modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_PROCESS.xml |1 + modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_WINDOW.xml |1 + modules/org.openbravo.service.integration.google/src-db/database/model/functions/OBSEIG_UPDATE_ACCESS.xml |3 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |4 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_WINDOW.xml |1 +
[OpenbravoERP-commits] devel/pi: fixed bug 18564: Business Partner Selector shows inact...
details: https://code.openbravo.com/erp/devel/pi/rev/1c545be20823 changeset: 14268:1c545be20823 user: Asier Lostalé asier.lostale at openbravo.com date: Tue Nov 15 17:41:50 2011 +0100 summary: fixed bug 18564: Business Partner Selector shows inactive contacts or addresses diffstat: src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 8 1 files changed, 4 insertions(+), 4 deletions(-) diffs (19 lines): diff -r 5a9ee4eba052 -r 1c545be20823 src-db/database/sourcedata/OBUISEL_SELECTOR.xml --- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Tue Nov 15 17:33:17 2011 +0100 +++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Tue Nov 15 17:41:50 2011 +0100 @@ -82,11 +82,11 @@ COALESCE(contact.name, usercontact.name) as contactname, COALESCE(contact.id, usercontact.id) as contactid, bploc.name as locationname, bploc.id as locationid, bp.customer as customer, bp.vendor as vendor, bp.lifetimeRevenueToDate as income -FROM BusinessPartner bp left join bp.businessPartnerLocationList bploc -left join bploc.locationAddress loc -left join bploc.aDUserList contact +FROM BusinessPartner bp left join bp.businessPartnerLocationList bploc with bploc.active=true +left join bploc.locationAddress loc with loc.active = true +left join bploc.aDUserList contact with contact.active=true left join loc.region region -left join bp.aDUserList usercontact with usercontact.partnerAddress.id is null +left join bp.aDUserList usercontact with usercontact.partnerAddress.id is null and usercontact.active=true where @additional_filters@ and bp.summaryLevel = false]]/HQL !--862F54CB1B074513BD791C6789F4AA42-- ENTITY_ALIAS![CDATA[bp]]/ENTITY_ALIAS -- RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixed issue 16970: Edit widget button now has hover ef...
details: https://code.openbravo.com/erp/devel/pi/rev/0ceac78561f5
changeset: 14269:0ceac78561f5
user: David Baz Fayos david.baz at openbravo.com
date: Tue Nov 15 22:58:04 2011 +0100
summary: Fixed issue 16970: Edit widget button now has hover effect
diffstat:
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
| 9
++---
modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.js
| 10 ++
2 files changed, 8 insertions(+), 11 deletions(-)
diffs (46 lines):
diff -r 1c545be20823 -r 0ceac78561f5
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
---
a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
Tue Nov 15 17:41:50 2011 +0100
+++
b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
Tue Nov 15 22:58:04 2011 +0100
@@ -50,16 +50,11 @@
//
// == OBWidgetMenuItem ==
//
-isc.defineClass('OBWidgetMenuItem', isc.IMenuButton).addProperties({
+isc.defineClass('OBWidgetMenuItem', isc.MenuButton).addProperties({
widget: null,
menu: null,
- // only show the middle image without stretch appended
- items: [{
-name: '',
-width: '*',
-height: '*'
- }],
+ title: '',
editFormLayout: null,
windowContents: null,
diff -r 1c545be20823 -r 0ceac78561f5
modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.js
---
a/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.js
Tue Nov 15 17:41:50 2011 +0100
+++
b/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.js
Tue Nov 15 22:58:04 2011 +0100
@@ -29,14 +29,16 @@
showIcon: false,
showOver: true,
showRollOver: true,
+ showRollOverIcon: true,
showDown: false,
showFocused: false,
showFocusedAsOver: false,
- showTitle: false,
- imageType: isc.Img.CENTER,
+ iconWidth: 18,
+ iconHeight: 18,
+ iconSpacing: 2,
width: 24,
- height: 24,
- src: OB.Styles.skinsPath +
'Default/org.openbravo.client.myob/images/widget/edit.png',
+ height: 18,
+ menuButtonImage: OB.Styles.skinsPath +
'Default/org.openbravo.client.myob/images/widget/edit.png',
baseStyle: 'OBWidgetMenuButton',
overflow: 'visible'
});
--
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
