Merge pull request 'merge' (#2) from develop into version-14

Reviewed-on: #2

label_printing/public/js/label_printing_desk.js

@@ -279,4 +279,4 @@ function get_doc(doctype, docname) {
     }
   });
   return res;
-}
+}