diff --git a/CHANGES.rst b/CHANGES.rst
index 7fb7a8e86c..32c54f4cde 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,7 @@ Changelog
2.6.0 (unreleased)
------------------
+- #2658 Batched sample registration form with Paste capabilities
- #2654 Show Batch title or ID in Sample reference field
- #2657 Methods from analyses are not updated on instrument change in worksheet
- #2656 Fix AnalysisProfile keyword validator fail with non-ascii value
diff --git a/src/bika/lims/browser/analysisrequest/add2.py b/src/bika/lims/browser/analysisrequest/add2.py
index c6bed2902e..cc952f0e3f 100644
--- a/src/bika/lims/browser/analysisrequest/add2.py
+++ b/src/bika/lims/browser/analysisrequest/add2.py
@@ -68,6 +68,7 @@
AR_CONFIGURATION_STORAGE = "bika.lims.browser.analysisrequest.manage.add"
SKIP_FIELD_ON_COPY = ["Sample", "PrimaryAnalysisRequest", "Remarks",
"NumSamples", "_ARAttachment"]
+NO_COPY_FIELDS = ["_ARAttachment"]
def cache_key(method, self, obj):
@@ -563,6 +564,15 @@ def is_service_selected(self, service):
return True
return False
+ def show_copy_button_for(self, field=None):
+ """ Show copy/paste button for field
+ """
+ if self.ar_count <= 1:
+ return False
+ if field and field.getName() in NO_COPY_FIELDS:
+ return False
+ return True
+
class AnalysisRequestManageView(BrowserView):
"""AR Manage View
diff --git a/src/bika/lims/browser/analysisrequest/templates/ar_add2.pt b/src/bika/lims/browser/analysisrequest/templates/ar_add2.pt
index f0ac4ff9de..a2bc1b58ec 100644
--- a/src/bika/lims/browser/analysisrequest/templates/ar_add2.pt
+++ b/src/bika/lims/browser/analysisrequest/templates/ar_add2.pt
@@ -24,6 +24,18 @@
+
+
+