diff --git a/entity/Order_entity/entityfields/cancel/onActionProcess.js b/entity/Order_entity/entityfields/cancel/onActionProcess.js
index f138c6f5779923d74ae1b3ecb9202739a28f1ad6..ac1aa595f2f0951607e42117efa0ca56860e8b52 100644
--- a/entity/Order_entity/entityfields/cancel/onActionProcess.js
+++ b/entity/Order_entity/entityfields/cancel/onActionProcess.js
@@ -21,6 +21,8 @@ var footer = vars.getString("$field.FOOTER");
 var offerId = vars.getString("$field.OFFER_ID");
 var deliveryTerm = vars.getString("$field.DELIVERYTERMS");
 var paymentTerm = vars.getString("$field.PAYMENTTERMS");
+var deliveryAddress = vars.getString("$field.DELIVERYADDRESS");
+var paymentAddress = vars.getString("$field.PAYMENTADDRESS");
 var rowId = vars.getString("$field.OBJECT_ROWID");
 var objectType = vars.getString("$field.OBJECT_TYPE");
 var dunningDate = vars.getString("$field.DUNNINGDATE");
@@ -29,8 +31,7 @@ var orderType= $KeywordRegistry.orderType$cancellation();
 var cancellation= vars.getString("$field.CANCELLATION");
 var orderStatus=vars.getString("$field.ORDERSTATUS");
 
-
-OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
+OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, paymentAddress, deliveryAddress, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
 
 
     
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/neworder/onActionProcess.js b/entity/Order_entity/entityfields/neworder/onActionProcess.js
index d84e79a2958d057aca8b66fc2e61c51ce6635283..d73a39e61fe0b77c7736dd936384a78344dd2e9d 100644
--- a/entity/Order_entity/entityfields/neworder/onActionProcess.js
+++ b/entity/Order_entity/entityfields/neworder/onActionProcess.js
@@ -22,7 +22,5 @@ var orderType= vars.getString("$field.ORDERTYPE");
 var cancellation= vars.getString("$field.CANCELLATION");
 var orderStatus=vars.getString("$field.ORDERSTATUS");
 
-
-
 OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, paymentAddress, deliveryAddress, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
     
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js b/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js
index 7df2878f7159380f8d034109c9d7637dbc9b1a18..d45901068c7376e9d81aa1f6d8998326c3de4d43 100644
--- a/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js
+++ b/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js
@@ -12,6 +12,8 @@ var footer = vars.getString("$field.FOOTER");
 var offerId = vars.getString("$field.OFFER_ID");
 var deliveryTerm = vars.getString("$field.DELIVERYTERMS");
 var paymentTerm = vars.getString("$field.PAYMENTTERMS");
+var deliveryAddress = vars.getString("$field.DELIVERYADDRESS");
+var paymentAddress = vars.getString("$field.PAYMENTADDRESS");
 var rowId = vars.getString("$field.OBJECT_ROWID");
 var objectType = vars.getString("$field.OBJECT_TYPE");
 var dunningDate = vars.getString("$field.DUNNINGDATE");
@@ -20,7 +22,5 @@ var orderType= $KeywordRegistry.orderType$deliverynote();
 var cancellation= vars.getString("$field.CANCELLATION");
 var orderStatus=vars.getString("$field.ORDERSTATUS");
 
-
-
-OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
+OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, paymentAddress, deliveryAddress, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
     
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js b/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js
index ee940353c0be659e4b49c56515b2bee5b67eba2f..8c722274346b912365e016e416bdf8548cf26234 100644
--- a/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js
+++ b/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js
@@ -12,6 +12,8 @@ var footer = vars.getString("$field.FOOTER");
 var offerId = vars.getString("$field.OFFER_ID");
 var deliveryTerm = vars.getString("$field.DELIVERYTERMS");
 var paymentTerm = vars.getString("$field.PAYMENTTERMS");
+var deliveryAddress = vars.getString("$field.DELIVERYADDRESS");
+var paymentAddress = vars.getString("$field.PAYMENTADDRESS");
 var rowId = vars.getString("$field.OBJECT_ROWID");
 var objectType = vars.getString("$field.OBJECT_TYPE");
 var dunningDate = vars.getString("$field.DUNNINGDATE");
@@ -20,7 +22,4 @@ var orderType= $KeywordRegistry.orderType$invoice();
 var cancellation= vars.getString("$field.CANCELLATION");
 var orderStatus=vars.getString("$field.ORDERSTATUS");
 
-
-
-OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
-    
\ No newline at end of file
+OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, paymentAddress, deliveryAddress, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
\ No newline at end of file
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index b4f3079120d7a8a1aa6ec25b143907f2460bf2ad..1b63174cd482898d136d320164819cefba2b2cd8 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -92,6 +92,7 @@ OrderUtils.createNewOrder = function(pContextId, pRowId, pRelationId)
     neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
 }
 
+//TODO refactor function to minimize the params and only give an object that contains the data
 OrderUtils.copyOrder = function (pOfferId, pContactId, pOrderType, pLanguage, pCurrency, pHeader, pFooter, pDeliveryTerm, pPaymentTerm, pPaymentAddress, pDeliveryAddress, pObjectType, pRowId, pDunningDate, pDunningLevel, pCancellation, pOrderStatus)
 {
     var params = {