💄 Beautify Print Formats and add Terms And conditions (#4)

* 🎨 Beautify Sales Invoice and add Terms And conditions * ✨ Add 4 Terms and conditions Signed-off-by: Emil <[email protected]> * ✨ Add Website generic T&C Signed-off-by: Emil <[email protected]> * 🎨 Add new design of sales invoice Signed-off-by: Emil <[email protected]> * 🐛 Fix bug with Terms and conditions Signed-off-by: Emil <[email protected]> * 🐛 Fix bug with 20/30/50 Signed-off-by: Emil <[email protected]> * 💄 Add new design for Quotation, Purchase Invoice and Salary Slip Signed-off-by: Emil <[email protected]> * 💄 New design of Quotation, Salary Slip and Purchase Invoice Signed-off-by: Emil <[email protected]> * 🍱 Add new images for frappe docs Signed-off-by: Emil <[email protected]> * 💄 Modified sales invoice Signed-off-by: Emil <[email protected]> * 💄 Upgrade design Signed-off-by: Emil <[email protected]> * 🍱 Add images inside assets Signed-off-by: Emil <[email protected]> * 🎨 Update Purchase Invoice Signed-off-by: Emil <[email protected]> * 🎨 Change margin for Purchase Invoice Signed-off-by: Emil <[email protected]> * 📝 Move Termsfeed reference Signed-off-by: mathieu.brunot <[email protected]> * 🎨 Improve CSS for Print Formats Signed-off-by: mathieu.brunot <[email protected]> * 🔧 Fix list of fixtures Signed-off-by: mathieu.brunot <[email protected]> Co-authored-by: mathieu.brunot <[email protected]>
Monogramm · Jul 15, 2020 · 060a4d7 · 060a4d7
1 parent 182b22b
commit 060a4d7
Show file tree

Hide file tree

Showing 15 changed files with 174 additions and 101 deletions.
diff --git a/README.md b/README.md
@@ -53,9 +53,7 @@ When installing Frappe app, the following python requirements will be installed:
 
 ## :rocket: Usage
 
-How to use this application:
-
-Use Recod print formats, website themes, etc...
+How to use this application improve ERPNext print formats, website themes, etc...
 
 <!--
 [TODO] If project is deployed to DockerHub:

diff --git a/recod_erpnext_design/docs/assets/recod_print_format_purchase_invoice.png b/recod_erpnext_design/docs/assets/recod_print_format_purchase_invoice.png
diff --git a/recod_erpnext_design/docs/assets/recod_print_format_quotation.png b/recod_erpnext_design/docs/assets/recod_print_format_quotation.png
diff --git a/recod_erpnext_design/docs/assets/recod_print_format_salary_slip.png b/recod_erpnext_design/docs/assets/recod_print_format_salary_slip.png
diff --git a/recod_erpnext_design/docs/assets/recod_print_format_sales_invoice.png b/recod_erpnext_design/docs/assets/recod_print_format_sales_invoice.png
diff --git a/...d_erpnext_design/docs/assets/terms_and_conditions_20-30-50-by-bank-transfer.png b/...d_erpnext_design/docs/assets/terms_and_conditions_20-30-50-by-bank-transfer.png
diff --git a/recod_erpnext_design/docs/assets/terms_and_conditions_on_delivery.png b/recod_erpnext_design/docs/assets/terms_and_conditions_on_delivery.png
diff --git a/recod_erpnext_design/docs/assets/terms_and_conditions_on_due_date.png b/recod_erpnext_design/docs/assets/terms_and_conditions_on_due_date.png
diff --git a/recod_erpnext_design/docs/assets/terms_and_conditions_on_receipt.png b/recod_erpnext_design/docs/assets/terms_and_conditions_on_receipt.png
diff --git a/recod_erpnext_design/docs/user/.gitkeep b/recod_erpnext_design/docs/user/.gitkeep
diff --git a/recod_erpnext_design/docs/user/index.md b/recod_erpnext_design/docs/user/index.md
@@ -40,6 +40,30 @@ To use them, go to "_Website Settings_" and apply one of the available themes.
 
 ![Recod Website Dark Theme](./assets/recod_website_theme_dark.jpg "Recod Dark Theme Header")
 
+## Terms and Conditions
+
+### Payment 20/30/50 by bank transfer
+
+![20-30-50 screenshot](./assets/terms_and_conditions_20-30-50-by-bank-transfer.png "20-30-50 by bank transfer")
+
+### Payment on delivery by bank transfer
+
+![On delivery screenshot](./assets/terms_and_conditions_on_delivery.png "Terms and conditions on delivery")
+
+### Payment on due date by bank transfer
+
+![On due date screenshot](./assets/terms_and_conditions_on_due_date.png "On due date")
+
+### Payment on receipt by bank transfer
+
+![On receipt screenshot](./assets/terms_and_conditions_on_receipt.png "On receipt")
+
+### Termsfeed
+
+> We used **[Termsfeed](https://app.termsfeed.com/)** services to generate the following Terms and conditions.
+
+**TODO**
+
 ## License
 
 Copyright © 2020 [Monogramm](https://github.com/Monogramm).<br />

diff --git a/recod_erpnext_design/fixtures/print_format.json b/recod_erpnext_design/fixtures/print_format.json
diff --git a/recod_erpnext_design/fixtures/terms_and_conditions.json b/recod_erpnext_design/fixtures/terms_and_conditions.json
@@ -0,0 +1,50 @@
+[
+  {
+    "disabled": 0,
+    "docstatus": 0,
+    "doctype": "Terms and Conditions",
+    "modified": "2020-06-15 09:31:43.710267",
+    "name": "Payment 20/30/50 by bank transfer",
+    "parent": null,
+    "parentfield": null,
+    "parenttype": null,
+    "terms": "<h4>{{_(\"Terms and Conditions\")}}</h4><div class=\"row data-field\" data-fieldname=\"payment_conditions\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"Payment conditions\")}}</label></div><div class=\"col-xs-7 text-left value\">{{_(\"20% before starting, 30% middle, 50% at the end\")}}</div></div>{% set links=frappe.get_all('Bank Account', filters={'company': company, 'is_default': 1}, fields=['company', 'bank', 'iban', 'bank_account_no', 'branch_code', 'swift_number'] ) %}{% if links %}{% set bank_account=links[0] %}{% if bank_account %}<strong>{{_(\"Payment by transfer to the following bank account:\")}}</strong>{% if bank_account.company %}<div class=\"row data-field\" data-fieldname=\"company\" data-fieldtype=\"Link\"><div class=\"col-xs-5\"><label>{{_(\"Bank Account\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.company}}</div></div>{% endif %}{% if bank_account.bank %}<div class=\"row data-field\" data-fieldname=\"bank\" data-fieldtype=\"Link\"><div class=\"col-xs-5\"><label>{{_(\"Bank\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.bank}}</div></div>{% endif %}{% if bank_account.iban %}<div class=\"row data-field\" data-fieldname=\"iban\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"IBAN\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.iban}}</div></div>{% endif %}{% if bank_account.bank_account_no %}<div class=\"row data-field\" data-fieldname=\"bank_account_no\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"Bank Account No\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.bank_account_no}}</div></div>{% endif %}{% if bank_account.branch_code %}<div class=\"row data-field\" data-fieldname=\"branch_code\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"Branch Code\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.branch_code}}</div></div>{% endif %}{% if bank_account.swift_number %}<div class=\"row data-field\" data-fieldname=\"swift_number\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"SWIFT number\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.swift_number}}</div></div>{% endif %}{% endif %}{% endif %}",
+    "title": "Payment 20/30/50 by bank transfer"
+  },
+  {
+    "disabled": 0,
+    "docstatus": 0,
+    "doctype": "Terms and Conditions",
+    "modified": "2020-06-15 09:31:12.018637",
+    "name": "Payment on due date by bank transfer",
+    "parent": null,
+    "parentfield": null,
+    "parenttype": null,
+    "terms": "<h4>{{_(\"Terms and Conditions\")}}</h4><div class=\"row data-field\" data-fieldname=\"payment_conditions\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"Payment conditions\")}}</label></div><div class=\"col-xs-7 text-left value\">{{_(\"on due date\")}}</div></div>{% set links=frappe.get_all('Bank Account', filters={'company': company, 'is_default': 1}, fields=['company', 'bank', 'iban', 'bank_account_no', 'branch_code', 'swift_number'] ) %}{% if links %}{% set bank_account=links[0] %}{% if bank_account %}<strong>{{_(\"Payment by transfer to the following bank account:\")}}</strong>{% if bank_account.company %}<div class=\"row data-field\" data-fieldname=\"company\" data-fieldtype=\"Link\"><div class=\"col-xs-5\"><label>{{_(\"Bank Account\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.company}}</div></div>{% endif %}{% if bank_account.bank %}<div class=\"row data-field\" data-fieldname=\"bank\" data-fieldtype=\"Link\"><div class=\"col-xs-5\"><label>{{_(\"Bank\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.bank}}</div></div>{% endif %}{% if bank_account.iban %}<div class=\"row data-field\" data-fieldname=\"iban\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"IBAN\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.iban}}</div></div>{% endif %}{% if bank_account.bank_account_no %}<div class=\"row data-field\" data-fieldname=\"bank_account_no\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"Bank Account No\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.bank_account_no}}</div></div>{% endif %}{% if bank_account.branch_code %}<div class=\"row data-field\" data-fieldname=\"branch_code\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"Branch Code\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.branch_code}}</div></div>{% endif %}{% if bank_account.swift_number %}<div class=\"row data-field\" data-fieldname=\"swift_number\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"SWIFT number\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.swift_number}}</div></div>{% endif %}{% endif %}{% endif %}",
+    "title": "Payment on due date by bank transfer"
+  },
+  {
+    "disabled": 0,
+    "docstatus": 0,
+    "doctype": "Terms and Conditions",
+    "modified": "2020-06-15 09:30:50.908299",
+    "name": "Payment on delivery by bank transfer",
+    "parent": null,
+    "parentfield": null,
+    "parenttype": null,
+    "terms": "<h4>{{_(\"Terms and Conditions\")}}</h4><div class=\"row data-field\" data-fieldname=\"payment_conditions\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"Payment conditions\")}}</label></div><div class=\"col-xs-7 text-left value\">{{_(\"on delivery\")}}</div></div>{% set links=frappe.get_all('Bank Account', filters={'company': company, 'is_default': 1}, fields=['company', 'bank', 'iban', 'bank_account_no', 'branch_code', 'swift_number'] ) %}{% if links %}{% set bank_account=links[0] %}{% if bank_account %}<strong>{{_(\"Payment by transfer to the following bank account:\")}}</strong>{% if bank_account.company %}<div class=\"row data-field\" data-fieldname=\"company\" data-fieldtype=\"Link\"><div class=\"col-xs-5\"><label>{{_(\"Bank Account\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.company}}</div></div>{% endif %}{% if bank_account.bank %}<div class=\"row data-field\" data-fieldname=\"bank\" data-fieldtype=\"Link\"><div class=\"col-xs-5\"><label>{{_(\"Bank\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.bank}}</div></div>{% endif %}{% if bank_account.iban %}<div class=\"row data-field\" data-fieldname=\"iban\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"IBAN\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.iban}}</div></div>{% endif %}{% if bank_account.bank_account_no %}<div class=\"row data-field\" data-fieldname=\"bank_account_no\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"Bank Account No\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.bank_account_no}}</div></div>{% endif %}{% if bank_account.branch_code %}<div class=\"row data-field\" data-fieldname=\"branch_code\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"Branch Code\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.branch_code}}</div></div>{% endif %}{% if bank_account.swift_number %}<div class=\"row data-field\" data-fieldname=\"swift_number\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"SWIFT number\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.swift_number}}</div></div>{% endif %}{% endif %}{% endif %}",
+    "title": "Payment on delivery by bank transfer"
+  },
+  {
+    "disabled": 0,
+    "docstatus": 0,
+    "doctype": "Terms and Conditions",
+    "modified": "2020-06-15 09:29:57.436782",
+    "name": "Payment on receipt by bank transfer",
+    "parent": null,
+    "parentfield": null,
+    "parenttype": null,
+    "terms": "<h4>{{_(\"Terms and Conditions\")}}</h4><div class=\"row data-field\" data-fieldname=\"payment_conditions\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"Payment conditions\")}}</label></div><div class=\"col-xs-7 text-left value\">{{_(\"on receipt\")}}</div></div>{% set links=frappe.get_all('Bank Account', filters={'company': company, 'is_default': 1}, fields=['company', 'bank', 'iban', 'bank_account_no', 'branch_code', 'swift_number'] ) %}{% if links %}{% set bank_account=links[0] %}{% if bank_account %}<strong>{{_(\"Payment by transfer to the following bank account:\")}}</strong>{% if bank_account.company %}<div class=\"row data-field\" data-fieldname=\"company\" data-fieldtype=\"Link\"><div class=\"col-xs-5\"><label>{{_(\"Bank Account\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.company}}</div></div>{% endif %}{% if bank_account.bank %}<div class=\"row data-field\" data-fieldname=\"bank\" data-fieldtype=\"Link\"><div class=\"col-xs-5\"><label>{{_(\"Bank\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.bank}}</div></div>{% endif %}{% if bank_account.iban %}<div class=\"row data-field\" data-fieldname=\"iban\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"IBAN\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.iban}}</div></div>{% endif %}{% if bank_account.bank_account_no %}<div class=\"row data-field\" data-fieldname=\"bank_account_no\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"Bank Account No\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.bank_account_no}}</div></div>{% endif %}{% if bank_account.branch_code %}<div class=\"row data-field\" data-fieldname=\"branch_code\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"Branch Code\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.branch_code}}</div></div>{% endif %}{% if bank_account.swift_number %}<div class=\"row data-field\" data-fieldname=\"swift_number\" data-fieldtype=\"Data\"><div class=\"col-xs-5\"><label>{{_(\"SWIFT number\")}}</label></div><div class=\"col-xs-7 text-left value\">{{bank_account.swift_number}}</div></div>{% endif %}{% endif %}{% endif %}",
+    "title": "Payment on receipt by bank transfer"
+  }
+]
diff --git a/recod_erpnext_design/hooks.py b/recod_erpnext_design/hooks.py
@@ -17,7 +17,7 @@
 
 # Includes in <head>
 # ------------------
-# fixtures = [""]
+fixtures = ["Website Theme", "Print Format", "Terms and Conditions"]
 
 # include js, css files in header of desk.html
 # app_include_css = "/assets/recod_erpnext_design/css/recod_erpnext_design.css"

diff --git a/recod_erpnext_design/translations/ru.csv b/recod_erpnext_design/translations/ru.csv
@@ -1 +1,2 @@
-apps/recod_erpnext_design/config/desktop.py,Recod ERPNext Design,Recod ERPNext Design
+apps/recod_erpnext_design/config/desktop.py,Recod ERPNext Design,Recod ERPNext Design
+apps/recod_erpnext_design/fixtures/terms_and_conditions.json,Recod ERPNext Design,Recod ERPNext Design