Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5715 from donysukardi/documentation-fixes

Browse Source 
[fix] Documentation Fixes
This commit is contained in:
Rushabh Mehta 2016-07-12 11:16:12 +05:30 committed by GitHub
commit 1f15cf43d6
6 changed files with 107 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
erpnext/docs/user/manual/de/customize-erpnext/print-format.md
View File

@ -29,7 +29,7 @@ Zum Bearbeiten des Erscheinungsbildes bietet sich das [Bootstrap CSS Framework](
### Referenzen ### Referenzen
1. [Programmiersprache Jinja Templating: Referenz](http://jinja.pocoo.org/docs/templates/) 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 ### Druckeinstellungen
@ -41,45 +41,45 @@ Um Ihre Druck- und PDF-Einstellungen zu bearbeiten/zu aktualisieren, gehen Sie z
### Beispiel ### Beispiel
<h3>{{ doc.select<em>print</em>heading or "Invoice" }}</h3> {% raw %}<h3>{{ doc.select_print_heading or "Invoice" }}</h3>
<div class="row"> <div class="row">
<div class="col-md-3 text-right">Customer Name</div> <div class="col-md-3 text-right">Customer Name</div>
<div class="col-md-9">{{ doc.customer<em>name }}</div> <div class="col-md-9">{{ doc.customer_name }}</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-3 text-right">Date</div> <div class="col-md-3 text-right">Date</div>
<div class="col-md-9">{{ doc.get</em>formatted("invoice<em>date") }}</div> <div class="col-md-9">{{ doc.get_formatted("invoice_date") }}</div>
</div> </div>
<table class="table table-bordered"> <table class="table table-bordered">
<tbody> <tbody>
<tr> <tr>
<th>Sr</th> <th>Sr</th>
<th>Item Name</th> <th>Item Name</th>
<th>Description</th> <th>Description</th>
<th class="text-right">Qty</th> <th class="text-right">Qty</th>
<th class="text-right">Rate</th> <th class="text-right">Rate</th>
<th class="text-right">Amount</th> <th class="text-right">Amount</th>
</tr> </tr>
{%- for row in doc.items -%} {%- for row in doc.items -%}
<tr> <tr>
<td style="width: 3%;">{{ row.idx }}</td> <td style="width: 3%;">{{ row.idx }}</td>
<td style="width: 20%;"> <td style="width: 20%;">
{{ row.item</em>name }} {{ row.item_name }}
{% if row.item<em>code != row.item</em>name -%} {% if row.item_code != row.item_name -%}
<br>Item Code: {{ row.item<em>code}} <br>Item Code: {{ row.item_code}}
{%- endif %} {%- endif %}
</td> </td>
<td style="width: 37%;"> <td style="width: 37%;">
<div style="border: 0px;">{{ row.description }}</div></td> <div style="border: 0px;">{{ row.description }}</div></td>
<td style="width: 10%; text-align: right;">{{ row.qty }} {{ row.uom or row.stock</em>uom }}</td> <td style="width: 10%; text-align: right;">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>
<td style="width: 15%; text-align: right;">{{ <td style="width: 15%; text-align: right;">{{
row.get<em>formatted("rate", doc) }}</td> row.get_formatted("rate", doc) }}</td>
<td style="width: 15%; text-align: right;">{{ <td style="width: 15%; text-align: right;">{{
row.get</em>formatted("amount", doc) }}</td> row.get_formatted("amount", doc) }}</td>
</tr> </tr>
{%- endfor -%} {%- endfor -%}
</tbody> </tbody>
</table> </table>{% endraw %}
### Anmerkungen ### Anmerkungen

20
erpnext/docs/user/manual/de/setting-up/print/address-template.md
View File

@ -15,17 +15,15 @@ Das Programm zum Erstellen von Vorlagen basiert auf HTML und [Jinja Templating](
Hier sehen Sie die Standardvorlage: Hier sehen Sie die Standardvorlage:
{% raw %}{{ address_line1 }}<br>
{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
{{ address_line1 }}<br> {{ city }}<br>
{% if address_line2 %}{{ address_line2 }}<br>{% endif -%} {% if state %}{{ state }}<br>{% endif -%}
{{ city }}<br> {% if pincode %}PIN: {{ pincode }}<br>{% endif -%}
{% if state %}{{ state }}<br>{% endif -%} {{ country }}<br>
{% if pincode %}PIN: {{ pincode }}<br>{% endif -%} {% if phone %}Phone: {{ phone }}<br>{% endif -%}
{{ country }}<br> {% if fax %}Fax: {{ fax }}<br>{% endif -%}
{% if phone %}Phone: {{ phone }}<br>{% endif -%} {% if email_id %}Email: {{ email_id }}<br>{% endif -%}{% endraw %}
{% if fax %}Fax: {{ fax }}<br>{% endif -%}
{% if email_id %}Email: {{ email_id }}<br>{% endif -%}
### Beispiel ### Beispiel

1
erpnext/docs/user/manual/en/CRM/index.md
View File

@ -1,4 +1,5 @@
#CRM #CRM
# CRM
ERPNext helps you track business **Opportunities** from **Leads** and ERPNext helps you track business **Opportunities** from **Leads** and
**Customers**, send them **Quotations** and make confirmed **Sales Orders**. **Customers**, send them **Quotations** and make confirmed **Sales Orders**.

86
erpnext/docs/user/manual/en/customize-erpnext/print-format.md
View File

@ -1,5 +1,3 @@
<!-- no-jinja -->
Print Formats are the layouts that are generated when you want to Print or 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 Email a transaction like a Sales Invoice. There are two types of Print
Formats, Formats,
@ -36,8 +34,8 @@ will look incomplete (inconsistent) when you send them by mail.
#### References #### References
1. [Jinja Tempalting Language: Reference](http://jinja.pocoo.org/docs/templates/) 1. [Jinja Templating Language: Reference](http://jinja.pocoo.org/docs/templates/)
1. [Bootstrap CSS Framework](http://getbootstrap.com/) 2. [Bootstrap CSS Framework](http://getbootstrap.com/)
#### Print Settings #### Print Settings
@ -49,47 +47,45 @@ To edit / update your print and PDF settings, go to:
#### Example #### Example
{% set example = '''<h3>{{ doc.select_print_heading or "Invoice" }}</h3> {% raw %}<h3>{{ doc.select_print_heading or "Invoice" }}</h3>
<div class="row"> <div class="row">
<div class="col-md-3 text-right">Customer Name</div> <div class="col-md-3 text-right">Customer Name</div>
<div class="col-md-9">{{ doc.customer_name }}</div> <div class="col-md-9">{{ doc.customer_name }}</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-3 text-right">Date</div> <div class="col-md-3 text-right">Date</div>
<div class="col-md-9">{{ doc.get_formatted("invoice_date") }}</div> <div class="col-md-9">{{ doc.get_formatted("invoice_date") }}</div>
</div> </div>
<table class="table table-bordered"> <table class="table table-bordered">
<tbody> <tbody>
<tr> <tr>
<th>Sr</th> <th>Sr</th>
<th>Item Name</th> <th>Item Name</th>
<th>Description</th> <th>Description</th>
<th class="text-right">Qty</th> <th class="text-right">Qty</th>
<th class="text-right">Rate</th> <th class="text-right">Rate</th>
<th class="text-right">Amount</th> <th class="text-right">Amount</th>
</tr> </tr>
{%- for row in doc.items -%} {%- for row in doc.items -%}
<tr> <tr>
<td style="width: 3%;">{{ row.idx }}</td> <td style="width: 3%;">{{ row.idx }}</td>
<td style="width: 20%;"> <td style="width: 20%;">
{{ row.item_name }} {{ row.item_name }}
{% if row.item_code != row.item_name -%} {% if row.item_code != row.item_name -%}
<br>Item Code: {{ row.item_code}} <br>Item Code: {{ row.item_code}}
{%- endif %} {%- endif %}
</td> </td>
<td style="width: 37%;"> <td style="width: 37%;">
<div style="border: 0px;">{{ row.description }}</div></td> <div style="border: 0px;">{{ row.description }}</div></td>
<td style="width: 10%; text-align: right;">{{ row.qty }} {{ row.uom or row.stock_uom }}</td> <td style="width: 10%; text-align: right;">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>
<td style="width: 15%; text-align: right;">{{ <td style="width: 15%; text-align: right;">{{
row.get_formatted("rate", doc) }}</td> row.get_formatted("rate", doc) }}</td>
<td style="width: 15%; text-align: right;">{{ <td style="width: 15%; text-align: right;">{{
row.get_formatted("amount", doc) }}</td> row.get_formatted("amount", doc) }}</td>
</tr> </tr>
{%- endfor -%} {%- endfor -%}
</tbody> </tbody>
</table>''' %} </table>{% endraw %}
{{ example|e }}
#### Notes #### Notes

25
erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
View File

@ -3,12 +3,12 @@
You can configure various email alerts in your system to remind you of important activities such as: You can configure various email alerts in your system to remind you of important activities such as:
1. Completion date of a Task. 1. Completion date of a Task.
1. Expected Delivery Date of a Sales Order. 2. Expected Delivery Date of a Sales Order.
1. Expected Payment Date. 3. Expected Payment Date.
1. Reminder of followup. 4. Reminder of followup.
1. If an Order greater than a particular value is received or sent. 5. If an Order greater than a particular value is received or sent.
1. Expiry notification for a Contract. 6. Expiry notification for a Contract.
1. Completion / Status change of a Task. 7. Completion / Status change of a Task.
For this, you need to setup an Email Alert. 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: To setup an Email Alert:
1. Select which Document Type you want watch changes on 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. 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. 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. 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. 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. 3. 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. 4. 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 5. Compose the message
### Setting a Subject ### Setting a Subject
@ -46,7 +46,7 @@ The above example will send an Email Alert when a Task is saved with the status
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.
<h3>Order Overdue</h3> {% raw %}<h3>Order Overdue</h3>
<p>Transaction {{ doc.name }} has exceeded Due Date. Please take necessary action.</p> <p>Transaction {{ doc.name }} has exceeded Due Date. Please take necessary action.</p>
@ -60,8 +60,7 @@ You can use both Jinja Tags (`{{ doc.[field_name] }}`) and HTML tags in the mess
<ul> <ul>
<li>Customer: {{ doc.customer }} <li>Customer: {{ doc.customer }}
<li>Amount: {{ doc.total_amount }} <li>Amount: {{ doc.total_amount }}
</ul> </ul>{% endraw %}
--- ---

4
erpnext/docs/user/manual/en/setting-up/print/address-template.md
View File

@ -14,7 +14,7 @@ The templating engine is based on HTML and the [Jinja Templating](http://jinja.p
Here is the default template: Here is the default template:
{{ address_line1 }}<br> {% raw %}{{ address_line1 }}<br>
{% if address_line2 %}{{ address_line2 }}<br>{% endif -%} {% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
{{ city }}<br> {{ city }}<br>
{% if state %}{{ state }}<br>{% endif -%} {% if state %}{{ state }}<br>{% endif -%}
@ -22,7 +22,7 @@ Here is the default template:
{{ country }}<br> {{ country }}<br>
{% if phone %}Phone: {{ phone }}<br>{% endif -%} {% if phone %}Phone: {{ phone }}<br>{% endif -%}
{% if fax %}Fax: {{ fax }}<br>{% endif -%} {% if fax %}Fax: {{ fax }}<br>{% endif -%}
{% if email_id %}Email: {{ email_id }}<br>{% endif -%} {% if email_id %}Email: {{ email_id }}<br>{% endif -%}{% endraw %}
### Example ### Example