diff --git a/india_compliance/gst_india/print_format/e_waybill/e_waybill.css b/india_compliance/gst_india/print_format/e_waybill/e_waybill.css index 3bf9be7803..3d03f5766c 100644 --- a/india_compliance/gst_india/print_format/e_waybill/e_waybill.css +++ b/india_compliance/gst_india/print_format/e_waybill/e_waybill.css @@ -1,8 +1,30 @@ + +.table-element { + font-size: 12px; +} + +.bold { + font-weight: bold; +} + +.no-border { + border: none !important; +} + +.no-border > * { + border: none; +} + .print-format { padding: 0.25in; color: black; } +table, th, td { + border: 1px solid #d1d8dd; + border-collapse: collapse; +} + @media print { .print-format { padding: 0; @@ -53,10 +75,6 @@ border-top: 1px solid black !important; } -.print-format .ewb-no-span { - font-size: 13px; -} - .print-format .section-separator { border-top: 2px solid #bbb; margin: 8px 0 16px; diff --git a/india_compliance/gst_india/print_format/e_waybill/e_waybill.html b/india_compliance/gst_india/print_format/e_waybill/e_waybill.html index 78a3abf4da..452b7533d8 100644 --- a/india_compliance/gst_india/print_format/e_waybill/e_waybill.html +++ b/india_compliance/gst_india/print_format/e_waybill/e_waybill.html @@ -6,281 +6,268 @@ {%- set irn = frappe.db.get_value("Sales Invoice", {"ewaybill": data.ewbNo}, "irn") -%} {% if data.supplyType == "O" %} - {% set generated_by = data.fromTrdName %} +{% set generated_by = data.fromTrdName %} {% else %} - {% set generated_by = data.toTrdName %} +{% set generated_by = data.toTrdName %} {% endif %} - -
- - - - - - - - - -
-

e-Waybill

-
- -
+ +
+ + + + + + + + + + +
+

e-Waybill

+
+ +
- - +
+
+ {% if irn %} {% endif %} + +
- e-Waybill No: + e-Waybill No - - {{ add_spacing(data.ewbNo, 4) }} + + {{ add_spacing(data.ewbNo, 4) }}
- e-Waybill Date: + e-Waybill Date - - {{ data.ewayBillDate | replace(":00 ", "") }} + + {{ data.ewayBillDate | replace("00 ", "") }}
- Generated By: + Generated By - - - {{ add_spacing(data.userGstin, 5) }} - {{ generated_by }} - + + {{ add_spacing(data.userGstin, 5) }} - {{ generated_by }}
- Valid From: + Valid From - - {{ data.ewayBillDate | replace(":00 ", " ") }} - {{ " [" }}{{ data.actualDist }}{{ "Kms]" }} + + {{ data.ewayBillDate | replace(":00 ", " ") }} {{ " [" }} {{ data.actualDist }}{{ "Kms]" }}
- Valid Until: + Valid Until - - {{ data.validUpto[:10] }} + + {{ data.validUpto[:10] }}
- IRN: + IRN - - {{ irn }} + + {{ irn }}
+ + +
+
+ Part - A +
+ + - - - - + - {% if data.VehiclListDetails|length > 0 %} - - +
-
- Part - A -
GSTIN of SupplierGSTIN of Supplier - - {{ add_spacing(data.fromGstin, 5) }}-{{ data.fromTrdName }} + + {{ add_spacing(data.fromGstin, 5) }} - {{ data.fromTrdName }}
Place of Dispatch - - {{ data.fromPlace }}, - {{ get_state(data.actFromStateCode) }} - - {{ data.fromPincode }} + + {{ data.fromPlace }}, {{ get_state(data.actFromStateCode) }} - {{ data.fromPincode }}
GSTIN of Recipient - - {{ add_spacing(data.toGstin, 5) }}-{{ data.toTrdName }} - + + {{ add_spacing(data.toGstin, 5) }} - {{ data.toTrdName }}
Place of Delivery - - {{ data.toPlace }}, - {{ get_state(data.actToStateCode) }} -{{ data.toPincode }} - + + {{ data.toPlace }}, {{ get_state(data.actToStateCode) }} -{{ data.toPincode }}
Document No. - + {{ data.docNo }} -
Document Date - + {{ data.docDate }} -
- Transaction Type: + Transaction Type - {{ get_transport_type(data.transactionType) }} + + {{ get_transport_type(data.transactionType) }}
Value of Goods - - - {{ frappe.utils.fmt_money(data.totInvValue, currency="INR") }} + + {{ frappe.utils.fmt_money(data.totInvValue, currency="INR") }}
HSN Code - - {{ data.itemList[0].hsnCode }} - {%if data.itemList[0].productDesc%} - {{ " - " ~data.itemList[0].productDesc }} - {%endif%} - + + {{ data.itemList[0].hsnCode }} + {%if data.itemList[0].productDesc%} + {{ " - " ~data.itemList[0].productDesc }} + {%endif%}
Reason for Transportation - - {{ get_supply_type(data.supplyType) }} - {{ get_sub_supply_type(data.subSupplyType) }} + + {{ get_supply_type(data.supplyType) }} - {{ get_sub_supply_type(data.subSupplyType) }}
Transporter - - {{ add_spacing(data.transporterId, 5) }}- - {{ data.transporterName }} + + {{ add_spacing(data.transporterId, 5) }} - {{ data.transporterName }}
-
- Part - B +
+
+ +
+ {% if data.VehiclListDetails|length > 0 %} +
+ Part - B +
+ + + + + - - - + + + - - {% endif %} - - + + {% for detail in data.VehiclListDetails %} - + + + + + + + {% endfor%}
Mode + Vehicle / Trans
+ Doc No & Dt.
-
- - - - - - - - - - - - {% for detail in data.VehiclListDetails %} - - - - - - - - - - {% endfor%} - -
Mode - Vehicle / Trans
- Doc No & Dt. - 		FromEntered DateEntered By - Cdata No.
- (If any) - 		- Multi Veh.Info
- (If any) -
- {{ get_transport_mode(detail.transMode) }} - - {{ detail.vehicleNo }} / - {{ detail.transDocNo }} Dt: - {{ detail.transDocDate }} - {{ detail.fromPlace }} - {{ detail.enteredDate | - replace(":00 ", " ") }} - {{ detail.userGSTINTransin }}--
-
+ 		FromEntered DateEntered By + Cdata No.
+ (If any)
- + + Multi Veh.Info
+ (If any)
-
+ 		+ {{ get_transport_mode(detail.transMode) }} + + {{ detail.vehicleNo }} / + {{ detail.transDocNo }} Dt + {{ detail.transDocDate }} + {{ detail.fromPlace }} + {{ detail.enteredDate | + replace(":00 ", " ") }} {{ detail.userGSTINTransin }}--
-
- - + {% endif %} + + + + + + + + +
+
+ +
+
+
+
+ + + \ No newline at end of file diff --git a/india_compliance/gst_india/print_format/e_waybill_detailed/e_waybill_detailed.css b/india_compliance/gst_india/print_format/e_waybill_detailed/e_waybill_detailed.css index 1bca28f792..5332c0f943 100644 --- a/india_compliance/gst_india/print_format/e_waybill_detailed/e_waybill_detailed.css +++ b/india_compliance/gst_india/print_format/e_waybill_detailed/e_waybill_detailed.css @@ -44,12 +44,12 @@ thead > th { table, th, td { - border: 1px solid black; + border: 1px solid #d1d8dd; border-collapse: collapse; } .table-element .border div { - border: 1px solid black !important; + border: 1px solid #d1d8dd !important; width: 100%; padding: 5px; }