details: /erp/devel/main/rev/defdcbe79f23
changeset: 12939:defdcbe79f23
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Wed Jun 22 18:04:52 2011 +0200
summary: Fix line endings using dos2unix applied to files having crlf style
line-ending
details: /erp/devel/main/rev/2752b43fbd45
changeset: 12940:2752b43fbd45
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Jun 22 18:19:10 2011 +0200
summary: [SKIN] Removed hardcoded styles from ob-user-profile-widget.js
details: /erp/devel/main/rev/fe056255f497
changeset: 12941:fe056255f497
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Wed Jun 22 18:33:41 2011 +0200
summary: [APRM] MatchTransaction: fix match from find link using comma as
decimal separator
details: /erp/devel/main/rev/7edd79bcb2b9
changeset: 12942:7edd79bcb2b9
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Jun 22 22:54:17 2011 +0200
summary: [SKIN] Proper path to load images from .js files
details: /erp/devel/main/rev/76bcb4fc6369
changeset: 12943:76bcb4fc6369
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Jun 22 23:18:14 2011 +0200
summary: CI: merge back from main
details: /erp/devel/main/rev/c399ea037d58
changeset: 12944:c399ea037d58
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Thu Jun 23 10:20:37 2011 +0200
summary: Fixes issue 16796: import bank statement info message
details: /erp/devel/main/rev/5614633d86ea
changeset: 12945:5614633d86ea
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Jun 23 14:42:59 2011 +0200
summary: CI: update AD_MODULE to version 12944
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.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java
| 16
+-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
| 8 +-
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/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java
| 298 +++++-----
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-manager.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js
| 16 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js
| 116 ++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-application-menu-styles.js
| 20 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-application-styles.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-dialog-styles.js
| 14 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
| 48 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.js
| 22 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-messagebar-styles.js
| 8 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.js
| 32 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-popup-styles.js
| 14 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-statusbar-styles.js
| 6 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tab-styles.js
| 10 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-toolbar-styles.js
| 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/org/openbravo/client/kernel/templates/application-js.ftl
| 8 +-
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/org/openbravo/client/myob/templates/my_ob_js.ftl
| 2 +-
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
| 20 +-
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
| 2 +-
modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.js
| 14 +-
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.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.selector/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.userinterface.selector/ob-selector-item-styles.js
| 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 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 24 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 14 +-
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
63 files changed, 444 insertions(+), 406 deletions(-)
diffs (truncated from 2208 to 300 lines):
diff -r 3fed759277c3 -r 5614633d86ea
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Wed Jun 22 17:31:39 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Thu Jun 23 14:42:59 2011 +0200
@@ -6,7 +6,7 @@
<!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and
Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.12920]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.12944]]></VERSION>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your
finances with an ERP does not have to be difficult. Enjoy a radically improved
user experience that combines the power of an enterprise grade financial
application with the simplicity and ease of a web 2.0 personal accounting
service.]]></DESCRIPTION>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and
Receivables Management simplifies and automates the business processes around
the management of financial accounts, from the receipt and issue of payment, to
the reconciliation of those events with bank statements.
If you would like to help shape this module you are welcome to take part in
the forum discussions or register feature requests or issues in the
corresponding (Forum and Bug Tracking) sections in the Advanced Payables and
Receivable project in the OB Forge.]]></HELP>
diff -r 3fed759277c3 -r 5614633d86ea
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Jun 22 17:31:39 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Thu Jun 23 14:42:59 2011 +0200
@@ -7,7 +7,7 @@
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.12920]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.12944]]></STARTVERSION>
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User
Interface Selector]]></DEPENDANT_MODULE_NAME>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
<!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--B97FC854C6DD41E692161585645A900F-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--B97FC854C6DD41E692161585645A900F-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.12920]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.12944]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 3fed759277c3 -r 5614633d86ea
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java
Wed Jun 22 17:31:39 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java
Thu Jun 23 14:42:59 2011 +0200
@@ -141,11 +141,17 @@
if (isDefault) {
if (!isAnyFileFormatInstalled) {
- xmlDocument.setParameter("messageType", "Warning");
- xmlDocument.setParameter("messageTitle", Utility.messageBD(this,
- "APRM_NoBankFileAvailable", vars.getLanguage()));
- xmlDocument.setParameter("messageMessage", Utility.messageBD(this,
- "APRM_NoBankFileAvailableInfo", vars.getLanguage()));
+ String strWindowPath = Utility.getTabURL(tabId, "R", true);
+ if (strWindowPath.equals(""))
+ strWindowPath = strDefaultServlet;
+ OBError message = new OBError();
+ message.setType("Warning");
+ message.setTitle(Utility.messageBD(this, "APRM_NoBankFileAvailable",
vars.getLanguage()));
+ message.setMessage(Utility.messageBD(this,
"APRM_NoBankFileAvailableInfo", vars
+ .getLanguage()));
+ vars.setMessage(tabId, message);
+ printPageClosePopUp(response, vars, strWindowPath);
+ return;
} else {
xmlDocument.setParameter("messageType", "");
xmlDocument.setParameter("messageTitle", "");
diff -r 3fed759277c3 -r 5614633d86ea
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
Wed Jun 22 17:31:39 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
Thu Jun 23 14:42:59 2011 +0200
@@ -55,8 +55,10 @@
</script>
<script language="JavaScript" type="text/javascript">
function transactionFind(selected) {
- if(compare(subtract(subtract(selected.depositAmount,
selected.paymentAmount), document.getElementById("inpBSAmount_" +
sc_FIN_FinAcc_Transaction_ID.bslId).value), '>', "0") ||
- (compare(subtract(subtract(selected.depositAmount,
selected.paymentAmount), document.getElementById("inpBSAmount_" +
sc_FIN_FinAcc_Transaction_ID.bslId).value), '<', "0" ))) {
+ var depositAmt = returnCalcToFormatted(selected.depositAmount,
globalMaskNumeric, globalDecSeparator, globalGroupSeparator,
globalGroupInterval);
+ var paymentAmt = returnCalcToFormatted(selected.paymentAmount,
globalMaskNumeric, globalDecSeparator, globalGroupSeparator,
globalGroupInterval);
+ if(compare(subtract(subtract(depositAmt, paymentAmt),
document.getElementById("inpBSAmount_" +
sc_FIN_FinAcc_Transaction_ID.bslId).value), '>', "0") ||
+ (compare(subtract(subtract(depositAmt, paymentAmt),
document.getElementById("inpBSAmount_" +
sc_FIN_FinAcc_Transaction_ID.bslId).value), '<', "0" ))) {
showJSMessage('APRM_LinesAmountMismatch');
return false;
}
@@ -65,7 +67,7 @@
document.getElementById("inpMatchedDocument_" +
sc_FIN_FinAcc_Transaction_ID.bslId).innerHTML =
document.getElementById("paraMatchedAgainstTransaction").value;
document.getElementById("inpBPartner_" +
sc_FIN_FinAcc_Transaction_ID.bslId).innerHTML =
selected["finPayment.businessPartner._identifier"]==undefined?'':selected["finPayment.businessPartner._identifier"];
document.getElementById("inpReferenceNo_" +
sc_FIN_FinAcc_Transaction_ID.bslId).innerHTML =
selected["finPayment.referenceNo"]==undefined?'':selected["finPayment.referenceNo"];
- document.getElementById("inpAmount_" +
sc_FIN_FinAcc_Transaction_ID.bslId).innerHTML =
subtract(selected.depositAmount, selected.paymentAmount);
+ document.getElementById("inpAmount_" +
sc_FIN_FinAcc_Transaction_ID.bslId).innerHTML = subtract(depositAmt,
paymentAmt);
document.getElementById("inpMatchingType_" +
sc_FIN_FinAcc_Transaction_ID.bslId).value = "MA";
document.getElementById("inpCheckBox_" +
sc_FIN_FinAcc_Transaction_ID.bslId).checked = true;
document.getElementById("inpCheckBox_" +
sc_FIN_FinAcc_Transaction_ID.bslId).disabled = false;
diff -r 3fed759277c3 -r 5614633d86ea
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Wed Jun 22 17:31:39 2011 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Thu Jun 23 14:42:59 2011 +0200
@@ -6,7 +6,7 @@
<!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.12920]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.12944]]></VERSION>
<!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss
Weld]]></DESCRIPTION>
<!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss
Weld framework: Java Contexts and Dependency Injection for the Java EE platform
(CDI). For more information see http://seamframework.org/Weld]]></HELP>
<!--C70732EA90A14EC0916078B85CC33D2D-->
<URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
diff -r 3fed759277c3 -r 5614633d86ea
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Jun 22 17:31:39 2011 +0200
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Thu Jun 23 14:42:59 2011 +0200
@@ -7,7 +7,7 @@
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.12920]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.12944]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 3fed759277c3 -r 5614633d86ea
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Wed Jun 22 17:31:39 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Thu Jun 23 14:42:59 2011 +0200
@@ -6,7 +6,7 @@
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface
Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.12920]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.12944]]></VERSION>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the
main application components for the openbravo user interface]]></DESCRIPTION>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main
application components for the openbravo user interface. The main layout
incorporates a navigation bar and a main view area.]]></HELP>
<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
diff -r 3fed759277c3 -r 5614633d86ea
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Jun 22 17:31:39 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Thu Jun 23 14:42:59 2011 +0200
@@ -7,7 +7,7 @@
<!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.12920]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.12944]]></STARTVERSION>
<!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON
Datasource]]></DEPENDANT_MODULE_NAME>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
<!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--60A170212F36499D83B8AD38D01F46B3-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--60A170212F36499D83B8AD38D01F46B3-->
<AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.12920]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.12944]]></STARTVERSION>
<!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User
Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
<!--60A170212F36499D83B8AD38D01F46B3-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
<!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.12920]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.12944]]></STARTVERSION>
<!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.12920]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.12944]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 3fed759277c3 -r 5614633d86ea
modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java
Wed Jun 22 17:31:39 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java
Thu Jun 23 14:42:59 2011 +0200
@@ -1,149 +1,149 @@
-/*
- *************************************************************************
- * 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) 2011 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s): Mallikarjun M
- ************************************************************************
- */
-package org.openbravo.client.application.businesslogic;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.codehaus.jettison.json.JSONObject;
-import org.hibernate.Query;
-import org.openbravo.base.exception.OBException;
-import org.openbravo.client.kernel.BaseActionHandler;
-import org.openbravo.dal.core.DalUtil;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.dal.service.OBQuery;
-import org.openbravo.model.common.order.Order;
-import org.openbravo.model.common.order.OrderLine;
-import org.openbravo.model.pricing.pricelist.PriceListVersion;
-import org.openbravo.service.db.CallStoredProcedure;
-import org.openbravo.service.json.DataResolvingMode;
-import org.openbravo.service.json.DataToJsonConverter;
-
-/**
- * When user on the Sales Order window and have a Sales Order displayed /
selected, you then click a
- * button on the toolbar (where the 'new' order button is, among other
buttons) called 'Clone
- * Order'. The process would then create a new order, and copy the information
from the old order to
- * the new one.
- *
- * @author Mallikarjun M
- *
- */
-public class CloneOrderActionHandler extends BaseActionHandler {
-
- protected JSONObject execute(Map<String, Object> parameters, String data) {
- final DataToJsonConverter jsonConverter = new DataToJsonConverter();
- JSONObject json = null;
- try {
- String orderId = (String) parameters.get("orderId");
- Order objOrder = OBDal.getInstance().get(Order.class, orderId);
- Order objCloneOrder = (Order) DalUtil.copy(objOrder, false);
- BigDecimal bLineNetAmt = getLineNetAmt(orderId);
-
- objCloneOrder.setDocumentAction("CO");
- objCloneOrder.setDocumentStatus("DR");
- objCloneOrder.setPosted("N");
- objCloneOrder.setProcessed(false);
- objCloneOrder.setSalesTransaction(true);
- objCloneOrder.setDocumentNo(null);
- // save the cloned order object
- OBDal.getInstance().save(objCloneOrder);
-
-
objCloneOrder.setSummedLineAmount(objCloneOrder.getSummedLineAmount().subtract(bLineNetAmt));
-
objCloneOrder.setGrandTotalAmount(objCloneOrder.getGrandTotalAmount().subtract(bLineNetAmt));
-
- // get the lines associated with the order and clone them to the new
- // order line.
- for (OrderLine ordLine : objOrder.getOrderLineList()) {
- String strPriceVersionId =
getPriceListVersion(objOrder.getPriceList().getId(), objOrder
- .getClient().getId());
- BigDecimal bdPriceList = getPriceList(ordLine.getProduct().getId(),
strPriceVersionId);
- OrderLine objCloneOrdLine = (OrderLine) DalUtil.copy(ordLine, false);
- objCloneOrdLine.setReservedQuantity(new BigDecimal("0"));
- objCloneOrdLine.setDeliveredQuantity(new BigDecimal("0"));
- objCloneOrdLine.setInvoicedQuantity(new BigDecimal("0"));
- objCloneOrdLine.setListPrice(bdPriceList);
- objCloneOrder.getOrderLineList().add(objCloneOrdLine);
- objCloneOrdLine.setSalesOrder(objCloneOrder);
- }
-
- OBDal.getInstance().save(objCloneOrder);
-
- OBDal.getInstance().flush();
- OBDal.getInstance().refresh(objCloneOrder);
- json = jsonConverter.toJsonObject(objCloneOrder, DataResolvingMode.FULL);
- OBDal.getInstance().commitAndClose();
- return json;
- } catch (Exception e) {
- throw new OBException(e);
- }
- }
-
- private String getPriceListVersion(String priceList, String clientId) {
- try {
- String whereClause = " as plv , PricingPriceList pl where pl.id=plv.id
and plv.active='Y' and "
- + " pl.id = :priceList and plv.client.id = :clientId order by
plv.validFromDate desc";
-
- OBQuery<PriceListVersion> ppriceListVersion =
OBDal.getInstance().createQuery(
- PriceListVersion.class, whereClause);
- ppriceListVersion.setNamedParameter("priceList", priceList);
- ppriceListVersion.setNamedParameter("clientId", clientId);
-
- if (!ppriceListVersion.list().isEmpty()) {
- return ppriceListVersion.list().get(0).getId();
- } else {
- return "0";
- }
- } catch (Exception e) {
- throw new OBException(e);
- }
- }
-
- private BigDecimal getPriceList(String strProductID, String
strPriceVersionId) {
- BigDecimal bdPriceList = null;
- try {
- final List<Object> parameters = new ArrayList<Object>();
- parameters.add(strProductID);
- parameters.add(strPriceVersionId);
- final String procedureName = "M_BOM_PriceList";
- bdPriceList = (BigDecimal)
CallStoredProcedure.getInstance().call(procedureName, parameters,
- null);
- } catch (Exception e) {
- throw new OBException(e);
- }
-
- return (bdPriceList);
- }
-
- public static BigDecimal getLineNetAmt(String strOrderId) {
-
- BigDecimal bdLineNetAmt = new BigDecimal("0");
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
