Skip to content

Commit

Permalink
chore: merge develop into main (#363)
Browse files Browse the repository at this point in the history
  • Loading branch information
maharshivpatel authored Oct 1, 2024
2 parents ff474bb + 3986dff commit d5d0b0a
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 32 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
"attached_to_doctype": "Print Format",
"attached_to_field": "print_designer_preview_img",
"attached_to_name": "Sales Invoice PD Format v2",
"content_hash": "360404e78fedf97c58269738b5e58b64",
"creation": "2024-04-16 19:22:32.564571",
"content_hash": "da5da924827ebd1a230b7f337533003c",
"creation": "2024-09-30 12:47:23.295351",
"docstatus": 0,
"doctype": "File",
"file_name": "print_designer-sales_invoice_pd_format_v2-preview.jpg",
"file_size": 148126,
"file_name": "print_designer-sales_invoice_pd_format_v2-preview33003c.jpg",
"file_size": 148176,
"file_type": "JPG",
"file_url": "/private/files/print_designer-sales_invoice_pd_format_v2-preview.jpg",
"file_url": "/private/files/print_designer-sales_invoice_pd_format_v2-preview33003c.jpg",
"folder": "Home",
"idx": 0,
"is_attachments_folder": 0,
"is_folder": 0,
"is_home_folder": 0,
"is_private": 1,
"modified": "2024-04-16 19:22:32.564571",
"modified": "2024-09-30 12:47:23.295351",
"modified_by": "Administrator",
"name": "040d5e33f6",
"name": "af183489da",
"owner": "Administrator",
"uploaded_to_dropbox": 0,
"uploaded_to_google_drive": 0
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
"attached_to_doctype": "Print Format",
"attached_to_field": "print_designer_preview_img",
"attached_to_name": "Sales Order PD v2",
"content_hash": "37ff9dd2c9e9a1de2aa350a2336a56eb",
"creation": "2024-04-16 19:07:23.829817",
"content_hash": "e5986e82c0d55483cd7b98c6713f12d3",
"creation": "2024-05-05 23:13:14.641285",
"docstatus": 0,
"doctype": "File",
"file_name": "print_designer-sales_order_pd_v2-preview6a56eb.jpg",
"file_size": 154063,
"file_name": "print_designer-sales_order_pd_v2-preview3f12d3.jpg",
"file_size": 155745,
"file_type": "JPG",
"file_url": "/private/files/print_designer-sales_order_pd_v2-preview6a56eb.jpg",
"file_url": "/private/files/print_designer-sales_order_pd_v2-preview3f12d3.jpg",
"folder": "Home",
"idx": 0,
"is_attachments_folder": 0,
"is_folder": 0,
"is_home_folder": 0,
"is_private": 1,
"modified": "2024-04-16 19:07:23.829817",
"modified": "2024-05-05 23:13:14.641285",
"modified_by": "Administrator",
"name": "9ec0db389d",
"name": "7f0092ceff",
"owner": "Administrator",
"uploaded_to_dropbox": 0,
"uploaded_to_google_drive": 0
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions print_designer/default_templates/erpnext/sales_order_pd_v2.json

Large diffs are not rendered by default.

0 comments on commit d5d0b0a

Please sign in to comment.