details:   /erp/devel/pi/rev/367cd1f5b55f
changeset: 12507:367cd1f5b55f
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Thu May 26 20:52:29 2011 +0200
summary:   CI: update AD_MODULE to version 12466

details:   /erp/devel/pi/rev/ee64cd644c0a
changeset: 12508:ee64cd644c0a
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Thu May 26 21:09:23 2011 +0200
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.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
                                             |     2 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
                           |     3 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
                           |     1 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml
                            |     1 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
                   |     4 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
                   |     2 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
                    |     2 +
 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
               |   238 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
 |     8 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java
                                |     9 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
                  |     9 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js
                                  |     3 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js
                      |     2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
                                  |    20 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
                                  |    53 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
                              |     1 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js
                                        |     8 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
                                 |     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.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
                                                   |     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.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.service.json/src/org/openbravo/service/json/OBStaleObjectException.java
                                          |    90 +-
 
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.selector/js/ob-selector-item.js
                           |     2 +-
 
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 +-
 referencedata/sampledata/F_B_International_Group.xml                           
                                                        |   216 +-
 referencedata/sampledata/QA_Testing.xml                                        
                                                        |    54 -
 src-core/utils/rmi/src/rmi/RenderFo.java                                       
                                                        |   206 +-
 src-core/utils/rmi/src/rmi/RenderFoI.java                                      
                                                        |    42 +-
 src-db/database/model/tables/AD_MODEL_OBJECT.xml                               
                                                        |    14 -
 src-db/database/model/tables/AD_TASK.xml                                       
                                                        |    72 -
 src-db/database/model/tables/AD_TASK_ACCESS.xml                                
                                                        |    67 -
 src-db/database/model/tables/AD_WORKFLOW.xml                                   
                                                        |    71 -
 src-db/database/model/tables/AD_WORKFLOW_ACCESS.xml                            
                                                        |    67 -
 src-db/database/sourcedata/AD_COLUMN.xml                                       
                                                        |  1680 ----------
 src-db/database/sourcedata/AD_ELEMENT.xml                                      
                                                        |    61 -
 src-db/database/sourcedata/AD_FORM.xml                                         
                                                        |    23 -
 src-db/database/sourcedata/AD_MENU.xml                                         
                                                        |    12 -
 src-db/database/sourcedata/AD_MODEL_OBJECT.xml                                 
                                                        |    36 -
 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml                         
                                                        |    30 -
 src-db/database/sourcedata/AD_MODULE.xml                                       
                                                        |     2 +-
 src-db/database/sourcedata/AD_TABLE.xml                                        
                                                        |    88 -
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml                               
                                                        |   218 -
 src-db/database/sourcedata/AD_TREENODE.xml                                     
                                                        |    11 -
 src/org/openbravo/base/exception/OBException.java                              
                                                        |   126 +-
 src/org/openbravo/base/exception/OBSecurityException.java                      
                                                        |    94 +-
 src/org/openbravo/base/provider/OBNotSingleton.java                            
                                                        |    58 +-
 src/org/openbravo/base/provider/OBProvidable.java                              
                                                        |    56 +-
 src/org/openbravo/base/provider/OBProviderConfigReader.java                    
                                                        |   210 +-
 src/org/openbravo/base/provider/OBProviderException.java                       
                                                        |    96 +-
 src/org/openbravo/base/provider/OBSingleton.java                               
                                                        |    58 +-
 src/org/openbravo/base/util/ArgumentException.java                             
                                                        |    98 +-
 src/org/openbravo/base/util/Check.java                                         
                                                        |   350 +-
 src/org/openbravo/base/util/CheckException.java                                
                                                        |    98 +-
 src/org/openbravo/base/validation/ValidationException.java                     
                                                        |   136 +-
 src/org/openbravo/dal/xml/EntityNotFoundException.java                         
                                                        |    96 +-
 src/org/openbravo/dal/xml/EntityXMLException.java                              
                                                        |   100 +-
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java                    
                                                        |     6 +-
 src/org/openbravo/erpCommon/ad_actionButton/Locator_data.xsql                  
                                                        |    37 -
 src/org/openbravo/erpCommon/ad_actionButton/TaxRegisterTypeLines.xsql          
                                                        |    37 -
 src/org/openbravo/erpCommon/ad_actionButton/TestLine.java                      
                                                        |   542 ---
 src/org/openbravo/erpCommon/ad_actionButton/TestLine_data.xsql                 
                                                        |   112 -
 src/org/openbravo/erpCommon/ad_forms/AccountingValueData.java                  
                                                        |   231 -
 src/org/openbravo/erpCommon/ad_forms/AcctServer.java                           
                                                        |    84 +-
 src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql                      
                                                        |    22 -
 src/org/openbravo/erpCommon/ad_forms/CategoriaProducto.srpt                    
                                                        |    26 -
 src/org/openbravo/erpCommon/ad_forms/CategoriaProducto.xml                     
                                                        |    27 -
 src/org/openbravo/erpCommon/ad_forms/CategoriaProductoCombo_data.xsql          
                                                        |    34 -
 src/org/openbravo/erpCommon/ad_forms/InformeInOut.html                         
                                                        |    98 -
 src/org/openbravo/erpCommon/ad_forms/InformeInOut.java                         
                                                        |    88 -
 src/org/openbravo/erpCommon/ad_forms/InformeInOut.xml                          
                                                        |    30 -
 src/org/openbravo/erpCommon/ad_forms/InformeInOut_Excel.html                   
                                                        |    46 -
 src/org/openbravo/erpCommon/ad_forms/InformeInOut_Excel.xml                    
                                                        |    30 -
 src/org/openbravo/erpCommon/ad_forms/InformeInOut_data.xsql                    
                                                        |    76 -
 src/org/openbravo/erpCommon/ad_forms/InvoiceVendorMultiline.html               
                                                        |   397 --
 src/org/openbravo/erpCommon/ad_forms/InvoiceVendorMultiline.java               
                                                        |   351 --
 src/org/openbravo/erpCommon/ad_forms/InvoiceVendorMultiline.xml                
                                                        |    80 -
 src/org/openbravo/erpCommon/ad_forms/InvoiceVendorMultiline_Lines.html         
                                                        |   436 --
 src/org/openbravo/erpCommon/ad_forms/InvoiceVendorMultiline_Lines.java         
                                                        |   342 --
 src/org/openbravo/erpCommon/ad_forms/InvoiceVendorMultiline_Lines.xml          
                                                        |    42 -
 src/org/openbravo/erpCommon/ad_forms/InvoiceVendorMultiline_Lines_data.xsql    
                                                        |   173 -
 src/org/openbravo/erpCommon/ad_forms/InvoiceVendorMultiline_data.xsql          
                                                        |   332 -
 src/org/openbravo/erpCommon/ad_forms/Log_POP.html                              
                                                        |    44 -
 src/org/openbravo/erpCommon/ad_forms/Log_POP.xml                               
                                                        |    22 -
 src/org/openbravo/erpCommon/ad_forms/RemittanceCombo_data.xsql                 
                                                        |    49 -
 src/org/openbravo/erpCommon/ad_process/RestartingContext.java                  
                                                        |    46 -
 src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java                 
                                                        |   321 +-
 src/org/openbravo/erpCommon/reference/SubTabs.srpt                             
                                                        |    25 -
 src/org/openbravo/erpCommon/reference/SubTabs.xml                              
                                                        |    28 -
 src/org/openbravo/erpCommon/utility/ComboTableData.java                        
                                                        |     3 +-
 src/org/openbravo/erpCommon/utility/FrameOcultoMultilinea.html                 
                                                        |    33 -
 src/org/openbravo/erpCommon/utility/FrameOcultoMultilinea.xml                  
                                                        |    23 -
 src/org/openbravo/erpCommon/utility/ReferencedLink_data.xsql                   
                                                        |     1 +
 src/org/openbravo/erpCommon/utility/ShowSession_data.xsql                      
                                                        |    47 -
 src/org/openbravo/erpCommon/utility/Task.java                                  
                                                        |   166 -
 src/org/openbravo/erpCommon/utility/TaskDefault.html                           
                                                        |    39 -
 src/org/openbravo/erpCommon/utility/TaskDefault.xml                            
                                                        |    23 -
 src/org/openbravo/erpReports/RptC_Remittance.fo                                
                                                        |    38 -
 src/org/openbravo/erpReports/RptC_Remittance.xml                               
                                                        |    28 -
 src/org/openbravo/erpReports/RptC_RemittanceHeader.fo                          
                                                        |    80 -
 src/org/openbravo/erpReports/RptC_RemittanceHeader.xml                         
                                                        |    33 -
 src/org/openbravo/erpReports/RptC_RemittanceJR.java                            
                                                        |    75 -
 src/org/openbravo/erpReports/RptC_RemittanceJR.xml                             
                                                        |    28 -
 src/org/openbravo/erpReports/RptC_RemittanceLines.fo                           
                                                        |    90 -
 src/org/openbravo/erpReports/RptC_RemittanceLines.xml                          
                                                        |    32 -
 src/org/openbravo/service/OBServiceException.java                              
                                                        |    96 +-
 src/org/openbravo/service/web/InvalidContentException.java                     
                                                        |    96 +-
 src/org/openbravo/service/web/InvalidRequestException.java                     
                                                        |    96 +-
 src/org/openbravo/service/web/ResourceNotFoundException.java                   
                                                        |    96 +-
 src/org/openbravo/services/webservice/WebServiceImpl.java                      
                                                        |    19 -
 src/org/openbravo/services/webservice/WebServiceImplService.java               
                                                        |    16 -
 src/org/openbravo/services/webservice/WebServiceImplServiceLocator.java        
                                                        |   142 -
 src/org/openbravo/services/webservice/WebServiceSoapBindingImpl.java           
                                                        |    43 -
 src/org/openbravo/services/webservice/WebServiceSoapBindingStub.java           
                                                        |   610 ---
 src/org/openbravo/services/webservice/deploy.wsdd                              
                                                        |   159 -
 src/org/openbravo/services/webservice/undeploy.wsdd                            
                                                        |    15 -
 web/js/multilinea.js                                                           
                                                        |  1114 ------
 web/js/multilineaOculto.js                                                     
                                                        |    71 -
 150 files changed, 1521 insertions(+), 11165 deletions(-)

diffs (truncated from 14786 to 300 lines):

diff -r 2356fbef64a6 -r ee64cd644c0a 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml 
    Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml 
    Thu May 26 21:09:23 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.12445]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  
<VERSION><![CDATA[3.0.12466]]></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 2356fbef64a6 -r ee64cd644c0a 
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
  Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  Thu May 26 21:09:23 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.12445]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<STARTVERSION><![CDATA[2.1.12466]]></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.12445]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  
<STARTVERSION><![CDATA[3.0.12466]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 2356fbef64a6 -r ee64cd644c0a 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
        Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
        Thu May 26 21:09:23 2011 +0200
@@ -129,6 +129,7 @@
 <!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <SORTNO><![CDATA[5]]></SORTNO>
 <!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <DEFAULT_EXPRESSION><![CDATA[if 
(OB.isSalesTransaction() == true) { '' } else {'true'}]]></DEFAULT_EXPRESSION>
 <!--583F20A11FD34C65BEC1F15D5DBF70BA-->  
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--583F20A11FD34C65BEC1F15D5DBF70BA--></OBUISEL_SELECTOR_FIELD>
 
@@ -238,6 +239,7 @@
 <!--B67B839A695A44499277CF0D09FAC54F-->  <SORTNO><![CDATA[4]]></SORTNO>
 <!--B67B839A695A44499277CF0D09FAC54F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B67B839A695A44499277CF0D09FAC54F-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--B67B839A695A44499277CF0D09FAC54F-->  <DEFAULT_EXPRESSION><![CDATA[if 
(OB.isSalesTransaction() == true) { 'true' } else {''}]]></DEFAULT_EXPRESSION>
 <!--B67B839A695A44499277CF0D09FAC54F-->  
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--B67B839A695A44499277CF0D09FAC54F--></OBUISEL_SELECTOR_FIELD>
 
diff -r 2356fbef64a6 -r ee64cd644c0a 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
      Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
      Thu May 26 21:09:23 2011 +0200
@@ -488,6 +488,7 @@
   <input type="hidden" name="inpadWindowId" value="" id="fieldWindowId"/>
   <input type="hidden" name="inpTabId" value="" id="fieldTabId"/>
   <input type="hidden" name="isReceipt" value="" id="fieldReceipt"/>
+  <input type="hidden" name="inpissotrx" value="" id="fieldIsSoTrx"/>
   <input type="hidden" name="isFirstLoad" value="true"/>
   <input type="hidden" name="isGLItem" value="N"/>
   <input type="hidden" name="inpDeleteGLItem" value=""/>
@@ -913,7 +914,7 @@
                     <td style="padding-top: 0px;">
                       <script>var sc_C_BPartner_ID = null;</script>
                       <input type="hidden" name="inpcBPartnerId" 
id="C_BPartner_ID" value="" onreset="sc_C_BPartner_ID.resetSelector();" 
onchange="openbravo.Utilities.updateSmartClientComponentValue(this, 
sc_C_BPartner_ID.selectorField);"></input>
-                      <script id="selectorLink" 
src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_BPartner_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=true"></script>
+                      <script id="selectorLink" 
src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_BPartner_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=true&filterClass=org.openbravo.userinterface.selector.SelectorDataSourceFilter&_selectorDefinitionId=A98899B1C75A4F4EBD3414F1B654EFAB"></script>
                     </td>
                   </tr>
                 </table>
diff -r 2356fbef64a6 -r ee64cd644c0a 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
      Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
      Thu May 26 21:09:23 2011 +0200
@@ -274,6 +274,7 @@
     xmlDocument.setParameter("actualPayment", payment.getAmount().toString());
     xmlDocument.setParameter("headerAmount", payment.getAmount().toString());
     xmlDocument.setParameter("isReceipt", (payment.isReceipt() ? "Y" : "N"));
+    xmlDocument.setParameter("isSoTrx", (payment.isReceipt()) ? "Y" : "N");
     if (payment.getBusinessPartner() == null
         && (payment.getGeneratedCredit() != null || 
payment.getGeneratedCredit().compareTo(
             BigDecimal.ZERO) != 0)) {
diff -r 2356fbef64a6 -r ee64cd644c0a 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml
       Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml
       Thu May 26 21:09:23 2011 +0200
@@ -39,6 +39,7 @@
     <PARAMETER id="fieldWindowId" name="windowId" attribute="value"/>
     <PARAMETER id="fieldTabId" name="tabId" attribute="value"/>
     <PARAMETER id="fieldReceipt" name="isReceipt" attribute="value"/>
+    <PARAMETER id="fieldIsSoTrx" name="isSoTrx" attribute="value"/>
     <PARAMETER id="paramPrecision" name="precision" attribute="value"/>
     <PARAMETER id="paramHeaderAmount" name="headerAmount" attribute="value" 
format="euroEdition"/>
 
diff -r 2356fbef64a6 -r ee64cd644c0a 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
      Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
      Thu May 26 21:09:23 2011 +0200
@@ -367,8 +367,10 @@
   <input type="hidden" name="IsPopUpCall" value="1" />
   <input type="hidden" name="inpFinancialAccountId" value="" 
id="paramFinancialAccountId"/>
   <input type="hidden" name="isReceipt" value="" id="fieldReceipt"/>
+  <input type="hidden" name="inpissotrx" value="" id="fieldIsSoTrx"/>
   <input type="hidden" name="inpFinBankStatementLineId" value="" 
id="paramFinBankStatementLineId"></input>
   <input type="hidden" name="isFirstLoad" value="true"/>
+  <input type="hidden" name="inpadOrgId" value="" id="fieldOrg"/>
   <div class="Popup_ContentPane_CircleLogo">
     <div class="Popup_WindowLogo">
       <img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_process" 
src="../../../../../web/images/blank.gif" border=0/></img>
@@ -661,7 +663,7 @@
                     <td style="padding-top: 0px;">
                       <script>var sc_C_Bpartner_ID = null;</script>
                       <input type="hidden" name="inpcBpartnerId" 
id="C_Bpartner_ID" value="" onreset="sc_C_Bpartner_ID.resetSelector();" 
onchange="openbravo.Utilities.updateSmartClientComponentValue(this, 
sc_C_Bpartner_ID.selectorField);"></input>
-                      <script id="selectorLink" 
src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_Bpartner_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&callOut=onchangeBPartner&required=false"></script>
+                      <script id="selectorLink" 
src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_Bpartner_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&callOut=onchangeBPartner&required=false&filterClass=org.openbravo.userinterface.selector.SelectorDataSourceFilter&_selectorDefinitionId=A98899B1C75A4F4EBD3414F1B654EFAB"></script>
                     </td>
                   </tr>
                 </table>
diff -r 2356fbef64a6 -r ee64cd644c0a 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
      Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
      Thu May 26 21:09:23 2011 +0200
@@ -293,7 +293,9 @@
     xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() 
+ "\";");
     xmlDocument.setParameter("theme", vars.getTheme());
     xmlDocument.setParameter("isReceipt", (isReceipt) ? "Y" : "N");
+    xmlDocument.setParameter("isSoTrx", (isReceipt) ? "Y" : "N");
     xmlDocument.setParameter("finBankStatementLineId", 
strFinBankStatementLineId);
+    xmlDocument.setParameter("orgId", 
financialAccount.getOrganization().getId());
 
     // get DocumentNo
     final List<Object> parameters = new ArrayList<Object>();
diff -r 2356fbef64a6 -r ee64cd644c0a 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
       Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
       Thu May 26 21:09:23 2011 +0200
@@ -39,8 +39,10 @@
     <PARAMETER id="C_Bpartner_ID" name="businessPartner" attribute="value"/>
     <PARAMETER id="paramCredit" name="credit" attribute="value" 
format="euroEdition"/>
     <PARAMETER id="fieldReceipt" name="isReceipt" attribute="value"/>
+    <PARAMETER id="fieldIsSoTrx" name="isSoTrx" attribute="value"/>
     <PARAMETER id="paramPrecision" name="precision" attribute="value"/>
     <PARAMETER id="paramFinBankStatementLineId" name="finBankStatementLineId" 
attribute="value" default=""/>
+    <PARAMETER id="fieldOrg" name="orgId" attribute="value"/>
     
     <PARAMETER id="paramPaymentDate" name="paymentDate" attribute="value"/>
     <PARAMETER id="paramPaymentDate" name="dateDisplayFormat" 
attribute="displayformat" replace="xx"/>
diff -r 2356fbef64a6 -r ee64cd644c0a 
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  
Thu May 26 12:37:52 2011 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml  
Thu May 26 21:09:23 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.12445]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  
<VERSION><![CDATA[1.1.12466]]></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 2356fbef64a6 -r ee64cd644c0a 
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
       Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
       Thu May 26 21:09:23 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.12445]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  
<STARTVERSION><![CDATA[3.0.12466]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 2356fbef64a6 -r ee64cd644c0a 
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
 Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
 Thu May 26 21:09:23 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.12445]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  
<VERSION><![CDATA[2.1.12466]]></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 2356fbef64a6 -r ee64cd644c0a 
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
      Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
      Thu May 26 21:09:23 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.12445]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  
<STARTVERSION><![CDATA[2.1.12466]]></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.12445]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  
<STARTVERSION><![CDATA[2.1.12466]]></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.12445]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  
<STARTVERSION><![CDATA[3.0.12466]]></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.12445]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  
<STARTVERSION><![CDATA[8.1.12466]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 2356fbef64a6 -r ee64cd644c0a 
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
  Thu May 26 12:37:52 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java
  Thu May 26 21:09:23 2011 +0200
@@ -1,119 +1,119 @@
-package org.openbravo.client.application.businesslogic;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-
-import org.codehaus.jettison.json.JSONObject;
-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);
-      objCloneOrder.setSummedLineAmount(new BigDecimal("0"));
-      objCloneOrder.setGrandTotalAmount(new BigDecimal("0"));
-      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);
-      // get the lines associated with the order and clone them to the new
-      // order line.
-      List<OrderLine> lsOrderLines = getOrderLines(objOrder);
-
-      for (OrderLine ordLine : lsOrderLines) {
-        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();
-      json = jsonConverter.toJsonObject(objCloneOrder, DataResolvingMode.FULL);
-      OBDal.getInstance().commitAndClose();
-      return json;
-    } catch (Exception e) {
-      throw new OBException(e);
-    }
-  }
-
-  private List<OrderLine> getOrderLines(Order objOrder) throws 
ServletException {

------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery, 
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now. 
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to