[OpenbravoERP-commits] devel/pi: Fixes issue 21998: After completing a sales order/invo...
details: https://code.openbravo.com/erp/devel/pi/rev/f80e9950e5af changeset: 19108:f80e9950e5af user: Ioritz Cia ioritz.cia at openbravo.com date: Wed Dec 26 12:37:19 2012 +0100 summary: Fixes issue 21998: After completing a sales order/invoice the BOM product does not appear. diffstat: src-db/database/model/functions/C_ORDER_POST1.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a9605441d9c9 -r f80e9950e5af src-db/database/model/functions/C_ORDER_POST1.xml --- a/src-db/database/model/functions/C_ORDER_POST1.xml Wed Dec 26 12:46:11 2012 +0530 +++ b/src-db/database/model/functions/C_ORDER_POST1.xml Wed Dec 26 12:37:19 2012 +0100 @@ -1055,7 +1055,7 @@ FreightAmt=0, ChargeAmt=0, Description= -(SELECT p.NAME || ' ' || C_ORDERLINE.Description +(SELECT p.NAME || ' ' || COALESCE(C_ORDERLINE.Description, '') FROM M_PRODUCT p WHERE p.M_Product_ID=CUR_BOM_Line.M_Product_ID ) -- LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/main: 16 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/08166a9f3ffc changeset: 19092:08166a9f3ffc user: RM packaging bot staff.rm at openbravo.com date: Wed Dec 19 20:30:19 2012 +0100 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/06f7621a2907 changeset: 19093:06f7621a2907 user: David Miguelez david.miguelez at openbravo.com date: Tue Dec 18 13:34:45 2012 +0100 summary: Fixes Issue 22609. Checks MultiAccounting restriction before making a Payment against a GL/Journal Line. details: https://code.openbravo.com/erp/devel/main/rev/6010faa03736 changeset: 19094:6010faa03736 user: Sandra Huguet sandra.huguet at openbravo.com date: Tue Dec 18 15:24:01 2012 +0100 summary: Fixed bug 22613 Rename Accounting Schema Currency debit/credit Rename Accounting Schema Currency debit/credit by general ledger currency debit/credit. details: https://code.openbravo.com/erp/devel/main/rev/adca7213b9d7 changeset: 19095:adca7213b9d7 user: Sandra Huguet sandra.huguet at openbravo.com date: Wed Dec 19 11:10:33 2012 +0100 summary: Fixed bug 22614 Modified behavior to fields AcctSchema Currency Debit/Credit details: https://code.openbravo.com/erp/devel/main/rev/a6b455bb80fc changeset: 19096:a6b455bb80fc user: Antonio Moreno antonio.moreno at openbravo.com date: Thu Dec 20 13:27:34 2012 +0100 summary: Fixed issue 22644. Now a role can be restricted from accessing the backend. - A new check has been added to the role window. If this check is set, then the role cannot be used to log in the backend, but can be used to log in other applications (such as the WebPOS), if this restriction is overwritten in the corresponding login handler. details: https://code.openbravo.com/erp/devel/main/rev/066657f221ab changeset: 19097:066657f221ab user: Sandra Huguet sandra.huguet at openbravo.com date: Thu Dec 20 14:07:58 2012 +0100 summary: Fixed bug 22646 show accounting dimensions when no grouping criteria is selected details: https://code.openbravo.com/erp/devel/main/rev/e0cdc20e50b8 changeset: 19098:e0cdc20e50b8 user: Antonio Moreno antonio.moreno at openbravo.com date: Thu Dec 20 19:10:12 2012 +0100 summary: Related to issue 22644. Rolled back changes. Will be done in a different way details: https://code.openbravo.com/erp/devel/main/rev/8abccb7a41a6 changeset: 19099:8abccb7a41a6 user: Carlos Aristu carlos.aristu at openbravo.com date: Fri Dec 21 08:52:44 2012 +0100 summary: related to issue 22459: added getCountryFromOrgId method details: https://code.openbravo.com/erp/devel/main/rev/c32c2da519ed changeset: 19100:c32c2da519ed user: Mikel Irurita mikel.irurita at openbravo.com date: Fri Dec 21 13:08:10 2012 +0100 summary: Fixes issue 22657: Not possible to deactivate a docaction using a template details: https://code.openbravo.com/erp/devel/main/rev/5d4088bf917c changeset: 19101:5d4088bf917c user: Eduardo Argal Guibert eduardo.argal at openbravo.com date: Fri Dec 21 14:16:59 2012 +0100 summary: Fixes bug 22643 details: https://code.openbravo.com/erp/devel/main/rev/5b9bfe60248a changeset: 19102:5b9bfe60248a user: Asier Lostalé asier.lostale at openbravo.com date: Fri Dec 21 13:39:38 2012 + summary: documentation details: https://code.openbravo.com/erp/devel/main/rev/9c66708f78ef changeset: 19103:9c66708f78ef user: Shankar Balachandran shankar.balachandran at openbravo.com date: Fri Nov 30 10:36:22 2012 +0530 summary: Fixes Issue 0022292: Order PK column in DESC when other columns are DESC In Grid, ordering primary key column in descending when all other order by columns are in descending. This is done to use the index for sorting. details: https://code.openbravo.com/erp/devel/main/rev/200ab0dc2cae changeset: 19104:200ab0dc2cae user: RM packaging bot staff.rm at openbravo.com date: Mon Dec 24 14:46:19 2012 +0100 summary: Merge back from main details: https://code.openbravo.com/erp/devel/main/rev/8eb45e5291d4 changeset: 19105:8eb45e5291d4 user: David Baz Fayos david.baz at openbravo.com date: Mon Dec 24 20:43:41 2012 +0100 summary: Fixed issue 22667: 'isc.Calendar' now is rendered ok in Firefox details: https://code.openbravo.com/erp/devel/main/rev/faf2790df3d2 changeset: 19106:faf2790df3d2 user: Shankar Balachandran shankar.balachandran at openbravo.com date: Wed Dec 26 10:35:08 2012 +0530 summary: Fixes Issue 0022625: Issue in auto save in grid view When a process that is executed for an unsaved record in grid view tries to access the record an error is generated because the process is executed before saving the record. Modified code to save and then execute the process. details: https://code.openbravo.com/erp/devel/main/rev/631fc2e1c525 changeset: 19107:631fc2e1c525 user: RM packaging bot staff.rm at openbravo.com date: Wed Dec 26 15:24:55 2012 +0100
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/631fc2e1c525 changeset: 19109:631fc2e1c525 user: RM packaging bot staff.rm at openbravo.com date: Wed Dec 26 15:24:55 2012 +0100 summary: CI: update AD_MODULE to version 19106 details: https://code.openbravo.com/erp/devel/pi/rev/d70a311c4eb7 changeset: 19110:d70a311c4eb7 user: RM packaging bot staff.rm at openbravo.com date: Wed Dec 26 15:42:31 2012 +0100 summary: CI: merge back from main 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.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 4 +- 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 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +-
[OpenbravoERP-commits] devel/pi: fixed issue 22662: post from different financial accounts
details: https://code.openbravo.com/erp/devel/pi/rev/9f2e21bb3583
changeset: 19111:9f2e21bb3583
user: Naiara Martinez naiara.martinez at openbravo.com
date: Wed Dec 26 12:07:36 2012 +0100
summary: fixed issue 22662: post from different financial accounts
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 22 +
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
| 24 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
| 35 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransactionGrid.srpt
|3 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransactionGrid.xml
|3 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
| 126 ++-
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
| 180 +-
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
| 122 ++-
8 files changed, 484 insertions(+), 31 deletions(-)
diffs (truncated from 819 to 300 lines):
diff -r d70a311c4eb7 -r 9f2e21bb3583
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
Wed Dec 26 15:42:31 2012 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
Wed Dec 26 12:07:36 2012 +0100
@@ -319,6 +319,17 @@
!--354E5EF7FCD142078572A472031A4F8D--
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
!--354E5EF7FCD142078572A472031A4F8D--/AD_TEXTINTERFACES
+!--35E14F2E362847059E2D433F33E930FF--AD_TEXTINTERFACES
+!--35E14F2E362847059E2D433F33E930FF--
AD_TEXTINTERFACES_ID![CDATA[35E14F2E362847059E2D433F33E930FF]]/AD_TEXTINTERFACES_ID
+!--35E14F2E362847059E2D433F33E930FF--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--35E14F2E362847059E2D433F33E930FF-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--35E14F2E362847059E2D433F33E930FF-- ISACTIVE![CDATA[Y]]/ISACTIVE
+!--35E14F2E362847059E2D433F33E930FF-- TEXT![CDATA[Show transactions for
alternative financial account]]/TEXT
+!--35E14F2E362847059E2D433F33E930FF--
FILENAME![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html]]/FILENAME
+!--35E14F2E362847059E2D433F33E930FF-- ISUSED![CDATA[Y]]/ISUSED
+!--35E14F2E362847059E2D433F33E930FF--
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
+!--35E14F2E362847059E2D433F33E930FF--/AD_TEXTINTERFACES
+
!--361C7BAF7DFE4D90B8A2B671B4548B34--AD_TEXTINTERFACES
!--361C7BAF7DFE4D90B8A2B671B4548B34--
AD_TEXTINTERFACES_ID![CDATA[361C7BAF7DFE4D90B8A2B671B4548B34]]/AD_TEXTINTERFACES_ID
!--361C7BAF7DFE4D90B8A2B671B4548B34--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
@@ -605,6 +616,17 @@
!--55C25FEEFC8E443F908854E36E9F74DB--
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
!--55C25FEEFC8E443F908854E36E9F74DB--/AD_TEXTINTERFACES
+!--56AAE175522A4972923EFA921DA73BFA--AD_TEXTINTERFACES
+!--56AAE175522A4972923EFA921DA73BFA--
AD_TEXTINTERFACES_ID![CDATA[56AAE175522A4972923EFA921DA73BFA]]/AD_TEXTINTERFACES_ID
+!--56AAE175522A4972923EFA921DA73BFA--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--56AAE175522A4972923EFA921DA73BFA-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--56AAE175522A4972923EFA921DA73BFA-- ISACTIVE![CDATA[Y]]/ISACTIVE
+!--56AAE175522A4972923EFA921DA73BFA-- TEXT![CDATA[Financial
Account]]/TEXT
+!--56AAE175522A4972923EFA921DA73BFA--
FILENAME![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html]]/FILENAME
+!--56AAE175522A4972923EFA921DA73BFA-- ISUSED![CDATA[Y]]/ISUSED
+!--56AAE175522A4972923EFA921DA73BFA--
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
+!--56AAE175522A4972923EFA921DA73BFA--/AD_TEXTINTERFACES
+
!--57288859DEFC454F9F499AF45F42B7AB--AD_TEXTINTERFACES
!--57288859DEFC454F9F499AF45F42B7AB--
AD_TEXTINTERFACES_ID![CDATA[57288859DEFC454F9F499AF45F42B7AB]]/AD_TEXTINTERFACES_ID
!--57288859DEFC454F9F499AF45F42B7AB--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
diff -r d70a311c4eb7 -r 9f2e21bb3583
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
Wed Dec 26 15:42:31 2012 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
Wed Dec 26 12:07:36 2012 +0100
@@ -131,6 +131,16 @@
document.getElementById('buttonProcess').disabled='disabled';
}
+function showPaymentSection2(){
+ var doc = document.frmMain.inpDocumentType.value;
+ if
[OpenbravoERP-commits] devel/pi: Fixes issue 21998: After completing a sales order/invo...
details: https://code.openbravo.com/erp/devel/pi/rev/62df562c95c7 changeset: 19112:62df562c95c7 user: Ioritz Cia ioritz.cia at openbravo.com date: Wed Dec 26 16:44:06 2012 +0100 summary: Fixes issue 21998: After completing a sales order/invoice, the BOM product does not appear. Fix the consistency and fix the invoice completion. diffstat: src-db/database/model/functions/C_INVOICE_POST.xml | 2 +- src-db/database/model/functions/C_ORDER_POST1.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 9f2e21bb3583 -r 62df562c95c7 src-db/database/model/functions/C_INVOICE_POST.xml --- a/src-db/database/model/functions/C_INVOICE_POST.xmlWed Dec 26 12:07:36 2012 +0100 +++ b/src-db/database/model/functions/C_INVOICE_POST.xmlWed Dec 26 16:44:06 2012 +0100 @@ -1215,7 +1215,7 @@ LineNetAmt=0, ChargeAmt=0, Description= -(SELECT p.NAME || ' ' || C_INVOICELINE.Description +(SELECT p.NAME || ' ' || COALESCE(TO_CHAR(C_INVOICELINE.Description), '') FROM M_PRODUCT p WHERE p.M_Product_ID=CUR_BOM_Line.M_Product_ID ), diff -r 9f2e21bb3583 -r 62df562c95c7 src-db/database/model/functions/C_ORDER_POST1.xml --- a/src-db/database/model/functions/C_ORDER_POST1.xml Wed Dec 26 12:07:36 2012 +0100 +++ b/src-db/database/model/functions/C_ORDER_POST1.xml Wed Dec 26 16:44:06 2012 +0100 @@ -1055,7 +1055,7 @@ FreightAmt=0, ChargeAmt=0, Description= -(SELECT p.NAME || ' ' || COALESCE(C_ORDERLINE.Description, '') +(SELECT p.NAME || ' ' || COALESCE(TO_CHAR(C_ORDERLINE.Description), '') FROM M_PRODUCT p WHERE p.M_Product_ID=CUR_BOM_Line.M_Product_ID ) -- LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 19595: Display logic can be applied to sta...
details: https://code.openbravo.com/erp/devel/pi/rev/51ea214b67be
changeset: 19113:51ea214b67be
user: Augusto Mauch augusto.mauch at openbravo.com
date: Wed Dec 26 18:26:12 2012 +0100
summary: Fixes issue 19595: Display logic can be applied to status bar fields
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
| 2 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java
| 13 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
| 8 ++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
| 8 -
src-db/database/sourcedata/AD_FIELD.xml
| 2 +-
5 files changed, 28 insertions(+), 5 deletions(-)
diffs (104 lines):
diff -r 62df562c95c7 -r 51ea214b67be
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Wed Dec 26 16:44:06 2012 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Wed Dec 26 18:26:12 2012 +0100
@@ -89,7 +89,7 @@
#if field.redrawOnChange field.displayed
redrawOnChange: true,
/#if
-#if field.showIf != field.displayed
+#if field.showIf != (field.displayed || field.statusBarField)
showIf: function(item, value, form, currentValues, context) {
return (${field.showIf});
},
diff -r 62df562c95c7 -r 51ea214b67be
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java
Wed Dec 26 16:44:06 2012 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java
Wed Dec 26 18:26:12 2012 +0100
@@ -405,7 +405,14 @@
viewField.setField(field);
viewField.setProperty(property);
viewField.setRedrawOnChange(false);
- viewField.setShowIf();
+
+ String jsExpression = null;
+ if (field.getDisplayLogic() != null
!field.getDisplayLogic().isEmpty()) {
+final DynamicExpressionParser parser = new
DynamicExpressionParser(field.getDisplayLogic(),
+tab, field);
+jsExpression = parser.getJSExpression();
+ }
+ viewField.setShowIf(jsExpression != null ? jsExpression : );
viewField.setReadOnlyIf();
viewFields.add(viewField);
@@ -1321,6 +1328,10 @@
}
}
+public boolean isStatusBarField() {
+ return field.isShownInStatusBar();
+}
+
public boolean isShowInitiallyInGrid() {
return field.isShowInGridView();
}
diff -r 62df562c95c7 -r 51ea214b67be
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
Wed Dec 26 16:44:06 2012 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
Wed Dec 26 18:26:12 2012 +0100
@@ -112,6 +112,9 @@
for (i = 0; i length; i++) {
item = this.getItem(this.statusBarFields[i]);
+ if (item.showIf item.showIf(item, item.getValue(), this,
this.getValues()) === false) {
+continue;
+ }
title = item.getTitle();
sourceWindowId = this.view.standardWindow.windowId;
refColumnName = item.refColumnName;
@@ -1189,6 +1192,11 @@
if (item._hasChanged) {
this.itemChangeActions(item);
+ if (!this.isNew) {
+this.view.statusBar.mode = EDIT;
+this.view.statusBar.setContentLabel(this.view.statusBar.editIcon,
'OBUIAPP_Editing', this.getStatusBarFields());
+ }
+
this.onFieldChanged(item.form, item, item.getValue());
if (this.view) {
diff -r 62df562c95c7 -r 51ea214b67be
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
Wed Dec 26 16:44:06 2012 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
Wed Dec 26 18:26:12 2012 +0100
@@ -2127,6 +2127,11 @@
fld.alwaysTakeSpace = false;
}
+
+if (this.statusBarFields.contains(fld.name)) {
+ fld.statusBarField = true;
+}
+
if (!fld.width) {
fld.width = '*';
}
@@ -2148,8 +2153,7 @@
} catch
[OpenbravoERP-commits] devel/pi: 3 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/fb713601b0c3
changeset: 19114:fb713601b0c3
user: David Baz Fayos david.baz at openbravo.com
date: Thu Dec 27 03:13:00 2012 +0100
summary: [calendar] Added 'OBCalendar' widget
details: https://code.openbravo.com/erp/devel/pi/rev/5e439c790a2f
changeset: 19115:5e439c790a2f
user: David Baz Fayos david.baz at openbravo.com
date: Thu Dec 27 03:14:44 2012 +0100
summary: [calendar] Added 'OB.Utilities.Style' functions
for CSS styles manipulation
details: https://code.openbravo.com/erp/devel/pi/rev/9a4a84a2c555
changeset: 19116:9a4a84a2c555
user: David Baz Fayos david.baz at openbravo.com
date: Thu Dec 27 03:18:37 2012 +0100
summary: [calendar] Added OBColor auxiliary utilities
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
|4 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-calendar.js
| 57
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-style.js
| 122 ++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
| 45 +++
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
| 74 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
| 77 ++-
6 files changed, 377 insertions(+), 2 deletions(-)
diffs (truncated from 446 to 300 lines):
diff -r 51ea214b67be -r 9a4a84a2c555
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
Wed Dec 26 18:26:12 2012 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
Thu Dec 27 03:18:37 2012 +0100
@@ -87,6 +87,8 @@
web/org.openbravo.client.application/js/utilities/ob-utilities-date.js,
true));
globalResources.add(createStaticResource(
web/org.openbravo.client.application/js/utilities/ob-utilities-number.js,
true));
+globalResources.add(createStaticResource(
+
web/org.openbravo.client.application/js/utilities/ob-utilities-style.js,
true));
globalResources.add(createStaticResource(
web/org.openbravo.client.application/js/utilities/ob-popup.js,
false));
@@ -155,6 +157,8 @@
globalResources.add(createStaticResource(
web/org.openbravo.client.application/js/main/ob-tab.js, false));
globalResources.add(createStaticResource(
+
web/org.openbravo.client.application/js/form/formitem/ob-formitem-calendar.js,
true));
+globalResources.add(createStaticResource(
web/org.openbravo.client.application/js/grid/ob-grid.js, false));
globalResources.add(createStaticResource(
diff -r 51ea214b67be -r 9a4a84a2c555
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-calendar.js
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-calendar.js
Thu Dec 27 03:18:37 2012 +0100
@@ -0,0 +1,57 @@
+/*
+ *
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the License), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use. this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an AS IS
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2012 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): __.
+
+ */
+
+// == OBClientClassCanvasItem ==
+// Extends Calendar, with some customizations (most of them styling related)
+isc.ClassFactory.defineClass('OBCalendar', isc.Calendar);
+
[OpenbravoERP-commits] devel/main: 6 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/56c097a8105c changeset: 19108:56c097a8105c user: Sandra Huguet sandra.huguet at openbravo.com date: Thu Dec 20 14:07:58 2012 +0100 summary: Fixed bug 22646 show accounting dimensions when no grouping criteria is selected details: https://code.openbravo.com/erp/devel/main/rev/7b9ca6ddcdb5 changeset: 19109:7b9ca6ddcdb5 user: Eduardo Argal Guibert eduardo.argal at openbravo.com date: Fri Dec 21 14:16:59 2012 +0100 summary: Fixes bug 22643 details: https://code.openbravo.com/erp/devel/main/rev/26a81bd13b91 changeset: 19110:26a81bd13b91 user: RM packaging bot staff.rm at openbravo.com date: Mon Dec 24 14:06:41 2012 + summary: Update AD_MODULE version to 3.0MP18.1 details: https://code.openbravo.com/erp/devel/main/rev/73102dce4ea8 changeset: 19111:73102dce4ea8 user: RM packaging bot staff.rm at openbravo.com date: Mon Dec 24 14:06:42 2012 + summary: Added tag 3.0MP18.1 for changeset 26a81bd13b91 details: https://code.openbravo.com/erp/devel/main/rev/1f2949aef6b1 changeset: 19112:1f2949aef6b1 user: RM packaging bot staff.rm at openbravo.com date: Mon Dec 24 14:06:43 2012 + summary: Added signature for changeset 73102dce4ea8 details: https://code.openbravo.com/erp/devel/main/rev/813a8b5ebcf4 changeset: 19113:813a8b5ebcf4 user: RM packaging bot staff.rm at openbravo.com date: Thu Dec 27 04:27:34 2012 + summary: Merge temporary head for 3.0MP18.1 diffstat: .hgsigs |3 + .hgtags |3 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MENU.xml |2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml |4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml | 25 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java |4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java | 20 + modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml |4 +- 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 |4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java | 25 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/PropertiesComponent.java |6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/LocationSettingsHandler.java | 115 ++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js |8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js |2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js |9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js |5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/f2eb38f962af changeset: 19124:f2eb38f962af user: Martin Taal martin.taal at openbravo.com date: Thu Dec 27 08:24:46 2012 +0100 summary: Fixes issue 22235: OBMessageUtils asumes incorrectly that RequestContext is set Set variables secure app in RequestContext in case of running a process details: https://code.openbravo.com/erp/devel/pi/rev/e8e0844b64a8 changeset: 19125:e8e0844b64a8 user: Martin Taal martin.taal at openbravo.com date: Thu Dec 27 08:25:53 2012 +0100 summary: Merging heads diffstat: .hgsigs |1 + .hgtags |1 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java |4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-calendar.js | 57 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-style.js | 122 ++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 45 +++ modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css | 74 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js | 77 ++- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/RequestContext.java | 15 +- src-test/org/openbravo/test/dal/IssuesTest.java | 48 +++ src/org/openbravo/service/db/DalBaseProcess.java |3 + 11 files changed, 444 insertions(+), 3 deletions(-) diffs (truncated from 610 to 300 lines): diff -r 51ea214b67be -r e8e0844b64a8 .hgsigs --- a/.hgsigs Wed Dec 26 18:26:12 2012 +0100 +++ b/.hgsigs Thu Dec 27 08:25:53 2012 +0100 @@ -93,3 +93,4 @@ 3ded67251154d0aa958eacb918de97fd5a77e3dc 0 iEYEABECAAYFAlC3tuIACgkQCX/oGf+2qkO0zgCdFACe5suzHq8pukNoc8ghZJlvO6UAn3wzW4/wmIEfmngxthdtqRTrSQ2X bf495495c05c0e9414450e54d6da22ec685bd21a 0 iEYEABECAAYFAlDT6OkACgkQCX/oGf+2qkMqegCdEjWD+dHlIP66pL/adAL3iuBYXsUAoJvOAhmZbvUSUIZhI44gkjlnCbYu 9fd46b5349c522407c7fe4eaedeed678487e02a2 0 iEYEABECAAYFAlDK72cACgkQCX/oGf+2qkNv1gCfYsphl/F7dyNNh+u046YI9RwEdD4AoMPAoXJFhg9rV8gF6tZgeSMSAOV3 +73102dce4ea86f1b3fab97709f1832f39f89d227 0 iEYEABECAAYFAlDYYXMACgkQCX/oGf+2qkNpJQCg09+Ojgco2TaKN6BlNC4888yhLCgAoJfCfQ/93ePShFci2Fic/lzeg/wL diff -r 51ea214b67be -r e8e0844b64a8 .hgtags --- a/.hgtags Wed Dec 26 18:26:12 2012 +0100 +++ b/.hgtags Thu Dec 27 08:25:53 2012 +0100 @@ -104,3 +104,4 @@ 41ad849c6978ec887187853448c1f1a79fc01c4f 3.0MP17.1 814d8af3a240b363c9bcba7cf7ae839c8822ecce 3.0MP17.2 43986bd34e503950718f87d719d70fccfc8607fe 3.0MP18 +26a81bd13b9118ce8591e58ed7d04533469708f0 3.0MP18.1 diff -r 51ea214b67be -r e8e0844b64a8 modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java Wed Dec 26 18:26:12 2012 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java Thu Dec 27 08:25:53 2012 +0100 @@ -87,6 +87,8 @@ web/org.openbravo.client.application/js/utilities/ob-utilities-date.js, true)); globalResources.add(createStaticResource( web/org.openbravo.client.application/js/utilities/ob-utilities-number.js, true)); +globalResources.add(createStaticResource( + web/org.openbravo.client.application/js/utilities/ob-utilities-style.js, true)); globalResources.add(createStaticResource( web/org.openbravo.client.application/js/utilities/ob-popup.js, false)); @@ -155,6 +157,8 @@ globalResources.add(createStaticResource( web/org.openbravo.client.application/js/main/ob-tab.js, false)); globalResources.add(createStaticResource( + web/org.openbravo.client.application/js/form/formitem/ob-formitem-calendar.js, true)); +
[OpenbravoERP-commits] devel/pi: Related to issue 22235: OBMessageUtils asumes incorrec...
details: https://code.openbravo.com/erp/devel/pi/rev/4fd1d28743f1
changeset: 19126:4fd1d28743f1
user: Martin Taal martin.taal at openbravo.com
date: Thu Dec 27 08:27:09 2012 +0100
summary: Related to issue 22235: OBMessageUtils asumes incorrectly that
RequestContext is set
diffstat:
src-test/org/openbravo/test/dal/IssuesTest.java | 8
1 files changed, 8 insertions(+), 0 deletions(-)
diffs (18 lines):
diff -r e8e0844b64a8 -r 4fd1d28743f1
src-test/org/openbravo/test/dal/IssuesTest.java
--- a/src-test/org/openbravo/test/dal/IssuesTest.java Thu Dec 27 08:25:53
2012 +0100
+++ b/src-test/org/openbravo/test/dal/IssuesTest.java Thu Dec 27 08:27:09
2012 +0100
@@ -812,6 +812,14 @@
Assert.assertTrue(test22235.isErrorOccured());
test22235.execute(processBundle);
Assert.assertFalse(test22235.isErrorOccured());
+
+// this should again fail, to ensure everything is cleaned up
+try {
+ RequestContext.get().getVariablesSecureApp();
+ fail();
+} catch (OBException e) {
+ // fine, should fail at this point
+}
}
private static class Test22235 extends DalBaseProcess {
--
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
