diff --git a/erpnext/docs/user/manual/de/customize-erpnext/print-format.md b/erpnext/docs/user/manual/de/customize-erpnext/print-format.md index 85b15892a7..9448201ac0 100644 --- a/erpnext/docs/user/manual/de/customize-erpnext/print-format.md +++ b/erpnext/docs/user/manual/de/customize-erpnext/print-format.md @@ -29,7 +29,7 @@ Zum Bearbeiten des Erscheinungsbildes bietet sich das [Bootstrap CSS Framework]( ### Referenzen 1. [Programmiersprache Jinja Templating: Referenz](http://jinja.pocoo.org/docs/templates/) -1. [Bootstrap CSS Framework](http://getbootstrap.com/) +2. [Bootstrap CSS Framework](http://getbootstrap.com/) ### Druckeinstellungen @@ -41,45 +41,45 @@ Um Ihre Druck- und PDF-Einstellungen zu bearbeiten/zu aktualisieren, gehen Sie z ### Beispiel -

{{ doc.selectprintheading or "Invoice" }}

-
-
Customer Name
-
{{ doc.customername }}
-
-
-
Date
-
{{ doc.getformatted("invoicedate") }}
-
- - - - - - - - - - - {%- for row in doc.items -%} - - - - - - - - - {%- endfor -%} - -
SrItem NameDescriptionQtyRateAmount
{{ row.idx }} - {{ row.itemname }} - {% if row.itemcode != row.itemname -%} -
Item Code: {{ row.itemcode}} - {%- endif %} - 		-
{{ row.description }}
{{ row.qty }} {{ row.uom or row.stockuom }}{{ - row.getformatted("rate", doc) }}{{ - row.getformatted("amount", doc) }}
+ {% raw %}

{{ doc.select_print_heading or "Invoice" }}

+
+
Customer Name
+
{{ doc.customer_name }}
+
+
+
Date
+
{{ doc.get_formatted("invoice_date") }}
+
+ + + + + + + + + + + {%- for row in doc.items -%} + + + + + + + + + {%- endfor -%} + +
SrItem NameDescriptionQtyRateAmount
{{ row.idx }} + {{ row.item_name }} + {% if row.item_code != row.item_name -%} +
Item Code: {{ row.item_code}} + {%- endif %} + 		+
{{ row.description }}
{{ row.qty }} {{ row.uom or row.stock_uom }}{{ + row.get_formatted("rate", doc) }}{{ + row.get_formatted("amount", doc) }}
{% endraw %} ### Anmerkungen diff --git a/erpnext/docs/user/manual/de/setting-up/print/address-template.md b/erpnext/docs/user/manual/de/setting-up/print/address-template.md index fd9db980f0..b3f37f77a5 100644 --- a/erpnext/docs/user/manual/de/setting-up/print/address-template.md +++ b/erpnext/docs/user/manual/de/setting-up/print/address-template.md @@ -15,17 +15,15 @@ Das Programm zum Erstellen von Vorlagen basiert auf HTML und [Jinja Templating]( Hier sehen Sie die Standardvorlage: - - -{{ address_line1 }}
-{% if address_line2 %}{{ address_line2 }}
{% endif -%} -{{ city }}
-{% if state %}{{ state }}
{% endif -%} -{% if pincode %}PIN: {{ pincode }}
{% endif -%} -{{ country }}
-{% if phone %}Phone: {{ phone }}
{% endif -%} -{% if fax %}Fax: {{ fax }}
{% endif -%} -{% if email_id %}Email: {{ email_id }}
{% endif -%} + {% raw %}{{ address_line1 }}
+ {% if address_line2 %}{{ address_line2 }}
{% endif -%} + {{ city }}
+ {% if state %}{{ state }}
{% endif -%} + {% if pincode %}PIN: {{ pincode }}
{% endif -%} + {{ country }}
+ {% if phone %}Phone: {{ phone }}
{% endif -%} + {% if fax %}Fax: {{ fax }}
{% endif -%} + {% if email_id %}Email: {{ email_id }}
{% endif -%}{% endraw %} ### Beispiel diff --git a/erpnext/docs/user/manual/en/CRM/index.md b/erpnext/docs/user/manual/en/CRM/index.md index 20639a953c..e394333b71 100644 --- a/erpnext/docs/user/manual/en/CRM/index.md +++ b/erpnext/docs/user/manual/en/CRM/index.md @@ -1,4 +1,5 @@ #CRM +# CRM ERPNext helps you track business **Opportunities** from **Leads** and **Customers**, send them **Quotations** and make confirmed **Sales Orders**. diff --git a/erpnext/docs/user/manual/en/customize-erpnext/print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md index f0ca942413..123a613298 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/print-format.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md @@ -1,5 +1,3 @@ - - Print Formats are the layouts that are generated when you want to Print or Email a transaction like a Sales Invoice. There are two types of Print Formats, @@ -36,8 +34,8 @@ will look incomplete (inconsistent) when you send them by mail. #### References -1. [Jinja Tempalting Language: Reference](http://jinja.pocoo.org/docs/templates/) -1. [Bootstrap CSS Framework](http://getbootstrap.com/) +1. [Jinja Templating Language: Reference](http://jinja.pocoo.org/docs/templates/) +2. [Bootstrap CSS Framework](http://getbootstrap.com/) #### Print Settings @@ -49,47 +47,45 @@ To edit / update your print and PDF settings, go to: #### Example -{% set example = '''

{{ doc.select_print_heading or "Invoice" }}

-
-
Customer Name
-
{{ doc.customer_name }}
-
-
-
Date
-
{{ doc.get_formatted("invoice_date") }}
-
- - - - - - - - - - - {%- for row in doc.items -%} - - - - - - - - - {%- endfor -%} - -
SrItem NameDescriptionQtyRateAmount
{{ row.idx }} - {{ row.item_name }} - {% if row.item_code != row.item_name -%} -
Item Code: {{ row.item_code}} - {%- endif %} - 		-
{{ row.description }}
{{ row.qty }} {{ row.uom or row.stock_uom }}{{ - row.get_formatted("rate", doc) }}{{ - row.get_formatted("amount", doc) }}
''' %} - - {{ example|e }} + {% raw %}

{{ doc.select_print_heading or "Invoice" }}

+
+
Customer Name
+
{{ doc.customer_name }}
+
+
+
Date
+
{{ doc.get_formatted("invoice_date") }}
+
+ + + + + + + + + + + {%- for row in doc.items -%} + + + + + + + + + {%- endfor -%} + +
SrItem NameDescriptionQtyRateAmount
{{ row.idx }} + {{ row.item_name }} + {% if row.item_code != row.item_name -%} +
Item Code: {{ row.item_code}} + {%- endif %} + 		+
{{ row.description }}
{{ row.qty }} {{ row.uom or row.stock_uom }}{{ + row.get_formatted("rate", doc) }}{{ + row.get_formatted("amount", doc) }}
{% endraw %} #### Notes diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md index 1a5d13ab17..4caffbc99a 100644 --- a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md +++ b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md @@ -3,12 +3,12 @@ You can configure various email alerts in your system to remind you of important activities such as: 1. Completion date of a Task. -1. Expected Delivery Date of a Sales Order. -1. Expected Payment Date. -1. Reminder of followup. -1. If an Order greater than a particular value is received or sent. -1. Expiry notification for a Contract. -1. Completion / Status change of a Task. +2. Expected Delivery Date of a Sales Order. +3. Expected Payment Date. +4. Reminder of followup. +5. If an Order greater than a particular value is received or sent. +6. Expiry notification for a Contract. +7. Completion / Status change of a Task. For this, you need to setup an Email Alert. @@ -19,14 +19,14 @@ For this, you need to setup an Email Alert. To setup an Email Alert: 1. Select which Document Type you want watch changes on -1. Define what events you want to watch. Events are: +2. Define what events you want to watch. Events are: 1. New: When a new document of the selected type is made. 2. Save / Submit / Cancel: When a document of the selected type is saved, submitted, cancelled. 3. Value Change: When a particular value in the selected type changes. 4. Days Before / Days After: Trigger this alert a few days before or after the **Reference Date.** To set the days, set **Days Before or After**. This can be useful in reminding you of upcoming due dates or reminding you to follow up on certain leads of quotations. -1. Set additional conditions if you want. -1. Set the recipients of this alert. The recipient could either be a field of the document or a list of fixed email ids. -1. Compose the message +3. Set additional conditions if you want. +4. Set the recipients of this alert. The recipient could either be a field of the document or a list of fixed email ids. +5. Compose the message ### Setting a Subject @@ -40,13 +40,13 @@ Email alerts allow you to set conditions according to the field data in your doc Setting Condition -The above example will send an Email Alert when a Task is saved with the status "Open" and the Expected End Date for the Task is the date on or before the date on which it was saved on. +The above example will send an Email Alert when a Task is saved with the status "Open" and the Expected End Date for the Task is the date on or before the date on which it was saved on. ### Setting a Message -You can use both Jinja Tags (`{{ doc.[field_name] }}`) and HTML tags in the message textbox. +You can use both Jinja Tags (`{{ doc.[field_name] }}`) and HTML tags in the message textbox. -

Order Overdue

+ {% raw %}

Order Overdue

Transaction {{ doc.name }} has exceeded Due Date. Please take necessary action.

@@ -60,8 +60,7 @@ You can use both Jinja Tags (`{{ doc.[field_name] }}`) and HTML tags in the mess - + {% endraw %} --- diff --git a/erpnext/docs/user/manual/en/setting-up/print/address-template.md b/erpnext/docs/user/manual/en/setting-up/print/address-template.md index c2b9bb72d7..53dfef1bfe 100644 --- a/erpnext/docs/user/manual/en/setting-up/print/address-template.md +++ b/erpnext/docs/user/manual/en/setting-up/print/address-template.md @@ -14,7 +14,7 @@ The templating engine is based on HTML and the [Jinja Templating](http://jinja.p Here is the default template: - {{ address_line1 }}
+ {% raw %}{{ address_line1 }}
{% if address_line2 %}{{ address_line2 }}
{% endif -%} {{ city }}
{% if state %}{{ state }}
{% endif -%} @@ -22,7 +22,7 @@ Here is the default template: {{ country }}
{% if phone %}Phone: {{ phone }}
{% endif -%} {% if fax %}Fax: {{ fax }}
{% endif -%} - {% if email_id %}Email: {{ email_id }}
{% endif -%} + {% if email_id %}Email: {{ email_id }}
{% endif -%}{% endraw %} ### Example