Changed default label printer

.gitignore

@@ -17,5 +17,3 @@ __pycache__
 .vscode/
 node_modules/
 .backportrc.json
-label_printing/public/node_modules
-*/node_modules/*

label_printing/__init__.py

@@ -1,2 +1,3 @@
 
-__version__ = '14.38.0'
+__version__ = '0.0.1'
+

label_printing/api.py

@@ -31,8 +31,6 @@ def print_label(values):
             doc.qty = label["item_qty"]
         if "information" in label:
             doc.information = label["information"]
-        if "is_warehouse_label" in label:
-            doc.is_warehouse_label = label["is_warehouse_label"]
 
         newdoc = doc.insert()
 

label_printing/label_printing/doctype/label/label.json

@@ -14,8 +14,7 @@
   "delivery_date",
   "customer",
   "batch",
-  "information",
+  "information"
-  "is_warehouse_label"
  ],
  "fields": [
   {
@@ -61,22 +60,15 @@
    "fieldname": "information",
    "fieldtype": "Data",
    "label": "Information"
-  },
-  {
-   "default": "0",
-   "fieldname": "is_warehouse_label",
-   "fieldtype": "Check",
-   "label": "Is Warehouse Label"
   }
  ],
  "icon": "fa fa-tag",
  "links": [],
- "modified": "2023-05-11 08:17:16.609583",
+ "modified": "2022-02-17 09:25:53.912471",
  "modified_by": "Administrator",
  "module": "Label Printing",
  "name": "Label",
  "name_case": "UPPER CASE",
- "naming_rule": "Expression (old style)",
  "owner": "Administrator",
  "permissions": [
   {
@@ -105,6 +97,5 @@
   }
  ],
  "sort_field": "modified",
- "sort_order": "DESC",
+ "sort_order": "DESC"
- "states": []
 }

label_printing/label_printing/print_format/label/label.json

@@ -2,23 +2,22 @@
  "absolute_value": 0,
  "align_labels_right": 0,
  "creation": "2022-03-01 09:42:22.551134",
- "css": ".print-format {\n\tmargin: 0;\n\tpadding: 0;\n    margin-left: 1mm;\n    margin-right: 1mm;\n    margin-top: 1mm;\n    margin-bottom: 1mm;\n\twidth: 100mm;\n\tmax-height: 39mm;\n}\n\n.page-size {\n\twidth: 104mm;\n\theight: 40mm;\n}\n\n.label-wrapper {\n\twidth: 104mm;\n\ttext-align: center;\n\tdisplay: -webkit-box;\n\t/* wkhtmltopdf uses this one */\n\tdisplay: -webkit-flex;\n\tdisplay: flex;\n\t-webkit-box-pack: center;\n\t/* wkhtmltopdf uses this one */\n\t-webkit-justify-content: center;\n\tjustify-content: center;\n\tfont-size: 15px;\n}\n\n.left-wrapper {\n\twidth: 80mm;\n\tmargin-top: 1mm;\n}\n\n.left-wrapper div {\n\twhite-space: nowrap;\n\tfont-size: 12px;\n}\n\n.right-wrapper {\n\twidth: 20mm;\n\ttext-align: right;\n}\n\n.label-wrapper h4 {\n\tmargin: 0;\n\twhite-space: nowrap;\n\tfont-size: 23px;\n}\n\n.label-wrapper h5 {\n\tmargin: 0;\n\twhite-space: nowrap;\n\tfont-size: 15px;\n}\n\n\n.right-wrapper {\n    padding-right: 2mm;\n    padding-top: 0.5mm;\n}\n",
+ "css": ".print-format {\n\tmargin: 0;\n\tpadding: 0;\n    margin-left: 1mm;\n    margin-right: 1mm;\n    margin-top: 1mm;\n    margin-bottom: 1mm;\n\twidth: 100mm;\n\tmax-height: 39mm;\n}\n\n.page-size {\n\twidth: 104mm;\n\theight: 40mm;\n}\n\n.label-wrapper {\n\twidth: 100mm;\n\ttext-align: center;\n\tdisplay: -webkit-box;\n\t/* wkhtmltopdf uses this one */\n\tdisplay: -webkit-flex;\n\tdisplay: flex;\n\t-webkit-box-pack: center;\n\t/* wkhtmltopdf uses this one */\n\t-webkit-justify-content: center;\n\tjustify-content: center;\n\tfont-size: 15px;\n}\n\n.left-wrapper {\n\twidth: 80mm;\n}\n\n.left-wrapper div {\n\twhite-space: nowrap;\n\tfont-size: 12px;\n}\n\n.right-wrapper {\n\twidth: 20mm;\n\ttext-align: right;\n}\n\n.label-wrapper h4 {\n\tmargin: 0;\n\twhite-space: nowrap;\n\tfont-size: 23px;\n}\n\n.label-wrapper h4 small {\n\tcolor: black;\n}\n\n",
  "custom_format": 1,
- "default_print_language": "de",
  "disabled": 0,
  "doc_type": "Label",
  "docstatus": 0,
  "doctype": "Print Format",
  "font": "Default",
  "font_size": 0,
- "html": "{% if not doc.is_warehouse_label == true %} \n<div class=\"label-wrapper\">\n   <div class=\"left-wrapper\">\n      {% if doc.customer %} \n      <h5><strong>{{doc.customer}}</strong></h5>\n      {% endif %}\n      {% if doc.item_code %} \n      <h4><strong>{{doc.item_code}}</strong></h4>\n      {% endif %}\n      {% if doc.item_name%} \n      <h5>{{doc.item_name}}</h5>\n      {% endif %}\n      {% if doc.delivery_date %} \n      <div> <strong> {{_(\"Delivery Date\")}} </strong> {{frappe.utils.formatdate(doc.delivery_date, \"dd.MM.YYYY\")}} </div>\n      {% endif %}\n      {% if doc.qty %} \n      <div> <strong>{{_(\"Qty\")}} </strong> {{ doc.qty }}</div>\n      {% endif %}\n      {% if doc.batch %}\n      <div><strong>{{_(\"Batch\")}} </strong> {{doc.batch}}</div>\n      {% endif %}\n      \n      {% if doc.information%} \n      <div> {{doc.information}} </div>\n      {% endif %} \n   </div>\n   <div class=\"right-wrapper\"> <img src=\"/files/hp_logo_black.jpg\" style=\"width: 30px;\"> </div>\n</div>\n{% else %} \n<div class=\"label-wrapper\">\n   <div class=\"left-wrapper\">\n      {% if doc.customer %} \n      <h5 style=\"font-size: 40px;\"><strong>{{doc.customer}}</strong></h5>\n      {% endif %}\n      {% if doc.item_code %} \n      <h4 style=\"font-size: 30px;\"><strong>{{doc.item_code}}</strong></h4>\n      {% endif %}\n      {% if doc.item_name%} \n      <h5 style=\"font-size: 20px;\">{{doc.item_name}}</h5>\n      {% endif %}\n      \n      {% if doc.batch %}\n      <div><strong>{{_(\"Batch\")}} </strong> {{doc.batch}}</div>\n      {% endif %}\n      \n      {% if doc.information%} \n      <div> {{doc.information}} </div>\n      {% endif %} \n   </div>\n</div>\n{% endif %}\n",
+ "html": "{% if doc.customer %}\n<div class=\"label-wrapper\">\n\n  <div class=\"left-wrapper\">\n    {% if doc.item_code %}\n    <h4>\n      <strong>{{doc.item_code}}</strong>\n    </h4>\n    {% endif %}\n\n    {% if doc.item_name%}\n    <h4>\n      <small> {{doc.item_name}}</small>\n    </h4>\n    {% endif %}\n\n\n    {% if doc.customer %}\n    <div>{{doc.customer}}</div>\n    {% endif %}\n\n    {% if doc.delivery_date %}\n    <div>\n      <strong> {{_(\"Delivery Date\")}} </strong> {{frappe.utils.formatdate(doc.delivery_date, \"dd.MM.YYYY\")}}\n    </div>\n    {% endif %}\n\n    {% if doc.batch %}\n    <div>\n      <strong>{{_(\"Batch\")}} </strong> {{doc.batch}}\n    </div>\n    {% endif %}\n\n    {% if doc.qty %}\n    <div>\n      <strong>{{_(\"Qty\")}} </strong> {{ doc.qty }}\n    </div>\n    {% endif %}\n\n    {% if doc.information%}\n    <div>\n     {{doc.information}}\n    </div>\n    {% endif %}\n\n\n  </div>\n  \n   <div class=\"right-wrapper\">\n    <img src=\"/files/hp_logo_black.jpg\" style=\"width: 30px;\">\n  </div>\n</div>\n\n{% else %}\n\n<div class=\"label-wrapper\">\n\n  <div class=\"left-wrapper\">\n    {% if doc.item_code %}\n    <h4 style=\"font-size: 30px; white-space: normal; padding: 2mm;\">\n      <strong>{{doc.item_code}}</strong>\n    </h4>\n    {% endif %}\n\n\n    {% if doc.batch %}\n    <div style=\"font-size: 15px;\">\n      <strong>{{_(\"Batch\")}} </strong> {{doc.batch}}\n    </div>\n    {% endif %}\n\n\n    {% if doc.information%}\n    <div>\n     {{doc.information}}\n    </div>\n    {% endif %}\n\n\n  </div>\n</div>\n\n{% endif %}",
  "idx": 0,
  "line_breaks": 0,
  "margin_bottom": 0.0,
  "margin_left": 0.0,
  "margin_right": 0.0,
  "margin_top": 0.0,
- "modified": "2023-08-28 13:06:58.300849",
+ "modified": "2022-11-10 12:13:59.766486",
  "modified_by": "Administrator",
  "module": "Label Printing",
  "name": "Label",

label_printing/public/js/label_printing_desk.js

@@ -28,17 +28,16 @@ function setupLabelsDialog(page) {
     }
   }
 
+  let label_printer_names
+
   let d = new frappe.ui.Dialog({
     title: __("Print Labels"),
     fields: [{
       label: __("Reference Doctype"),
-      options: ['Work Order', 'Item', 'Label', 'Stock Entry'],
+      options: ['Work Order', 'Item', 'Label'],
       fieldname: 'doctype',
       fieldtype: 'Select',
-      default: cur_frm.doc.doctype,
+      default: fields.doctype,
-      onchange() {
-        d.set_df_property('docname', 'options', d.fields_dict.doctype.value);
-      }
     },
     {
       label: __("Get data"),
@@ -54,9 +53,9 @@ function setupLabelsDialog(page) {
     {
       label: __("Reference Docname"),
       fieldname: 'docname',
-      fieldtype: 'Link',
+      fieldtype: 'Data',
-      options: cur_frm.doc.doctype,
+      options: 'doctype',
-      default: cur_frm.doc.name
+      default: fields.docname,
     },
     {
       fieldtype: 'Section Break',
@@ -105,14 +104,6 @@ function setupLabelsDialog(page) {
       fieldtype: 'Section Break',
       label: __('Labels')
     },
-    {
-      label: __("Add Warehouse Label"),
-      fieldname: 'add_warehouse_label',
-      fieldtype: 'Button',
-      click: () => {
-        addWarehouseLabel()
-      }
-    },
     {
       fieldname: "labels",
       fieldtype: "Table",
@@ -140,12 +131,6 @@ function setupLabelsDialog(page) {
         in_list_view: 1,
         label: __('Information')
       },
-      {
-        label: __("Is Warehouse Labael"),
-        fieldname: 'is_warehouse_label',
-        in_list_view: 1,
-        fieldtype: 'Check'
-      },
       ]
     },
     ],
@@ -225,42 +210,11 @@ function setupLabelsDialog(page) {
             fields.customer = doc.associated_company
           }
         }
-      } else if (fields.doctype === "Stock Entry") {
-        let item = get_doc("Item", doc.items.slice(-1)[0].item_code)
-        let workorder = get_doc("Work Order", doc.work_order)
-
-        fields.item_code = item.item_code
-        fields.item_name = item.item_name
-        fields.delivery_date = workorder.expected_delivery_date
-        fields.labels[0].item_qty = workorder.qty
-        fields.labels[0].label_qty = 1
-        fields.batch = doc.items.slice(-1)[0].batch_no
-
-        if (item.associated_company) {
-          let customer = get_doc("Customer", item.associated_company)
-          if (customer.short_name) {
-            fields.customer = customer.short_name
-          } else {
-            fields.customer = item.associated_company
-          }
-        }
-
-        fields.total_amount = doc.qty
-        d.fields_dict.labels.refresh();
-
       }
       d.set_values(fields)
     }
   }
 
-  function addWarehouseLabel() {
-    fields = d.get_values()
-    let tempValues = d.get_values()
-    tempValues.labels.push({ item_qty: 0, label_qty: 1, is_warehouse_label: true })
-    console.log(tempValues)
-    d.fields_dict.labels.refresh()
-  }
-
 }
 
 function get_doc(doctype, docname) {

label_printing/public/node_modules

@@ -1 +1 @@
-/workspace/development/frappe-bench/apps/label_printing/node_modules
+/home/frappe/frappe-bench/apps/label_printing/node_modules