+ 
ERPNext.org",
- "copyright": "ERPNext Open Source Software Foundation",
- "footer_address": "
ERPNext.org",
"top_bar_items": [
- {"label": "Docs", "url": "/docs", "right": 1},
- {"label": "Services", "url": "/service-providers", "right": 1},
- {"label": "Jobs", "url": "/erpnext-jobs", "right": 1},
- {"label": "Chapters", "url": "/chapters", "right": 1},
- {"label": "Bounties", "url": "/bounties", "right": 1},
- {"label": '
+ 
- 
+ 
- 
+ 
+ 
+ 
-
+
+
+
+
+
+ {% if not no_breadcrumbs and parents %}
+
+ {% endif %}
+
+ {% if doctype != 'Blog Post' %}
+
+ {% block header %}{% endblock %}
+
+ {% endif %}
+
+ {% if show_search %}
+
+
+ {% block search %}
+ {% include
+ 'templates/includes/search_box.html' %}
+ {% endblock %}
+
+ {% endif %}
+
+ {% if self.header_actions() %}
+
+ {% block header_actions %}{% endblock %}
+
+ {% endif %}
+
+ {%- block page_content -%}{%- endblock -%}
+
+ 
+ 
+
Alternativ können Sie einen Kontakt oder eine Adresse auch direkt aus dem Kundendatensatz erstellen. Klicken Sie hierzu auf "Neuer Kontakt" oder "Neue Adresse".
-
+
> Tipp: Wenn Sie in einer beliebigen Transaktion einen Kunden auswählen, wird ein Kontakt und eine Adresse vorselektiert. Das sind dann der Standardkontakt und die Standardadresse.
diff --git a/foundation/www/docs/user/manual/de/CRM/customer.md b/foundation/www/docs/user/manual/de/CRM/customer.md
index a3c8c263..906961e6 100644
--- a/foundation/www/docs/user/manual/de/CRM/customer.md
+++ b/foundation/www/docs/user/manual/de/CRM/customer.md
@@ -8,7 +8,7 @@ Sie können Ihre Kunden entweder direkt erstellen über
> CRM > Dokumente > Kunde > Neu
-
+
oder einen Upload über ein Datenimportwerkzeug durchführen.
diff --git a/foundation/www/docs/user/manual/de/CRM/lead.md b/foundation/www/docs/user/manual/de/CRM/lead.md
index 869f6647..48e8c7e4 100644
--- a/foundation/www/docs/user/manual/de/CRM/lead.md
+++ b/foundation/www/docs/user/manual/de/CRM/lead.md
@@ -17,6 +17,6 @@ Um einen Lead zu generieren, gehen Sie zu:
> CRM > Dokumente > Lead > Neu
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/CRM/newsletter.md b/foundation/www/docs/user/manual/de/CRM/newsletter.md
index 07e1828d..752d0287 100644
--- a/foundation/www/docs/user/manual/de/CRM/newsletter.md
+++ b/foundation/www/docs/user/manual/de/CRM/newsletter.md
@@ -8,8 +8,8 @@ In ERPNext können sie diese Benutzerschnittstelle nutzen um eine große Zahl vo
Wählen Sie die Liste der Empfänger aus, an die Sie die E-Mail senden wollen. Tragen Sie Ihren Inhalt in das Nachrichtenfeld ein und versenden Sie den Newsletter. Wenn Sie die E-Mail vorher testen wollen, um zu sehen, wie sie für den Empfänger aussieht, können Sie die Testfunktion nutzen. Speichern Sie das Dokument vor dem Test. Eine Test-E-Mail wird dann an Ihr E-Mail-Konto gesendet. Sie können die E-Mail an alle vorgesehenen Empfänger senden, wenn Sie auf die Schaltfläche "Senden" klicken.
-
+
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/CRM/opportunity.md b/foundation/www/docs/user/manual/de/CRM/opportunity.md
index 5a9a4236..1a3526b4 100644
--- a/foundation/www/docs/user/manual/de/CRM/opportunity.md
+++ b/foundation/www/docs/user/manual/de/CRM/opportunity.md
@@ -12,11 +12,11 @@ Alternativ können Sie einen offenen Lead öffnen und auf die Schaltfläche "Opp
### Abbildung 1: Opportunity erstellen
-
+
### Abbildung 2: Opportunity aus einem offenen Lead heraus erstellen
-
+
Eine Opportunity kann auch aus einem bereits vorhandenen Kunden heraus entstehen. Sie können mehrere verschiedene Opportunities zum gleichen Lead erstellen. In einer Opportunity können Sie abgesehen von der Kommunikation auch die Artikel mit vermerken, nach denen der Lead oder Kontakt sucht.
diff --git a/foundation/www/docs/user/manual/de/CRM/setup/campaign.md b/foundation/www/docs/user/manual/de/CRM/setup/campaign.md
index c3097530..ebe57dc4 100644
--- a/foundation/www/docs/user/manual/de/CRM/setup/campaign.md
+++ b/foundation/www/docs/user/manual/de/CRM/setup/campaign.md
@@ -4,7 +4,7 @@
Eine Kampagne ist eine groß angelegte Umsetzung einer Vertriebsstrategie um ein Produkt oder eine Dienstleistung zu bewerben. Dies erfolgt in einem Marktsegment in einer bestimmten geographischen Region um bestimmte Ziele zu erreichen.
-
+
Sie können in einer Kampagne [Leads](/docs/user/manual/de/CRM/lead.html), [Opportunities](/docs/user/manual/de/CRM/opportunity.html) und [Angebote](/docs/user/manual/de/selling/quotation.html) nachverfolgen.
@@ -12,11 +12,11 @@ Sie können in einer Kampagne [Leads](/docs/user/manual/de/CRM/lead.html), [Oppo
* Um einen Lead zu einer Kampagne nach zu verfolgen, wählen Sie "Leads anzeigen" aus.
-
+
* Sie sollten jetzt eine gefilterte Übersicht aller Leads erhalten, die zu dieser Kampagne gehören.
* Sie können auch einen neuen Lead erstellen indem Sie auf "Neu" klicken.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/CRM/setup/customer-group.md b/foundation/www/docs/user/manual/de/CRM/setup/customer-group.md
index 865b471f..6ddf49b0 100644
--- a/foundation/www/docs/user/manual/de/CRM/setup/customer-group.md
+++ b/foundation/www/docs/user/manual/de/CRM/setup/customer-group.md
@@ -4,10 +4,10 @@
Kundengruppen versetzen Sie in die Lage Ihre Kunden zu organisieren. Sie können auch Rabatte auf der Basis von Kundengruppen berechnen. Außerdem können Sie Trendanalysen für jede Gruppe erstellen. Typischerweise werden Kunden nach Marktsegmenten gruppiert (das basiert normalerweise auf Ihrer Domäne).
-
+
> Tipp: Wenn Sie der Meinung sind, dass hier zu viel Aufwand getrieben wird, dann können Sie es bei einer Standard-Kundengruppe belassen. Aber der gesamte Aufwand wird sich dann auszahlen, wenn Sie die ersten Berichte erhalten. Ein Beispiel eines Berichts ist unten abgebildet.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/CRM/setup/sales-person.md b/foundation/www/docs/user/manual/de/CRM/setup/sales-person.md
index 921aa48d..770747d0 100644
--- a/foundation/www/docs/user/manual/de/CRM/setup/sales-person.md
+++ b/foundation/www/docs/user/manual/de/CRM/setup/sales-person.md
@@ -4,7 +4,7 @@
Vertriebsmitarbeiter verhalten sich wie Regionen. Sie können ein Organigramm der Vertriebsmitarbeiter erstellen, in dem individuell das Vertriebsziel des Vertriebsmitarbeiters vermerkt werden kann. Genauso wie in der Region muss das Ziel einer Artikelgruppe zugeordnet werden.
-
+
### Vertriebspersonen in Transaktionen
diff --git a/foundation/www/docs/user/manual/de/accounts/accounting-reports.md b/foundation/www/docs/user/manual/de/accounts/accounting-reports.md
index 1a61591e..36e983cf 100644
--- a/foundation/www/docs/user/manual/de/accounts/accounting-reports.md
+++ b/foundation/www/docs/user/manual/de/accounts/accounting-reports.md
@@ -9,7 +9,7 @@ Hier sehen Sie einige der wichtigsten Berichte aus dem Rechnungswesen:
Das Hauptbuch basiert auf der Tabelle der Hauptbucheinträge und kann nach einem Konto und einem Zeitraum gefiltert werden. Das hilft Ihnen dabei einen Überblick über alle Buchungen zu erhalten, die zu einem Konto in einem bestimmten Zeitraum getätigt wurden.
+ src="{{docs_base_url}}/assets/img/accounts/general-ledger.png">
### Probebilanz
@@ -20,7 +20,7 @@ Eine Probebilanz ist eine Liste von Kontoständen aller Konten (Bücher und Grup
* Summe Haben
* Schlußstand
-
+
Die Summe aller Schlußstände in einer Probebilanz muss 0 sein.
@@ -28,12 +28,12 @@ Die Summe aller Schlußstände in einer Probebilanz muss 0 sein.
Diese Berichte helfen Ihnen dabei, die offenen Posten bei Rechnungen von Kunden und Lieferanten nachzuverfolgen. In diesem Bericht sehen Sie die offenen Beträge nach Zeiträumen geordnet, d. h. 0-30 Tage, 30-60 Tage und so weiter.
-
+
### Auflistung der Verkäufe und Einkäufe
In diesem Bericht wird jedes Steuerkonto in Spalten dargestellt. Für jede Rechnung und jeden Rechnungsposten erhalten Sie den Betrag und die individuelle Steuer, die gezahlt wurde, basierend auf der Tabelle der Steuern und Abgaben.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/accounts/advance-payment-entry.md b/foundation/www/docs/user/manual/de/accounts/advance-payment-entry.md
index deb211a9..a032611e 100644
--- a/foundation/www/docs/user/manual/de/accounts/advance-payment-entry.md
+++ b/foundation/www/docs/user/manual/de/accounts/advance-payment-entry.md
@@ -16,7 +16,7 @@ Da der Kunde 5.000 Euro bar angezahlt hat, wird dieser Betrag als Habenbuchung z
#### Abbildung 1: Journalbuchung bei Vorkasse
-
+
### Doppelte Buchführung
@@ -24,7 +24,7 @@ Bei der doppelten Buchführung hat jede Transaktion einen positiven oder negativ
#### Abbildung 2: Transaktion und Ausgleichsbuchung
-
+
Speichern und übertragen Sie den Buchungssatz. Wenn das Dokument nicht gespeichert wird, dann wird es in anderen Buchungsdokumenten nicht übernommen.
@@ -34,7 +34,7 @@ Um die Ausgangsrechnung mit einem Buchungssatz zu verknüpfen, der die Buchung z
#### Abbildung 3: Anzahlung erhalten
-
+
Speichern und übertragen Sie die Ausgangsrechnung
diff --git a/foundation/www/docs/user/manual/de/accounts/budgeting.md b/foundation/www/docs/user/manual/de/accounts/budgeting.md
index 68760357..6e5beb47 100644
--- a/foundation/www/docs/user/manual/de/accounts/budgeting.md
+++ b/foundation/www/docs/user/manual/de/accounts/budgeting.md
@@ -12,29 +12,29 @@ Um ein Budget zuzuweisen, gehen Sie zu Rechnungswesen > Einstellungen > Übersic
#### Schritt 1: Klicken Sie auf "Öffnen
-
+
#### Schritt 2: Monatliche Verteilung eingeben
-
+
Wenn Sie die Verteilungs-ID leer lassen, kalkuliert ERPNext auf einer jährlichen Basis und bricht auf die Monate herunter.
#### Schritt 3: Fügen Sie eine neue Zeile hinzu und wählen Sie das Budget-Konto
-
+
Das kann über die Firmenstammdaten eingestellt werden.
-
+
Auch dann, wenn Sie für überschrittene Budgets "ignorieren" auswählen, bekommen Sie eine Fülle von Informationen über den Bericht zur Abweichung zwischen Budget und Istwert. Dieser Bericht zeigt Ihnen auf monatlicher Basis die tatsächlichen Ausgaben verglichen mit den budgetierten Ausgaben.
diff --git a/foundation/www/docs/user/manual/de/accounts/chart-of-accounts.md b/foundation/www/docs/user/manual/de/accounts/chart-of-accounts.md
index e2ef33d3..f667630f 100644
--- a/foundation/www/docs/user/manual/de/accounts/chart-of-accounts.md
+++ b/foundation/www/docs/user/manual/de/accounts/chart-of-accounts.md
@@ -18,7 +18,7 @@ Als Manager werden Sie zu schätzen wissen, wenn Sie beurteilen können wie Ihr
Sie können in ERPNext leicht die finanzielle Lage Ihres Unternehmens einsehen. Ein Beispiel für eine Finanzanalyse sehen Sie unten abgebildet.
-
+
Um Ihren Kontenplan in ERPNext zu bearbeiten gehen Sie zu:
@@ -28,7 +28,7 @@ Im Kontenplan erhalten Sie eine Baumstruktur der Konten(bezeichnungen) und Konte
Lassen Sie uns die Hauptgruppen des Kontenplans besser verstehen lernen.
-
+
### Bilanzkonten
@@ -48,7 +48,7 @@ Entgegen den Bilanzkonten, repräsentieren Gewinn und Verlustkonnten (GuV) keine
In ERPNext ist es einfach eine graphische Auswertung von Gewinn und Verlust zu erstellen. Im Folgenden ist ein Beispiel einer GuV-Analyse abgebildet:
-
+
(Am ersten Tag eines Jahres haben Sie noch keinen Gewinn oder Verlust gemacht, aber Sie haben bereits Vermögen, deshalb haben Bestandskonten zum Anfang oder Ende eines Zeitraums einen Wert.)
@@ -62,7 +62,7 @@ Buchungstransaktionen können nur zu Kontobüchern erstellt werden (nicht zu Gru
> Anmerkung: Ein Kontenbuch wird manchmal auch als Kontokopf bezeichnet.
-
+
### Andere Kontentypen
@@ -72,7 +72,7 @@ Wenn sie in ERPNext ein neues Konto anlegen, können Sie dazu auch Informationen
Um ein neues Konto zu erstellen, gehen Sie Ihren Kontenplan durch und klicken Sie auf die Kontengruppe unter der Sie das neue Konto erstellen wollen. Auf der rechten Seite finden Sie die Option ein neues Konto zu "öffnen" oder ein Unterkonto zu erstellen.
-
+
Die Option zum Erstellen erscheint nur dann, wenn Sie auf ein Konto vom Typ Gruppe (Ordner) klicken.
diff --git a/foundation/www/docs/user/manual/de/accounts/credit-limit.md b/foundation/www/docs/user/manual/de/accounts/credit-limit.md
index 0290e985..9d64ea02 100644
--- a/foundation/www/docs/user/manual/de/accounts/credit-limit.md
+++ b/foundation/www/docs/user/manual/de/accounts/credit-limit.md
@@ -10,7 +10,7 @@ Um das Kreditlimit einzustellen, gehen Sie zur Kundenvorlage
### Abbildung 1: Kreditlinie
-
+
Gehen Sie zum Abschnitt "Kreditlimit" und geben Sie den Betrag in das Feld "Kreditlimit" ein.
@@ -22,7 +22,7 @@ Im Feld Kredit-Controller wählen Sie die Rolle aus, die dazu autorisiert sein s
### Abbildung 2: Kredit-Controller
-
+
Speichern Sie die Änderungen
diff --git a/foundation/www/docs/user/manual/de/accounts/journal-entry.md b/foundation/www/docs/user/manual/de/accounts/journal-entry.md
index fc62e4fb..6ffb069f 100644
--- a/foundation/www/docs/user/manual/de/accounts/journal-entry.md
+++ b/foundation/www/docs/user/manual/de/accounts/journal-entry.md
@@ -8,7 +8,7 @@ Um einen neuen Buchungssatz zu erstellen, gehen Sie zu:
> Rechnungswesen > Dokumente > Journalbuchung > Neu
-
+
In einem Buchungssatz müssen Sie folgendes tun:
diff --git a/foundation/www/docs/user/manual/de/accounts/making-payments.md b/foundation/www/docs/user/manual/de/accounts/making-payments.md
index fa81a5c5..70a0b95b 100644
--- a/foundation/www/docs/user/manual/de/accounts/making-payments.md
+++ b/foundation/www/docs/user/manual/de/accounts/making-payments.md
@@ -9,7 +9,7 @@ Zahlungen zu Ausgangs- oder Eingangsrechnungen können über die Schaltfläche "
1. Geben Sie Schecknummer und Scheckdatum ein.
1. Speichern und Übertragen Sie.
-
+
Zahlungen können auch unabhängig von Rechnungen erstellt werden, indem Sie einen neuen Journalbeleg erstellen und die Zahlungsart auswählen.
@@ -31,7 +31,7 @@ Für Zahlungen an Lieferanten gilt:
### Beispiel eines Buchungssatzes für eine Zahlung
-
+
---
diff --git a/foundation/www/docs/user/manual/de/accounts/multi-currency-accounting.md b/foundation/www/docs/user/manual/de/accounts/multi-currency-accounting.md
index b118bbf6..7263e2cc 100644
--- a/foundation/www/docs/user/manual/de/accounts/multi-currency-accounting.md
+++ b/foundation/www/docs/user/manual/de/accounts/multi-currency-accounting.md
@@ -8,15 +8,15 @@ In ERPNext können Sie Buchungen in unterschiedlichen Währungen erstellen. Beis
Um mit Buchungen in unterschiedlichen Währungen zu beginnen, müssen Sie die Buchungswährung im Datensatz des Kontos einstellen. Sie können bei der Anlage eine Währung aus dem Kontenplan auswählen.
-
+
Sie können die Währung auch zuordnen oder bearbeiten, indem Sie den jeweiligen Datensatz für bereits angelegte Konten öffnen.
-
+
Für Kunden/Lieferanten können Sie die Buchungswährung auch im Gruppendatensatz einstellen. Wenn sich die Buchungswährung der Gruppe von der Firmenwährung unterscheidet, müssen Sie die Standardkonten für Forderungen und Verbindlichkeiten auf diese Währung einstellen.
-
+
Wenn Sie die Buchungswährung für einen Artikel oder eine Gruppe eingestellt haben, können Sie Buchungen zu ihnen erstellen. Wenn sich die Buchungswährung der Gruppe von der Firmenwährung unterscheidet, dann beschränkt das System beim Erstellen von Transaktionen für diese Gruppe Buchungen auf diese Währung. Wenn die Buchungswährung die selbe wie die Firmenwährung ist, können Sie Transaktionen für diese Guppe in jeder beliebigen Währung erstellen. Aber die Hauptbuch-Buchungen werden immer in der Buchungswährung der Gruppe vorliegen. In jedem Fall ist die Wärung des Verbindlichkeitenkontos immer gleich der Buchungswährung der Gruppe.
@@ -34,7 +34,7 @@ Nun wird im POS der gezahlte Betrag in der Transaktionswährung eingegeben, im G
Der ausstehende Betrag und Anzahlungsbeträge werden immer in der Währung des Kundenkontos kalkuliert und angezeigt.
-
+
#### Eingangsrechnung
@@ -44,13 +44,13 @@ In ähnlicher Art und Weise werden in Eingangsrechnungen Buchungen basierend auf
In einer Journalbuchung können Sie Transaktionen in unterschiedlichen Währungen erstellen. Es gibt ein Auswahlfeld "Unterschiedliche Währungen" um Buchungen in mehreren Währungen zu aktivieren. Wenn die Option "Unterschiedliche Währungen" ausgewählt wurde, können Sie Konten mit unterschiedlichen Währungen auswählen.
-
+
In der Kontenübersicht zeigt das System den Abschnitt Währung an und holt sich die Kontenwährung und den Wechselkurs automatisch, wenn Sie ein Konto mit ausländischer Währung auswählen. Sie können den Wechselkurs später manuell ändern/anpassen.
In einem einzelnen Buchungssatz können Sie nur Konten mit einer alternativen Währung auswählen, abweichend von Konten in der Firmenwährung. Die Beträge für Soll und Haben sollten in der Kontenwährung eingegeben werden, das System berechnet und zeigt dann den Betrag für Soll und Haben automatisch in der Firmenwährung.
-
+
#### Beispiel 1: Zahlungsbuchung eines Kunden in alternativer Währung
@@ -58,7 +58,7 @@ Nehmen wir an, dass die Standardwährung einer Firma Indische Rupien ist, und di
Der Wechselkurs in der Zahlungsbuchung sollte immer der selbe wie auf der Rechnung (60) sein, auch dann, wenn der Wechselkurs am Tag der Zahlung 62 beträgt. Dem Bankkonto wird der Betrag mit einem Wechselkurs von 62 gut geschrieben. Deshalb wird ein Wechelkursgewinn bzw. -verlust basierend auf dem Unterschied im Wechselkurs gebucht.
-
+
#### Beispiel 2: Überweisung zwischen Banken (US-Dollar -> Indische Rupien)
@@ -101,7 +101,7 @@ Nehmen wir an, dass das Paypal-Konto folgende Beträge, die noch nicht auf Ihr a
Angenommen, der Wechselkurs am Zahlungstag ist 62, dann schaut die Buchung zur Banküberweisung wie folgt aus:
-
+
### Berichte
@@ -109,12 +109,12 @@ Angenommen, der Wechselkurs am Zahlungstag ist 62, dann schaut die Buchung zur B
Im Hauptbuch zeigt das System den Betrag einer Gutschrift/Lastschrift in beiden Währungen an, wenn nach Konto gefiltert wurde, und wenn die Kontenwährung unterschiedlich zur Firmenwährung ist.
-
+
#### Forderungs- und Verbindlichkeitenkonten
Im Bericht zu den Konten Forderungen und Verbindlichkeiten zeigt das System alle Beträge in der Währung der Gruppe/in der Kontenwährung an.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/accounts/opening-accounts.md b/foundation/www/docs/user/manual/de/accounts/opening-accounts.md
index 77b2c773..8cfd83f2 100644
--- a/foundation/www/docs/user/manual/de/accounts/opening-accounts.md
+++ b/foundation/www/docs/user/manual/de/accounts/opening-accounts.md
@@ -21,7 +21,7 @@ Wir gehen davon aus, dass Sie mit der Buchhaltung in einem neuen Geschäftsjahr
Sie können Konten basierend auf Belegarten auswählen. In so einem Szenario sollte Ihre Bilanz ausgeglichen sein.
-
+
Beachten Sie bitte auch, dass das System abstürzt, wenn es mehr als 300 Bücher gibt. Um so eine Situation zu vermeiden, können Sie Konten über temporäre Konten eröffnen.
@@ -39,13 +39,13 @@ Hinweis: Stellen Sie sicher, dass im Abschnitt "Weitere Informationen" "Ist Erö
Vervollständigen Sie die Buchungssätze auf der Soll- und Haben-Seite.
-
+
Um einen Eröffnungsstand einzupflegen, erstellen Sie einen Buchungssatz für ein Konto oder eine Gruppe von Konten.
Beispiel: Wenn Sie die Kontenstände von drei Bankkonten einpflegen möchten, dann erstellen Sie Buchungssätze der folgenden Art und Weise:
-
+
Um einen Ausgleich herzustellen, wird ein temporäres Konto für Vermögen und Verbindlichkeiten verwendet. Wenn Sie einen Anfangsbestand in einem Verbindlichkeitenkonto einpflegen, können Sie zum Ausgleich ein temporäres Vermögenskonto verwenden.
@@ -60,7 +60,7 @@ Sie können zwei Eröffnungsbuchungssätze erstellen:
Wenn Sie die Buchungen erstellt haben, schaut der Bericht zur Probebilanz in etwa wie folgt aus:
-
+
### Offene Rechnungen
diff --git a/foundation/www/docs/user/manual/de/accounts/purchase-invoice.md b/foundation/www/docs/user/manual/de/accounts/purchase-invoice.md
index fb8fc6fe..5d11bfad 100644
--- a/foundation/www/docs/user/manual/de/accounts/purchase-invoice.md
+++ b/foundation/www/docs/user/manual/de/accounts/purchase-invoice.md
@@ -10,7 +10,7 @@ Um eine neue Eingangsrechnung zu erstellen, gehen Sie zu:
oder klicken Sie in einem Lieferantenauftrag oder einem Kaufbeleg auf "Eingangsrechnung erstellen".
-
+
Das Konzept des Veröffentlichungsdatums ist das gleiche wie bei der Ausgangsrechnung. Rechnungsnummer und Rechnungsdatum helfen Ihnen dabei nachzuvollziehen, unter welchen Daten die Rechnung bei Ihrem Lieferanten ausgewiesen ist.
diff --git a/foundation/www/docs/user/manual/de/accounts/sales-invoice.md b/foundation/www/docs/user/manual/de/accounts/sales-invoice.md
index ed5d3cbe..cf7aceb8 100644
--- a/foundation/www/docs/user/manual/de/accounts/sales-invoice.md
+++ b/foundation/www/docs/user/manual/de/accounts/sales-invoice.md
@@ -10,7 +10,7 @@ Sie können eine Ausgangsrechnung direkt erstellen über:
oder indem Sie in der rechten Ecke des Lieferscheins auf "Rechnung erstellen" klicken.
-
+
### Auswirkung auf die Buchhaltung
diff --git a/foundation/www/docs/user/manual/de/accounts/setup/account-settings.md b/foundation/www/docs/user/manual/de/accounts/setup/account-settings.md
index 3be8f647..7024f431 100644
--- a/foundation/www/docs/user/manual/de/accounts/setup/account-settings.md
+++ b/foundation/www/docs/user/manual/de/accounts/setup/account-settings.md
@@ -2,7 +2,7 @@
# Konteneinstellungen
+
* Konten gesperrt bis: Sperren Sie Konten-Transaktionen bis zu einem bestimmten Datum. Niemand bis auf die angegebene Rolle kann dann Buchungen zu diesem Konto erstellen oder verändern.
diff --git a/foundation/www/docs/user/manual/de/accounts/setup/cost-center.md b/foundation/www/docs/user/manual/de/accounts/setup/cost-center.md
index 3fc80102..fdf8b2cf 100644
--- a/foundation/www/docs/user/manual/de/accounts/setup/cost-center.md
+++ b/foundation/www/docs/user/manual/de/accounts/setup/cost-center.md
@@ -23,7 +23,7 @@ Um Ihren Kostenstellenplan einzurichten, gehen Sie zu:
>Rechnungswesen > Einstellungen > Kostenstellenplan
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/accounts/setup/tax-rule.md b/foundation/www/docs/user/manual/de/accounts/setup/tax-rule.md
index d20779ad..dfcf61df 100644
--- a/foundation/www/docs/user/manual/de/accounts/setup/tax-rule.md
+++ b/foundation/www/docs/user/manual/de/accounts/setup/tax-rule.md
@@ -4,7 +4,7 @@
Sie können festlegen, welche [Steuervorlage](/docs/user/manual/de/setting-up/setting-up-taxes.html) auf eine Verkaufs-/Einkaufstransaktion angewendet wird, wenn Sie die Funktion Steuerregel verwenden.
-
+
Sie können Steuerregeln für Umsatz- und für Vorsteuern erstellen. Wenn Sie eine Transaktion durchführen, wählt das System Steuervorlagen basierend auf den definierten Steuerregeln aus und wendet sie an. Das System filtert Steuerregeln nach der Anzahl der maximal zutreffenden Bedingungen.
@@ -12,9 +12,9 @@ Betrachten wir ein Szenario um Steuerregeln besser zu verstehen.
Angenommen wird haben zwei Steuerregeln wie unten abgebildet erstellt.
-
+
-
+
In unserem Beispiel gilt Regel 1 für Indien und Regel 2 für Großbritannien.
diff --git a/foundation/www/docs/user/manual/de/accounts/tools/bank-reconciliation.md b/foundation/www/docs/user/manual/de/accounts/tools/bank-reconciliation.md
index d4746110..ac1706eb 100644
--- a/foundation/www/docs/user/manual/de/accounts/tools/bank-reconciliation.md
+++ b/foundation/www/docs/user/manual/de/accounts/tools/bank-reconciliation.md
@@ -34,7 +34,7 @@ Jetzt werden alle Buchungen im angegebenen Zeitraum in der Tabelle darunter ange
#### Abbildung 2: Werkzeug zum Kontenabgleich
-
+
**Schritt 5:** Klicken Sie auf die Schaltfläche "Abwicklungsdatum aktualisieren"
diff --git a/foundation/www/docs/user/manual/de/accounts/tools/payment-reconciliation.md b/foundation/www/docs/user/manual/de/accounts/tools/payment-reconciliation.md
index f29b6eb0..86b26fcf 100644
--- a/foundation/www/docs/user/manual/de/accounts/tools/payment-reconciliation.md
+++ b/foundation/www/docs/user/manual/de/accounts/tools/payment-reconciliation.md
@@ -8,7 +8,7 @@ Um das Werkzeug zum Zahlungsabgleich zu verwenden, gehen Sie zu:
> Rechnungswesen > Werkzeuge > Zahlungsabgleich
-
+
**Schritt 1:** Wählen Sie das Konto aus, zu dem die Zahlungen abgeglichen werden sollen.
diff --git a/foundation/www/docs/user/manual/de/accounts/tools/payment-tool.md b/foundation/www/docs/user/manual/de/accounts/tools/payment-tool.md
index eef05d4f..76fa3283 100644
--- a/foundation/www/docs/user/manual/de/accounts/tools/payment-tool.md
+++ b/foundation/www/docs/user/manual/de/accounts/tools/payment-tool.md
@@ -24,14 +24,14 @@ Um zum Zahlungswerkzeug zu gelangen, gehen Sie zu
* **Hinweis**: Für den Fall, dass der Benutzer an einen Kunden zahlt oder von einem Lieferanten eine Zahlung erhält, fügen Sie manuell Anmerkungen hinzu, die sich auf zutreffende Rechnungen oder Aufträge beziehen.
-
+
7\. Sobald die Daten angezogen wurden, klicken Sie auf die detaillierte Buchung und geben Sie den Zahlungsbetrag zur Rechnung/Bestellung/zum Beleg ein.
-
+
8\. Klicken Sie auf "Buchungssatz erstellen" um einen neuen Buchungssatz mit den entsprechenden Einzelheiten zu erstellen.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/accounts/tools/period-closing-voucher.md b/foundation/www/docs/user/manual/de/accounts/tools/period-closing-voucher.md
index 933d0a71..52b80262 100644
--- a/foundation/www/docs/user/manual/de/accounts/tools/period-closing-voucher.md
+++ b/foundation/www/docs/user/manual/de/accounts/tools/period-closing-voucher.md
@@ -23,7 +23,7 @@ Das **Transaktionsdatum** ist das Datum, zu dem der Periodenabschlussbeleg erste
Das **abzuschließende Geschäftsjahr** ist das Jahr, für das Sie Ihre Finanzbuchhaltung abschliessen.
-
+
Dieser Beleg überträgt den Gewinn oder Verlust (über die GuV ermittelt) in die Schlußbilanz. Sie sollten ein Konto vom Typ Verbindlichkeiten, wie Gewinnrücklagen oder Überschuss, oder vom Typ Kapital als Schlußkonto auswählen.
diff --git a/foundation/www/docs/user/manual/de/buying/purchase-order.md b/foundation/www/docs/user/manual/de/buying/purchase-order.md
index 6ef1fc6b..b148da71 100644
--- a/foundation/www/docs/user/manual/de/buying/purchase-order.md
+++ b/foundation/www/docs/user/manual/de/buying/purchase-order.md
@@ -8,7 +8,7 @@ Ein Lieferantenauftrag kann automatisch aus einer Materialanfrage oder einem Lie
### Flußdiagramm der Lieferantenbestellung
-
+
In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über:
@@ -16,7 +16,7 @@ In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über:
### Einen Lieferantenauftrag erstellen
-
+
Einen Lieferantenauftrag einzugeben ist sehr ähnlich zu einer Lieferantenanfrage. Zusätzlich müssen Sie Folgendes eingeben:
@@ -51,7 +51,7 @@ Beispiel: Wenn Sie Ihr Rohmaterial in großen Mengen in Großverpackungen eingek
### Abbildung 3: Umrechung von Einkaufsmaßeinheit in Lagermaßeinheit
-
+
**Schritt 4:** Geben Sie den Umrechnungsfaktor von einer in die andere Maßeinheit an. Beispiel: 100, wenn eine Kiste 100 Stück umfasst.
diff --git a/foundation/www/docs/user/manual/de/buying/setup/buying-settings.md b/foundation/www/docs/user/manual/de/buying/setup/buying-settings.md
index cd692fcb..78ded538 100644
--- a/foundation/www/docs/user/manual/de/buying/setup/buying-settings.md
+++ b/foundation/www/docs/user/manual/de/buying/setup/buying-settings.md
@@ -4,7 +4,7 @@
Hier können Sie Werte einstellen, die in den Transaktionen des Moduls Einkauf zugrunde gelegt werden.
-
+
Lassen Sie uns die verschiedenen Optionen durckgehen.
diff --git a/foundation/www/docs/user/manual/de/buying/setup/supplier-type.md b/foundation/www/docs/user/manual/de/buying/setup/supplier-type.md
index e1a6d516..642bb9df 100644
--- a/foundation/www/docs/user/manual/de/buying/setup/supplier-type.md
+++ b/foundation/www/docs/user/manual/de/buying/setup/supplier-type.md
@@ -10,7 +10,7 @@ Aufbauend darauf, was die Lieferanten anbieten, werden Sie in verschiedene Kateg
> Einkauf > Einstellungen > Lieferantentyp > Neuer Lieferantentyp
-
+
Sie können Ihre Lieferanten aus einem breiten Angebot verfügbarer Typen in ERPNext klassifizieren. Wählen Sie aus einem Satz vorgegebener Optionen wie Großhändler, Elekktro, Hardware, Regional, Pharma, Rohstoffe, Dienstleistungen, etc. aus.
diff --git a/foundation/www/docs/user/manual/de/buying/supplier-quotation.md b/foundation/www/docs/user/manual/de/buying/supplier-quotation.md
index df8d1438..9c3d4e80 100644
--- a/foundation/www/docs/user/manual/de/buying/supplier-quotation.md
+++ b/foundation/www/docs/user/manual/de/buying/supplier-quotation.md
@@ -8,7 +8,7 @@ Sie können ein Lieferantenangebot aus einer Materialanfrage heraus erstellen.
### Flußdiagramm zum Lieferantenangebot
-
+
Sie können ein Lieferantenangebot auch direkt erstellen über:
@@ -16,7 +16,7 @@ Sie können ein Lieferantenangebot auch direkt erstellen über:
### Ein Lieferantenangebot erstellen
-
+
Wenn Sie mehrere verschiedene Lieferanten, die Ihnen den selben Artikel liefern, haben, dann senden Sie normalerweise eine Nachricht (Lieferantenanfrage) an verschiedene Lieferanten. In vielen Fällen, besonders dann, wenn Sie den Einkauf zentralisiert haben, werden Sie alle diese Angebote aufzeichnen wollen, so dass
diff --git a/foundation/www/docs/user/manual/de/buying/supplier.md b/foundation/www/docs/user/manual/de/buying/supplier.md
index 0923d8b0..4556c440 100644
--- a/foundation/www/docs/user/manual/de/buying/supplier.md
+++ b/foundation/www/docs/user/manual/de/buying/supplier.md
@@ -8,7 +8,7 @@ So können Sie einen neuen Lieferanten erstellen:
> Einkauf > Dokumente > Lieferant > Neu
-
+
### Kontakte und Adressen
diff --git a/foundation/www/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md b/foundation/www/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
index 6322028b..9e51382a 100644
--- a/foundation/www/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
+++ b/foundation/www/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
@@ -5,18 +5,18 @@
Das Webportal von ERPNext gibt Ihren Kunden einen schnellen Zugriff auf Ihre Aufträge, Rechnungen und Sendungen.
Kunden können den Status Ihrer Bestellungen, Rechnungen und des Versandes nachprüfen, indem sie sich auf der Webseite einloggen.
-
+
Sobald eine Bestellung aufgegeben wurde, entweder über den Einkaufswagen oder aus ERPNext heraus, kann Ihr Kunde die Bestellung ansehen und den Abrechnungs- und Versandstatus nachverfolgen. Wenn die Rechnung und die Zahlung zu einer Bestellung übertragen wurden, kann der Kunde auch hier den aktuellen Stand auf einen Blick nachvollziehen.
-
+
### Rechnung mit Status "gezahlt"
-
+
### Rechnung mit Status "abgerechnet"
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/customer-portal/issues.md b/foundation/www/docs/user/manual/de/customer-portal/issues.md
index 791cf4a5..9b6f6b3a 100644
--- a/foundation/www/docs/user/manual/de/customer-portal/issues.md
+++ b/foundation/www/docs/user/manual/de/customer-portal/issues.md
@@ -6,17 +6,17 @@ Kunden können über das Kundenportal sehr einfach Fälle eröffnen. Eine einfac
### Ticketliste leeren
-
+
### Neuer Fall
-
+
### Fall öffnen
-
+
### Fall beantworten
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/customer-portal/portal-login.md b/foundation/www/docs/user/manual/de/customer-portal/portal-login.md
index 00d4ea03..79d28eb3 100644
--- a/foundation/www/docs/user/manual/de/customer-portal/portal-login.md
+++ b/foundation/www/docs/user/manual/de/customer-portal/portal-login.md
@@ -4,6 +4,6 @@
Um sich in ein Kundenkonto einzuloggen, muss der Kunde seine Email-ID und das Passwort angeben, welche ihm von ERPNext während des Registrierungsprozesses zugesendet wurden.
-
+
Wenn der Registrierungsprozess abgeschlossen ist, wird dem Kunden eine E-Mail mit dem Passwort zugeschickt.
diff --git a/foundation/www/docs/user/manual/de/customize-erpnext/custom-doctype.md b/foundation/www/docs/user/manual/de/customize-erpnext/custom-doctype.md
index cc6cdd0b..52029090 100644
--- a/foundation/www/docs/user/manual/de/customize-erpnext/custom-doctype.md
+++ b/foundation/www/docs/user/manual/de/customize-erpnext/custom-doctype.md
@@ -18,7 +18,7 @@ Um einen neuen DocType zu erstellen, gehen Sie zu:
4. Ist einzeln: Wenn diese Option aktiviert ist, wird dieser DocType zu einem einzeln verwendeten Formular, wie die Vertriebseinstellungen, die nicht von Benutzern reproduziert werden können.
5. Benutzerdefiniert?: Dieses Feld ist standardmäßig aktiviert, wenn ein benutzerdefinierter DocType hinzugefügt wird.
-
+
### Felder
@@ -33,7 +33,7 @@ Felder sind viel mehr als Datenbankspalten; sie können sein:
5. Aktionen (Schaltflächen)
6. Anhänge oder Bilder
-
+
Wenn Sie Felder hinzufügen, müssen Sie den **Typ** angeben. Für eine Bereichs- oder Spaltentrennung ist die **Bezeichnung** optional. Der **Name** (Feldname) ist der Name der Spalte in der Datenbank.
@@ -43,19 +43,19 @@ Sie können auch weitere Einstellungen des Feldes eingeben, so z. B. ob es zwing
In diesem Abschnitt können Sie Kriterien definieren nach denen Dokumente dieses DocTypes benannt werden. Es gibt viele verschiedene Kriterien nach denen ein Dokument benannt werden kann, wie z. B. dem Wert in diesem spezifischen Feld, oder die Benamungsserie, oder der Wert der vom Benutzer an der Eingabeaufforderung eingegeben wird, die angezeit wird, wenn ein Dokument abgespeichert wird. Im folgenden Beispiel benennen wir auf Grundlage des Wertes im Feld **book_name**.
-
+
### Berechtigung
In dieser Tabelle können Sie Rollen und Berechtigungs-Rollen für diese für die betreffenden DocTypes auswählen.
-
+
### DocTypes abspeichern
Wenn Sie einen DocType abspeichern, erscheint ein Popup-Fenster über welches Sie den Namen des DocTypes eingeben können.
-
+
### Der DocType im System
@@ -63,12 +63,12 @@ Um den DocType zu aktivieren, öffnen Sie das Modul, welches Sie für den DocTyp
> Personalwesen > Dokumente > Buch
-
+
### Buchvorlage
Wenn Sie die Felder ausfüllen, schaut das ganze dann so aus.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/customize-erpnext/custom-field.md b/foundation/www/docs/user/manual/de/customize-erpnext/custom-field.md
index f9bdf119..88ee0c2b 100644
--- a/foundation/www/docs/user/manual/de/customize-erpnext/custom-field.md
+++ b/foundation/www/docs/user/manual/de/customize-erpnext/custom-field.md
@@ -17,7 +17,7 @@ Sie können ein neues benutzerdefiniertes Feld auch über das [Werkzeug zum Anpa
In einem benutzerdefinierten Formular finden Sie für jedes Feld die Plus(+)-Option. Wenn Sie auf dieses Symbol klicken, wird eine neue Zeile oberhalb dieses Feldes eingefügt. Sie können die Einstellungen für Ihr Feld in der neu eingefügten leeren Zeile eingeben.
-
+
Im Folgenden sind die Schritte aufgeführt, wie man ein benutzerdefiniertes Feld in ein bestehendes Formular einfügt.
@@ -29,31 +29,31 @@ Wie bereits oben angesprochen, können Sie ein benutzerdefiniertes Feld über da
Wählen Sie die Transaktion oder die Vorlage, in die sie ein benutzerdefiniertes Feld einfügen wollen. Nehmen wir an, dass Sie ein benutzerdefiniertes Verknüpfungsfeld in ein Angebotsformular einfügen wollen; das Dokument soll "Angebot" heißen.
-
+
### Feldbezeichnung einstellen
Die Bezeichnung des benutzerdefinierten Feldes wird basierend auf seinem Namen eingestellt. Wenn Sie ein benutzerdefiniertes Feld mit einem bestimmten Namen erstellen wollen, aber mit einer sich davon unterscheidenden Bezeichnung, dann sollten Sie erst die Bezeichnung angeben, da Sie den Feldnamen noch einstellen wollen. Nach dem Speichern des benutzerdefinierten Feldes können Sie die Feldbezeichnung wieder ändern.
-
+
### Feldtyp auswählen
Klicken Sie hier um weitere Informationen über Feldtypen, die Sie bei einem benutzerdefinierten Feld auswählen können, zu erhalten.
-
+
### Optionen einstellen
Wenn Sie ein Verknüpfungsfeld erstellen,dann wird der Name des DocType, mit dem dieses Feld verknüpft werden soll, in das Feld "Optionen" eingefügt. Klicken Sie [hier](/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt.
-
+
Wenn der Feldtyp als Auswahlfeld (Drop Down-Feld) angegeben ist, dann sollten alle möglichen Ergebnisse für dieses Feld im Optionen-Feld aufgelistet werden. Die möglichen Ergebnisse sollten alle in einer eigenen Zeile stehen.
@@ -70,7 +70,7 @@ Sie können weitere Eigenschaften auswählen wie:
5. Schreibgeschützt: Wenn diese Option aktiviert ist, kann das benutzerdefinierte Feld nicht geändert werden.
6. Beim Übertragen zulassen: Wenn diese Option ausgewählt wird, ist es erlaubt den Wert des Feldes zu ändern, wenn er in einer Transaktion übertragen wird.
-
+
### Benutzerdefiniertes Feld löschen
diff --git a/foundation/www/docs/user/manual/de/customize-erpnext/custom-scripts/index.md b/foundation/www/docs/user/manual/de/customize-erpnext/custom-scripts/index.md
index e4491246..c65f0cbd 100644
--- a/foundation/www/docs/user/manual/de/customize-erpnext/custom-scripts/index.md
+++ b/foundation/www/docs/user/manual/de/customize-erpnext/custom-scripts/index.md
@@ -6,7 +6,7 @@ Wenn Sie Formate von ERPNext-Formularen ändern wollen, können Sie das über be
> Einstellungen > Anpassen > Benutzerdefiniertes Skript
-
+
### Themen
diff --git a/foundation/www/docs/user/manual/de/customize-erpnext/document-title.md b/foundation/www/docs/user/manual/de/customize-erpnext/document-title.md
index 1ceadc90..5871ef51 100644
--- a/foundation/www/docs/user/manual/de/customize-erpnext/document-title.md
+++ b/foundation/www/docs/user/manual/de/customize-erpnext/document-title.md
@@ -25,14 +25,14 @@ Sie können eine Bezeichnung definieren, indem Sie Dokumenteneinstellungen in ge
> {customer_name} for {project}
+ src="{{docs_base_url}}/assets/img/customize/customize-title.gif">
### Fest eingestellte und bearbeitbare Bezeichnungen
Wenn Ihre Bezeichnung als Standard-Bezeichnung generiert wurde, kann sie vom Benutzer durch klicken auf den Kopf des Dokuments bearbeitet werden.
+ src="{{docs_base_url}}/assets/img/customize/editable-title.gif">
Wenn Sie eine fest eingestellte Bezeichnung haben wollen, können Sie dies als Regel unter **Optionen** einstellen. Auf diese Weise wird die Bezeichnung jedesmal automatisch aktualisiert, wenn das Dokument aktualisiert wird.
diff --git a/foundation/www/docs/user/manual/de/customize-erpnext/print-format.md b/foundation/www/docs/user/manual/de/customize-erpnext/print-format.md
index 17ecb3fd..8ddf947b 100644
--- a/foundation/www/docs/user/manual/de/customize-erpnext/print-format.md
+++ b/foundation/www/docs/user/manual/de/customize-erpnext/print-format.md
@@ -15,7 +15,7 @@ Um Ihre eigenen Versionen zu erstellen, öffnen Sie eine bereits vorhandene Vorl
> Einstellungen > Druck > Druckformate
-
+
Wählen Sie den Typ des Druckformats, welches Sie bearbeiten wollen, und klicken Sie auf die Schaltfläche "Kopieren" in der rechten Spalte. Es öffnet sich ein neues Druckformat mit der Einstellung NEIN für "für "Ist Standard" und Sie kännen das Druckformat bearbeiten.
@@ -38,7 +38,7 @@ Um Ihre Druck- und PDF-Einstellungen zu bearbeiten/zu aktualisieren, gehen Sie z
> Einstellungen > Druck und Branding > Druckeinstellungen
-
+
### Beispiel
diff --git a/foundation/www/docs/user/manual/de/human-resources/appraisal.md b/foundation/www/docs/user/manual/de/human-resources/appraisal.md
index 5972de6d..d24bce16 100644
--- a/foundation/www/docs/user/manual/de/human-resources/appraisal.md
+++ b/foundation/www/docs/user/manual/de/human-resources/appraisal.md
@@ -8,13 +8,13 @@ In ERPNext können Sie Mitarbeiterbeurteilungen verwalten, in dem Sie für jede
#### Schritt 1: Wählen Sie eine Bewertungsvorlage aus
-
+
Wenn Sie eine Vorlage ausgewählt haben, erscheint der restliche Teil des Formulars.
#### Schritt 2: Geben Sie die Daten des Mitarbeiters ein
-
+
Wenn die Bewertungsvorlage fertig ist, können Sie für jeden Zeitraum Bewertungen aufzeichnen, über die Sie die Leistung nachverfolgen können. Sie können für jeden Paramter bis zu 5 Punkte vergeben und das System berechnet die Gesamtbeurteilung des Mitarbeiters.
diff --git a/foundation/www/docs/user/manual/de/human-resources/attendance.md b/foundation/www/docs/user/manual/de/human-resources/attendance.md
index 5207cd5f..b0b7d0cf 100644
--- a/foundation/www/docs/user/manual/de/human-resources/attendance.md
+++ b/foundation/www/docs/user/manual/de/human-resources/attendance.md
@@ -6,7 +6,7 @@ Ein Anwesenheitsdatensatz der wiedergibt, dass ein Mitarbeiter zu einem bestimmt
> Personalwesen > Dokumente > Anwesenheit > Neu
-
+
Sie können einen monatlichen Report über Ihre Anwesenheiten erhalten, indem Sie zum "Monatlichen Anwesenheitsbericht" gehen.
diff --git a/foundation/www/docs/user/manual/de/human-resources/employee.md b/foundation/www/docs/user/manual/de/human-resources/employee.md
index 5cb408be..a3f72a31 100644
--- a/foundation/www/docs/user/manual/de/human-resources/employee.md
+++ b/foundation/www/docs/user/manual/de/human-resources/employee.md
@@ -8,6 +8,6 @@ Um einen neuen Mitarbeiter zu erstellen, gehen Sie zu:
> Personalwesen > Dokumente > Mitarbeiter > Neu
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/expense-claim.md b/foundation/www/docs/user/manual/de/human-resources/expense-claim.md
index 579bdf67..053bbea6 100644
--- a/foundation/www/docs/user/manual/de/human-resources/expense-claim.md
+++ b/foundation/www/docs/user/manual/de/human-resources/expense-claim.md
@@ -8,7 +8,7 @@ Um eine neue Aufwandsabrechnung zu erstellen, gehen Sie zu:
> Personalwesen > Dokumente > Aufwandsabrechnung > Neu
-
+
Geben Sie die Mitarbeiter-ID, das Datum und die Auflistung der Ausgaben, die Sie zurückerstattet haben möchten, ein und "übertragen" Sie den Datensatz.
@@ -28,6 +28,6 @@ Die genehmigte Aufwandsabrechnung muss in eine Journalbuchung umgewandelt werden
* Um eine Aufwandsabrechnung mit einer Aufgabe oder einem Projekt zu verknüpfen, geben Sie die Aufgabe oder das Projekt an, während Sie eine Aufwandsabrechnung erstellen.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/human-resources-reports.md b/foundation/www/docs/user/manual/de/human-resources/human-resources-reports.md
index 4dae74f6..98e2d93e 100644
--- a/foundation/www/docs/user/manual/de/human-resources/human-resources-reports.md
+++ b/foundation/www/docs/user/manual/de/human-resources/human-resources-reports.md
@@ -6,30 +6,30 @@
Der Bericht zur Mitarbeiter-Urlaubsauswertung zeigt Mitarbeiter und deren Urlaubsverteilung nach den unterschiedlichen Urlaubstypen an. Der Bericht richtet sich nach der Anzahl des genehmigten Urlaubs.
-
+
### Mitarbeiter-Geburtstag
Dieser Bericht zeigt die Geburtstage der Mitarbeiter an.
-
+
### Mitarbeiterinformationen
Dieser Bericht wichtige Informationen über Mitarbeiter in den Mitarbeiterdatensätzen.
-
+
### Übersicht monatliche Gehälter
Dieser Bericht zeigt die Nettozahlungen der Mitarbeiter und deren einzelne Bestandteile im Überblick.
-
+
### Monatliche Anwesenheitsliste
Dieser Bericht zeit die monatlichen Anwesenheiten ausgewählter Mitarbeiter im Überblick.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/index.txt b/foundation/www/docs/user/manual/de/human-resources/index.txt
index caa32929..998ce324 100644
--- a/foundation/www/docs/user/manual/de/human-resources/index.txt
+++ b/foundation/www/docs/user/manual/de/human-resources/index.txt
@@ -6,7 +6,7 @@ salary-and-payroll
appraisal
job-applicant
job-opening
-offer-letter
+job-offer
tools
human-resources-reports
setup
diff --git a/foundation/www/docs/user/manual/de/human-resources/job-applicant.md b/foundation/www/docs/user/manual/de/human-resources/job-applicant.md
index 63246438..50ce5e50 100644
--- a/foundation/www/docs/user/manual/de/human-resources/job-applicant.md
+++ b/foundation/www/docs/user/manual/de/human-resources/job-applicant.md
@@ -8,7 +8,7 @@ Um einen neuen Bewerber anzulegen, gehen Sie zu:
> Personalwesen > Dokumente > Bewerber > Neu
-
+
### Verknüpfung mit einem E-Mail-Konto
@@ -21,6 +21,6 @@ Sie können die Bewerbersuche mit einem E-Mail-Konto verknüpfen. Wenn wir anneh
* Geben Sie die E-Mail-ID und das Passwort ein und aktivieren Sie "Eingehend aktivieren".
* Unter "Anhängen an" geben Sie "Bewerber" an.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/job-opening.md b/foundation/www/docs/user/manual/de/human-resources/job-opening.md
index df422de4..5982319a 100644
--- a/foundation/www/docs/user/manual/de/human-resources/job-opening.md
+++ b/foundation/www/docs/user/manual/de/human-resources/job-opening.md
@@ -8,6 +8,6 @@ Um eine neue Offene Stelle anzulegen, gehen Sie zu:
> Personalwesen > Dokumente > Offene Stellen > Neu
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/leave-application.md b/foundation/www/docs/user/manual/de/human-resources/leave-application.md
index 821bc77a..b60a07c3 100644
--- a/foundation/www/docs/user/manual/de/human-resources/leave-application.md
+++ b/foundation/www/docs/user/manual/de/human-resources/leave-application.md
@@ -6,14 +6,14 @@ Wenn Ihre Firma ein formales System hat, wo Mitarbeiter einen Antrag für Ihren
> Personalwesen > Dokumente > Urlaubsantrag > Neu
-
+
### Urlaubsbewilliger einstellen
* Ein Urlaubsgenehmiger ist ein Benutzer der Urlaubsanträge eines Mitarbeiters bewilligen kann.
* Sie müssen eine Liste von Urlaubsbewilligern für einen Mitarbeiter in den Mitarbeiterstammdaten angeben.
-
+
> Tipp: Wenn Sie möchten, dass alle Benutzer ihre Urlaubsanträge selbst erstellen, können Sie in den Einstellungen zur Urlaubsgenehmigung Ihre Mitarbeiter-IDs als so einstellen, dass sie für die Regel zutreffend sind. Für weiterführende Informationen kesen Sie hierzu die Diskussion zum Thema [Einstellungen zu Genehmigungen](/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.html).
diff --git a/foundation/www/docs/user/manual/de/human-resources/offer-letter.md b/foundation/www/docs/user/manual/de/human-resources/offer-letter.md
index 01d17ca4..677c910c 100644
--- a/foundation/www/docs/user/manual/de/human-resources/offer-letter.md
+++ b/foundation/www/docs/user/manual/de/human-resources/offer-letter.md
@@ -8,12 +8,12 @@ Ein ERPNext können Sie einen Datensatz zu den Angebotsschreiben, die Sie an Bew
> Personalwesen > Dokumente > Angebotsschreiben > Neu
-
+
> Anmerkung: Angebotsschreiben kann nur zu einem [Bewerber](/docs/user/manual/de/human-resources/job-applicant.html) erstellt werden.
Es gibt ein vordefiniertes Druckformat zum Angebotsschreiben.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/salary-and-payroll.md b/foundation/www/docs/user/manual/de/human-resources/salary-and-payroll.md
index b9c7c844..e50ac0ba 100644
--- a/foundation/www/docs/user/manual/de/human-resources/salary-and-payroll.md
+++ b/foundation/www/docs/user/manual/de/human-resources/salary-and-payroll.md
@@ -44,7 +44,7 @@ Um eine neue Gehaltsstruktur zu erstellen, gehen Sie zu:
#### Abbildung 1: Gehaltsstruktur
-
+
### In der Gehaltsstruktur
@@ -68,7 +68,7 @@ Um eine Gehaltsabrechnung über die Gehaltsstruktur zu erstellen, klicken Sie au
#### Abbildung 2: Gehaltsabrechnung
-
+
Sie können auch Gehaltsabrechnungen für mehrere verschiedene Mitarbeiter über "Gehaltsabrechnung bearbeiten" anlegen.
@@ -76,7 +76,7 @@ Sie können auch Gehaltsabrechnungen für mehrere verschiedene Mitarbeiter über
#### Abbildung 3: Gehaltsabrechnung durchführen
-
+
Beim Bearbeiten einer Gehaltsabrechnung
diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/branch.md b/foundation/www/docs/user/manual/de/human-resources/setup/branch.md
index 413c33a8..f0762f45 100644
--- a/foundation/www/docs/user/manual/de/human-resources/setup/branch.md
+++ b/foundation/www/docs/user/manual/de/human-resources/setup/branch.md
@@ -4,6 +4,6 @@
Filialen Ihres Unternehmens
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/deduction-type.md b/foundation/www/docs/user/manual/de/human-resources/setup/deduction-type.md
index bbe64bd0..4ad6614f 100644
--- a/foundation/www/docs/user/manual/de/human-resources/setup/deduction-type.md
+++ b/foundation/www/docs/user/manual/de/human-resources/setup/deduction-type.md
@@ -8,6 +8,6 @@ Um eine neue Abzugsart anzulegen, gehen Sie zu:
> Personalwesen > Einstellungen > Abzugsart > Neu
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/department.md b/foundation/www/docs/user/manual/de/human-resources/setup/department.md
index ac220645..49d6d1e1 100644
--- a/foundation/www/docs/user/manual/de/human-resources/setup/department.md
+++ b/foundation/www/docs/user/manual/de/human-resources/setup/department.md
@@ -4,6 +4,6 @@
Abteilungen Ihres Unternehmens
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/designation.md b/foundation/www/docs/user/manual/de/human-resources/setup/designation.md
index f1371c2e..66bb7cbb 100644
--- a/foundation/www/docs/user/manual/de/human-resources/setup/designation.md
+++ b/foundation/www/docs/user/manual/de/human-resources/setup/designation.md
@@ -4,6 +4,6 @@
Stellenbezeichnungen in Ihrem Unternehmen
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/earning-type.md b/foundation/www/docs/user/manual/de/human-resources/setup/earning-type.md
index 9c940cfe..c18e88fa 100644
--- a/foundation/www/docs/user/manual/de/human-resources/setup/earning-type.md
+++ b/foundation/www/docs/user/manual/de/human-resources/setup/earning-type.md
@@ -8,6 +8,6 @@ Um eine neue Eikommensart zu erstellen, gehen Sie zu:
> Personalwesen > Einstellungen > Einkommensart > Neu
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/employment-type.md b/foundation/www/docs/user/manual/de/human-resources/setup/employment-type.md
index 17a315bc..cae4e842 100644
--- a/foundation/www/docs/user/manual/de/human-resources/setup/employment-type.md
+++ b/foundation/www/docs/user/manual/de/human-resources/setup/employment-type.md
@@ -4,6 +4,6 @@
Verschiedene Beschäftigungsverträge, die Sie mit Ihren Mitarbeitern abgeschlossen haben.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/holyday-list.md b/foundation/www/docs/user/manual/de/human-resources/setup/holyday-list.md
index 29f3ac12..daa0dcd9 100644
--- a/foundation/www/docs/user/manual/de/human-resources/setup/holyday-list.md
+++ b/foundation/www/docs/user/manual/de/human-resources/setup/holyday-list.md
@@ -4,6 +4,6 @@
Sie können Urlaub für ein bestimmtes Jahr über die Urlaubsübersicht planen.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/hr-settings.md b/foundation/www/docs/user/manual/de/human-resources/setup/hr-settings.md
index 82cf2194..d9169ca5 100644
--- a/foundation/www/docs/user/manual/de/human-resources/setup/hr-settings.md
+++ b/foundation/www/docs/user/manual/de/human-resources/setup/hr-settings.md
@@ -4,6 +4,6 @@
Globale Einstellungen zu Dokumenten des Personalwesens
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/leave-allocation.md b/foundation/www/docs/user/manual/de/human-resources/setup/leave-allocation.md
index e9183c24..3f1374bc 100644
--- a/foundation/www/docs/user/manual/de/human-resources/setup/leave-allocation.md
+++ b/foundation/www/docs/user/manual/de/human-resources/setup/leave-allocation.md
@@ -4,7 +4,7 @@
Hilft Ihnen Urlaub bestimmten Mitarbeitern zuzuteilen
-
+
Um mehreren verschhiedenen Mitarbeitern Urlaub zuzuteilen, nutzen Sie das [Urlaubszuordnungs-Werkzeug](/docs/user/manual/de/human-resources/tools/leave-allocation-tool.html).
diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/leave-type.md b/foundation/www/docs/user/manual/de/human-resources/setup/leave-type.md
index f667fb4d..fb45c4a6 100644
--- a/foundation/www/docs/user/manual/de/human-resources/setup/leave-type.md
+++ b/foundation/www/docs/user/manual/de/human-resources/setup/leave-type.md
@@ -4,7 +4,7 @@
Geben Sie den Urlaubstyp an, der Mitarbeitern zugeordnet werden kann.
-
+
* "Maximale zulässige Urlaubstage" gibt die Maximalanzahl von Tagen dieses Urlaubstyps an, die zusammen genommen werden können.
* "Ist unbezahlter Urlaub" gibt an, dass es sich um unbezahlten Urlaub handelt.
diff --git a/foundation/www/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md b/foundation/www/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md
index ee5ee584..866c84e7 100644
--- a/foundation/www/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md
+++ b/foundation/www/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md
@@ -4,6 +4,6 @@
Das Urlaubszuordnungs-Werkzeug hilft Ihnen dabei eine bestimmte Menge an Urlaub einem Mitarbeiter zuzuteilen.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/human-resources/training.md b/foundation/www/docs/user/manual/de/human-resources/training.md
new file mode 100644
index 00000000..5f1a963f
--- /dev/null
+++ b/foundation/www/docs/user/manual/de/human-resources/training.md
@@ -0,0 +1,38 @@
+
+# Schulung
+### Schulungsprogramm
+
+Erstelle ein Schulungsprogramm und teile die Schulungstermine ein. Auf der Seite des Schulungsprogramms gibt es einen Link zur Ansicht aller Schulungstermine dieses Schulungsprogramms.
+
+
+
+### Schulungstermin
+
+Erstelle Termine für Seminare, Workshops, Konferenzen etc über den Link im Schulungsprogramm. Hier können die Teilnehmer die die Schulung benötigen eingetragen werden.
+
+
+
+### Teilnehmer zum Schulungstermin einladen
+
+Die Teilnehmer können aus der Liste der Mitarbeiter ausgewählt werden.
+
+Standardmäßig ist der Status des Mitarbeiters „Offen“.
+
+
+
+Wenn der Schulungstermin gebucht wird, dann wird eine Benachrichtigung an den Mitarbeiter gesendet, dass er zum Schulungstermin eigeladen ist. Dies wird über die automatische Email „Schulungstermin“ gesendet. Der Inhalt der Email kann entsprechend angepasst werden.
+
+### Schulungsergebnis
+
+Nach der Schulung können die Ergebnisse gespeichert werden basierend auf dem Feedback des Trainers.
+
+
+
+Wenn das Schulungsergebnis gebucht wird, bekommen die Mitarbeiter eine Benachrichtigung, dass sie eine Schulungsbeurteilung abgeben sollen. Dies wird ebenfalls über die automatische Email verwaltet, der Inhalt kann auch hier angepasst werden.
+
+### Schulungsbeurteilung
+
+Die Mitarbeiter können ihre Rückmeldung durch die Schulungsbeurteilung geben.
+
+
+
diff --git a/foundation/www/docs/user/manual/de/introduction/key-workflows.md b/foundation/www/docs/user/manual/de/introduction/key-workflows.md
index 085520fa..44f7d8d1 100644
--- a/foundation/www/docs/user/manual/de/introduction/key-workflows.md
+++ b/foundation/www/docs/user/manual/de/introduction/key-workflows.md
@@ -5,7 +5,7 @@
Dieses Diagramm stellt dar, wie ERPNext die Informationen und Vorgänge in Ihrem Unternehmen über Schlüsselfunktionen nachverfolgt. Dieses Diagramm gibt nicht alle Funktionalitäten von ERPNext wieder.
-
+
_Anmerkung: Nicht alle Schritte sind zwingend erforderlich. ERPNext erlaubt es Ihnen nach eigenem Gutdünken Schritte auszulassen, wenn Sie den Prozess vereinfachen wollen._
diff --git a/foundation/www/docs/user/manual/de/introduction/the-champion.md b/foundation/www/docs/user/manual/de/introduction/the-champion.md
index e920ea49..28fd9a9d 100644
--- a/foundation/www/docs/user/manual/de/introduction/the-champion.md
+++ b/foundation/www/docs/user/manual/de/introduction/the-champion.md
@@ -2,7 +2,7 @@
# Der Champion
+
Wir haben uns in den letzten Jahren dutzende von ERP-Umsetzungen angesehen, und wir haben erkannt, dass eine erfolgreiche Umsetzung viel mit schwer greifbaren Dingen und persönlichen Einstellungen zu tun hat.
diff --git a/foundation/www/docs/user/manual/de/manufacturing/bill-of-materials.md b/foundation/www/docs/user/manual/de/manufacturing/bill-of-materials.md
index fd47adc5..64321bdd 100644
--- a/foundation/www/docs/user/manual/de/manufacturing/bill-of-materials.md
+++ b/foundation/www/docs/user/manual/de/manufacturing/bill-of-materials.md
@@ -8,11 +8,11 @@ Um passende Einkaufsanfragen zu erstellen, müssen Sie Ihre Stücklisten immer a
>Fertigung > Dokumente > Stückliste > Neue Stückliste
-
+
Um Arbeitsgänge hinzuzufügen, wählen Sie "Mit Arbeitsgängen". Die Übersicht der Arbeitsgänge erscheint.
-
+
* Wählen Sie den Artikel für den Sie eine Stückliste erstellen wollen.
* Fügen Sie die Arbeitsgänge, die Sie durchlaufen müssen, um diesen Artikel zu fertigen, in der Tabelle der Arbeitsgänge hinzu. Für jeden Arbeitsgang werden Sie nach einem Arbeitsplatz gefragt. Wenn nötig, müssen Sie neue Arbeitsplätze anlegen.
@@ -24,16 +24,16 @@ Um Arbeitsgänge hinzuzufügen, wählen Sie "Mit Arbeitsgängen". Die Übersicht
* Der Bereich Kostenkalkulation der Stückliste gibt einen ungefähren Wert der Produktionskosten eines Artikels wieder
* Fügen Sie die Liste der Artikel, die Sie für jeden Arbeitsgang benötigen, mit der entsprechenden Menge hinzu. Bei dem Artikel kann es sich um einen Zukaufartikel oder um eine Unterfertigung mit eigener Stückliste handeln. Wenn der Artikel in der Zeile ein gefertigter Artikel ist und mehrere verschiedene Stücklisten hat, wählen Sie die passende Stückliste aus. Sie können auch festlegen, ob ein Teil des Artikels zu Ausschuss wird.
-
+
* Diese Kosten können über die Schaltfläche "Kosten aktualisieren" aktualisiert werden.
-
+
### Benötigtes Material (aufgelöst)
Diese Tabelle listet alles Material auf, welches benötigt wird um den Artikel zu fertigen. Sie zieht weiterhin Unterbaugruppen mit Menge an.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/manufacturing/operation.md b/foundation/www/docs/user/manual/de/manufacturing/operation.md
index a2899de1..00486d32 100644
--- a/foundation/www/docs/user/manual/de/manufacturing/operation.md
+++ b/foundation/www/docs/user/manual/de/manufacturing/operation.md
@@ -10,6 +10,6 @@ Sie können einen Arbeitsgang anlegen über:
> Fertigung > Dokumente > Arbeitsgang > Neu
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/manufacturing/production-order.md b/foundation/www/docs/user/manual/de/manufacturing/production-order.md
index 83500ca6..49767eba 100644
--- a/foundation/www/docs/user/manual/de/manufacturing/production-order.md
+++ b/foundation/www/docs/user/manual/de/manufacturing/production-order.md
@@ -8,7 +8,7 @@ Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generi
> Fertigung > Dokumente > Fertigungsauftrag > Neu
-
+
### Einen Fertigungsauftrag erstellen
@@ -24,11 +24,11 @@ Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generi
* Als Voreinstellung zieht das System Arbeitsplätze und die Dauer von Arbeitsgängen aus der gewählten Stückliste.
-
+
* Wenn Sie den Arbeitsplatz für einen bestimmten Arbeitsgang im Fertigungsauftrag neu zuordnen möchten, können Sie das tun, bevor Sie den Fertigungsauftrag übertragen.
-
+
* Wählen Sie den betreffenden Arbeitsgang aus und ändern Sie seinen Arbeitsplatz.
* Sie können auch die Dauer des Arbeitsgangs ändern.
@@ -43,28 +43,28 @@ Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generi
* Das erstellt eine Lagerbuchung mit allen Artikeln, die benötigt werden, um diesen Fertigungsauftrag abzuschliessen. Die Artikel werden an das Fertigungslager übertragen (dieser Prozess fügt basierend auf Ihren Einstellungen Unterbaugruppen mit Stückliste als EINEN Artikel hinzu oder löst die Unterpunkte auf).
* Klicken Sie auf "Material der Fertigung übergeben".
-
+
* Geben Sie die Menge des Materials an, das übertragen werden soll.
-
+
* Übertragen Sie die Lagerbuchung.
-
+
* Das an die Fertigung übertragene Material wird basierend auf der Lagerbuchung im Fertigungsauftrag aktualisiert.
-
+
### Zeitprotokoll erstellen
-* Der Fortschritt des Fertigungsauftrages kann über ein [Zeitprotokoll]
mitprotokolliert werden.
+* Der Fortschritt des Fertigungsauftrages kann über ein [Zeitprotokoll]
mitprotokolliert werden.
* Zeitprotokolle werden zu den Arbeitsgängen des Fertigungsauftrages erstellt.
* Vorlagen für Zeitprotokolle werden für die eingeplanten Arbeitsgänge zum Zeitpunkt des Übertragens des Fertigungsauftrages erstellt.
* Um weitere Zeitprotokolle zu einem Arbeitsgang zu erstellen, wählen Sie "Zeitprotokoll erstellen" im betreffenden Arbeitsgang aus.
-
+
* Geben Sie die Menge des übertragenen Materials an.
-
+
>Tipp: Sie können einen Fertigungsauftrag auch teilweise fertig stellen, indem Sie über eine Lagerbuchung das Lager Fertige Erzeugnisse aktualisieren.
@@ -91,7 +91,7 @@ Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generi
4. Fertigerzeugnisse aktualisieren: Dieser Schritt erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager Fertige Erzeugnisse hinzufügt.
5. Um die zum Fertigungsauftrag erstellten Zeitprotokolle anzusehen, klicken Sie auf "Zeitprotokolle anzeigen".
-
+
* Sie können auch einen angehaltenen Fertigungsauftrag wieder weiter laufen lassen.
diff --git a/foundation/www/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md b/foundation/www/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md
index 37613841..8cec04a6 100644
--- a/foundation/www/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md
+++ b/foundation/www/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md
@@ -6,7 +6,7 @@ Die Fertigungseinstellungen finden Sie unter
> Fertigung > Einstellungen > Fertigungseinstellungen
-
+
Überstunden zulassen: Hier können Sie angeben, ob an Arbeitsplätzen Überstunden erlaubt sind (wichtig zur Planung von Arbeitsgängen außerhalb der Betriebsstunden).
diff --git a/foundation/www/docs/user/manual/de/manufacturing/subcontracting.md b/foundation/www/docs/user/manual/de/manufacturing/subcontracting.md
index 61e36ef3..c5edf4dc 100644
--- a/foundation/www/docs/user/manual/de/manufacturing/subcontracting.md
+++ b/foundation/www/docs/user/manual/de/manufacturing/subcontracting.md
@@ -12,7 +12,7 @@ Wenn Sie bei Ihrer Tätigkeit bestimmte Prozesse an eine Drittpartei, bei der Si
2. Erstellen Sie ein Lager für den Lieferanten, damit Sie die übergebenen Artikel nachverfolgen können (möglicherweise geben Sie ja Artikel im Wert einer Monatslieferung außer Haus).
3. Stellen Sie für den bearbeiteten Artikel und der Artikelvorlage den Punkt "Ist Fremdvergabe" auf JA ein.
-
+
**Schritt 1:** Erstellen Sie für den bearbeiteten Artikel eine Stückliste, die den unbearbeiteten Artikel als Unterartikel enthält. Beispiel: Wenn Sie einen Stift herstellen, wird der bearbeitete Stift mit der Stückliste benannt, wbei der Tintentank, der Knopf und andere Artikel, die in die Fertigung eingehen als Unterartikel verwaltet werden.
diff --git a/foundation/www/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md b/foundation/www/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md
index 652a3f2c..b5a553ca 100644
--- a/foundation/www/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md
+++ b/foundation/www/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md
@@ -35,7 +35,7 @@ Wenn zur Stückliste der Zentraleinheit weitere Artikel hinzugefügt werden soll
Um die Stückliste, bei der die Zentraleinheit als Rohmaterial enthalten ist, in der Stückliste des fertigen Produktes zu aktualisieren, können Sie das Stücklisten-Austauschwerkzeug verwenden.
-
+
In diesem Werkzeug wählen Sie die aktuelle und die neue Stückliste aus. Wenn Sie auf die Schaltfläche "Austauschen" klicken, wird in der Stückliste des fertigen Produktes (Computer) die aktuelle Stückliste der Zentraleinheit durch die neue Stückliste ersetzt.
diff --git a/foundation/www/docs/user/manual/de/manufacturing/tools/production-planning-tool.md b/foundation/www/docs/user/manual/de/manufacturing/tools/production-planning-tool.md
index 3a168d38..7d661a11 100644
--- a/foundation/www/docs/user/manual/de/manufacturing/tools/production-planning-tool.md
+++ b/foundation/www/docs/user/manual/de/manufacturing/tools/production-planning-tool.md
@@ -13,30 +13,30 @@ Um das Werkzeug zur Fertigungsplanung zu nutzen, gehen Sie zu:
> Fertigung > Werkzeuge > Werkzeug zur Fertigungsplanung
-
+
### Schritt 1: Auswahl und Kundenauftrag
* Wählen Sie einen Kundenauftrag für die Materialanforderung über die Filterfunktion (Zeit, Artikel und Kunde) aus.
* Klicken Sie auf "Kundenaufträge aufrufen" um eine Übersicht zu erhalten.
-
+
### Schritt 2: Artikel aus Kundenaufträgen abrufen
Sie können Artikel hinzufügen, entfernen oder die Menge dieser Artikel verändern.
-
+
### Schritt 3: Fertigungsaufträge erstellen
-
+
### Schritt 4: Materialanfragen erstellen
Erstellen Sie für Artikel mit prognostiziertem Engpass Materialanfragen.
-
+
Das Werkzeug zur Fertigungsplanung wird auf zwei Ebenend verwendet:
diff --git a/foundation/www/docs/user/manual/de/manufacturing/workstation.md b/foundation/www/docs/user/manual/de/manufacturing/workstation.md
index 5dc2232a..6c6312b6 100644
--- a/foundation/www/docs/user/manual/de/manufacturing/workstation.md
+++ b/foundation/www/docs/user/manual/de/manufacturing/workstation.md
@@ -10,7 +10,7 @@ Sie können einen Arbeitsplatz erstellen über:
> Fertigung > Dokumente > Arbeitsplatz > Neu
-
+
Geben Sie unter "Arbeitszeit" die Betriebszeiten des Arbeitsplatzes an. Sie können die Betriebszeiten auch mit Hilfe von Schichten angeben. Wenn Sie einen Fertigungauftrag einplanen, prüft das System die Verfügbarkeit des Arbeitsplatzes basierend auf den angegebenen Betrieszeiten.
diff --git a/foundation/www/docs/user/manual/de/projects/activity-cost.md b/foundation/www/docs/user/manual/de/projects/activity-cost.md
index 54f95c88..a2878dad 100644
--- a/foundation/www/docs/user/manual/de/projects/activity-cost.md
+++ b/foundation/www/docs/user/manual/de/projects/activity-cost.md
@@ -4,4 +4,4 @@
Die Aktivitätskosten erfassen den Stundensatz und die Kosten eines Mitarbeiters zu einer Aktivitätsart. Dieser Betrag wird beim Erstellen von Zeitprotokollen vom System angezogen. Er wird für die Aufwandsabrechnung des Projektes verwendet.
-
+
diff --git a/foundation/www/docs/user/manual/de/projects/activity-type.md b/foundation/www/docs/user/manual/de/projects/activity-type.md
index 6227cabc..58ab386b 100644
--- a/foundation/www/docs/user/manual/de/projects/activity-type.md
+++ b/foundation/www/docs/user/manual/de/projects/activity-type.md
@@ -4,7 +4,7 @@
Unter dem Punkt "Aktivitätsart" wird eine Liste verschiedener Typen von Aktivitäten erstellt zu denen Zeitprotokolle erstellt werden können.
-
+
Standardmäßig sind die folgenden Aktivitätsarten angelegt:
diff --git a/foundation/www/docs/user/manual/de/projects/project.md b/foundation/www/docs/user/manual/de/projects/project.md
index 8c09f7f2..12f83ef7 100644
--- a/foundation/www/docs/user/manual/de/projects/project.md
+++ b/foundation/www/docs/user/manual/de/projects/project.md
@@ -4,24 +4,24 @@
Das Projektmanagement in ERPNext ist aufgabengesteuert. Sie können ein Projekt erstellen und ihm mehrere unterschiedliche Aufgaben zuweisen.
-
+
### Aufgaben verwalten
Ein Projekt kann in mehrere verschiedene Aufgaben aufgeteilt werden.
Eine Aufgabe kann über das Projektdokument selbst erstellt werden oder über die Schaltfläche [Aufgabe](/docs/user/manual/de/projects/tasks.html).
-
+
* Um eine Aufgabe, die zu einem Projekt erstellt wurde, anzusehen, klicken Sie auf "Aufgabe",
-
+
-
+
* Sie können Aufgaben auch über das Projektdokument selbst ansehen.
-
+
### Zeitmanagement
@@ -29,13 +29,13 @@ ERPNext verwendet [Zeitprotokolle](/docs/user/manual/de/projects/time-log.html)
* Um ein Zeitprotokoll zu einem Projekt anzusehen, klicken Sie auf "Zeitprotokolle"
-
+
-
+
* Sie können ein Zeitprotokoll auch direkt erstellen und mit dem Projekt verknüpfen.
-
+
### Aufwände verwalten
@@ -43,27 +43,27 @@ Sie können [Aufwandsabrechnungen](/docs/user/manual/de/human-resources/expense-
* Um die Aufwandsabrechnungen zu einem Projekt anzusehen, klicken Sie auf "Aufwandsabrechnung".
-
+
* Sie könne Aufwandsabrechnungen auch direkt erstellen und mit einem Projekt verknüpfen.
-
+
### Kostenstelle
Sie können zu einem Projekt eine [Kostenstelle](/docs/user/manual/de/accounts/setup/cost-center.html) erstellen oder Sie können eine existierende Kostenstelle verwenden um alle Aufwände die zu einem Projekt entstehen mitzuverfolgen.
-
+
### Projektkostenabrechnung
Der Abschnitt Projektkostenabrechnung hilft Ihnen dabei, die Zeit und die AUfwände die in einem Projekt anfallen, nachzuverfolgen.
-
+
* Der Abschnitt Kostenabrechnung wird basierend auf den Zeitprotokollen aktualisiert.
* Die Bruttospanne ist die Differenz zwischen dem Betrag der gesamten Kosten und dem Gesamtbetrag der Rechnung.
@@ -72,7 +72,7 @@ Der Abschnitt Projektkostenabrechnung hilft Ihnen dabei, die Zeit und die AUfwä
Sie können einen [Kundenauftrag](/docs/user/manual/de/selling/sales-order.html) zu einem Projekt erstellen bzw. ihn mit dem Projekt verknüpfen. Wenn er einmal verlinkt ist, können Sie das Vertriebsmodul dazu nutzen, dass Projekt mit Ihrem Kunden abzurechnen.
-
+
### Gantt-Diagramm
@@ -80,8 +80,8 @@ Ein Gantt-Diagramm illustriert einen Projektplan, ERPNext erstellt Ihnen eine il
* Um ein Gantt-Diagramm zu einem Projekt anzusehen, gehen Sie zu diesem Projekt und klicken Sie auf "Gantt-Diagramm".
-
+
-
+
[next]
diff --git a/foundation/www/docs/user/manual/de/projects/tasks.md b/foundation/www/docs/user/manual/de/projects/tasks.md
index cbbc1646..dc95d3db 100644
--- a/foundation/www/docs/user/manual/de/projects/tasks.md
+++ b/foundation/www/docs/user/manual/de/projects/tasks.md
@@ -4,13 +4,13 @@
Ein Projekt wird in Aufgaben unterteilt. In ERPNext können Sie auch Abhängigkeiten zwischen Aufgaben erstellen.
-
+
### Status der Aufgabe
Ein Aufgabe kann folgende Stati haben: "Offen", "In Arbeit", "Wartet auf Überprüfung", "Geschlossen" und "Abgebrochen".
-
+
* Standardmäßig sollte jede neu erstellte Aufgabe den Status "Offen" haben.
* Wenn ein Zeitprotokoll für eine Aufgabe erstellt wird, sollte ihr Status "In Arbeit" sein.
@@ -19,7 +19,7 @@ Ein Aufgabe kann folgende Stati haben: "Offen", "In Arbeit", "Wartet auf Überpr
Sie können eine Liste von abhängigen Aufgaben im Bereich "Hängt ab von" erstellen.
-
+
* Sie können eine übergeordnete Aufgabe nicht abschliessen bis alle abhängigen Aufgaben abgeschlossen sind.
* Wenn sich die abhängige Aufgabe verzögert und sich mit dem voraussichtlichen Startdatum der übergeordneten Aufgabe überlappt, überarbeitet das System die übergeordnete Aufgabe.
@@ -30,13 +30,13 @@ ERPNext verwendet [Zeitprotokolle](/docs/user/manual/de/projects/time-log.html)
* Um ein zu einer Aufgabe erstelltes Zeitprotokoll anzuschauen, klicken Sie auf "Zeitprotokolle".
-
+
-
+
* Sie können ein Zeitprotokoll auch direkt erstellen und mit einer Aufgabe verknüpfen.
-
+
### Ausgabenmanagement
@@ -44,15 +44,15 @@ Sie können [Aufwandsabrechnungen](/docs/user/manual/de/human-resources/expense-
* Um eine Aufwandsabrechnung, die zu einer Aufgabe erstellt wurde, anzuschauen, klicken Sie auf "Aufwandsabrechnung".
-
+
* Sie können eine Aufwandsabrechnung auch direkt erstellen und sie mit einer Aufgabe verknüpfen.
-
+
* Der Gesamtbetrag der Aufwandsabrechnungen zu einer Aufgabe wird unter "Gesamtbetrag der Aufwandsabrechnungen" im Abschnitt Kostenabrechnung angezeigt.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/projects/time-log-batch.md b/foundation/www/docs/user/manual/de/projects/time-log-batch.md
index 983902e1..56f524c1 100644
--- a/foundation/www/docs/user/manual/de/projects/time-log-batch.md
+++ b/foundation/www/docs/user/manual/de/projects/time-log-batch.md
@@ -10,17 +10,17 @@ ODER
Öffnen Sie einfach Ihre Übersicht der Zeitprotokolle und kreuzen Sie die Artikel an, die Sie dem Zeitprotokollstapel hinzufügen möchten. Klicken Sie dann auf die Schaltfläche "Zeitprotokollstapel erstellen" und diese Zeitprotokolle werden ausgewählt.
-
+
### Ausgangsrechnungen erstellen
* Sobald Sie einen Zeitprotokollstapel übertragen haben, sollte die Schaltfläche "Rechnung erstellen" erscheinen.
-
+
* Klicken Sie auf diese Schaltfläche und erstellen Sie eine Ausgangsrechnung zu einem Zeitprotokollstapel.
-
+
* Wenn Sie die Ausgangsrechnung "übertragen", wird die Nummer der Ausgangsrechnung in den Zeitprotokollen und im Zeitprotokollstapel aktualisiert und ihr Status wird auf "abgerechnet" geändert.
diff --git a/foundation/www/docs/user/manual/de/projects/time-log.md b/foundation/www/docs/user/manual/de/projects/time-log.md
index 03d8f03c..eb95693a 100644
--- a/foundation/www/docs/user/manual/de/projects/time-log.md
+++ b/foundation/www/docs/user/manual/de/projects/time-log.md
@@ -10,7 +10,7 @@
* Projekte
* Interne Referenzen
-
+
### Zeitprotokolle erstellen
@@ -22,15 +22,15 @@
Um Zeitprotokolle über den Kalender zu erstellen, gehen Sie zu "Zeitprotokoll" und wählen Sie "Kalender" aus.
-
+
* Um ein Zeitprotokoll für mehrere Tage zu erstellen, klicken Sie und ziehen Sie den Mauszeiger über die Tage.
-
+
* Sie können Zeitprotokolle auch aus der Wochen- oder Tagesansicht des Kalender heraus erstellen.
-
+
* Zeitprotokolle für Fertigungsprozesse müssen aus dem Fertigungsauftrag heraus erstellt werden.
* Um mehrere Zeitprotokolle zu Arbeitsgängen zu erstellen wählen Sie den entsprechenden Arbeitsgang und klicken Sie auf "Zeitprotokoll erstellen".
@@ -42,7 +42,7 @@ Um Zeitprotokolle über den Kalender zu erstellen, gehen Sie zu "Zeitprotokoll"
* Das System kalkuliert dann den Rechnungsbetrag basierend auf den im Zeitprotokoll angegebenen Stunden.
* Wenn "Abrechenbar" nicht markiert wurde, zeigt das System beim "Rechnungsbetrag" 0 an.
-
+
* Nach dem Übertragen des Zeitprotokolls müssen Sie einen [Zeitprotokollstapel](/docs/user/manual/de/projects/time-log-batch.html) erstellen um mit der Abrechnung fortfahren zu können.
diff --git a/foundation/www/docs/user/manual/de/selling/quotation.md b/foundation/www/docs/user/manual/de/selling/quotation.md
index db6295c4..49d86923 100644
--- a/foundation/www/docs/user/manual/de/selling/quotation.md
+++ b/foundation/www/docs/user/manual/de/selling/quotation.md
@@ -12,11 +12,11 @@ Um ein neues Angebot zu erstellen gehen Sie zu:
Sie können auch ein Angebot aus einer Opportunity heraus erstellen.
-
+
Oder Sie erstellen ein neues Angebot und übernehmen Details aus der Opportunity.
-
+
Ein Angebot enthält Informationen über:
diff --git a/foundation/www/docs/user/manual/de/selling/sales-order.md b/foundation/www/docs/user/manual/de/selling/sales-order.md
index 426d7151..107760cd 100644
--- a/foundation/www/docs/user/manual/de/selling/sales-order.md
+++ b/foundation/www/docs/user/manual/de/selling/sales-order.md
@@ -10,7 +10,7 @@ Wenn Ihr Kunde das Angebot annimmt, können Sie das Angebot in einen Kundenauftr
### Flußdiagramm des Kundenauftrags
-
+
Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftrag > Neuer Kundenauftrag
@@ -18,11 +18,11 @@ Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftr
Sie können einen Kundenauftrag auch aus einem übertragenen Angebot heraus erstellen.
-
+
Oder Sie erstellen einen neuen Kundenauftrag und entnehmen die Details aus dem Angebot.
-
+
Die meisten Informationen im Kundenauftrag sind dieselben wie im Angebot. Einige Dinge möchte der Kundenauftrag aber aktualisiert haben.
@@ -61,7 +61,7 @@ Wenn Sie den Kundenauftrag aktualisieren, wird eine wiederkehrende ID generiert,
ERPNext erstellt automatisch eine neue Bestellung und versendet eine E-Mail-Mitteilung an die E-Mail-Konten, die Sie im Feld "Benachrichtigungs-E-Mail-Adresse" eingestellt haben.
-
+
### Die nächsten Schritte
diff --git a/foundation/www/docs/user/manual/de/selling/setup/product-bundle.md b/foundation/www/docs/user/manual/de/selling/setup/product-bundle.md
index 88ec038c..5e77cdb6 100644
--- a/foundation/www/docs/user/manual/de/selling/setup/product-bundle.md
+++ b/foundation/www/docs/user/manual/de/selling/setup/product-bundle.md
@@ -12,7 +12,7 @@ Um ein neues Produkt-Bundle zu erstellen, gehen Sie zu:
> Vertrieb > Einstellungen > Produkt-Bundle > Neu
-
+
### Hauptartikel auswählen
@@ -28,7 +28,7 @@ Im Abschnitt Paketartikel listen Sie alle Unterartikel auf, die über das Lager
Wenn Vertriebstransaktionen erstellt werden, wie z. B. Ausgangsrechnung, Kundenauftrag und Lieferschein, dann wird der übergeordnete Artikel aus der Hauptartikelliste ausgewählt.
-
+
Beim Auswählen des übergeordneten Artikels aus der Hauptartikelliste werden die Unterartikel aus der Tabelle "Packliste" der Transaktion angezogen. Wenn der Unterartikel ein serialisierter Artikel ist, können Sie seine Seriennummer direkt in der Packlistentabelle angeben. Wenn die Transaktion versendet wird, reduziert das System den Lagerbestand der Unterartikel auf dem Lager der in der Packlistentabelle angegeben ist.
diff --git a/foundation/www/docs/user/manual/de/selling/setup/sales-partner.md b/foundation/www/docs/user/manual/de/selling/setup/sales-partner.md
index 3ba581e9..9dfeeae1 100644
--- a/foundation/www/docs/user/manual/de/selling/setup/sales-partner.md
+++ b/foundation/www/docs/user/manual/de/selling/setup/sales-partner.md
@@ -14,7 +14,7 @@ Um einen Vertriebspartner anzulegen, gehen Sie zu:
Vertriebspartner werden mit einem vom Benutzer vergebenen Namen abgespeichert.
-
+
Sie können die Adressen und Kontaktdaten von Vertriebsmitarbeitern erfassen und sie basierend auf Menge und Betrag jeder Artikelgruppe zuweisen.
@@ -22,13 +22,13 @@ Sie können die Adressen und Kontaktdaten von Vertriebsmitarbeitern erfassen und
Um die Namen Ihrer Partner auf Ihrer Webseite anzuzeigen, aktivieren Sie "Auf der Webseite anzeigen". Wenn Sie diese Option anklicken, erscheint ein Feld, über das Sie das Logo Ihres Partners und eine kurze Beschreibung eingeben können.
-
+
Um eine Übersicht Ihrer Partner zu erhalten, gehen Sie zu:
https://example.erpnext.com/Partners
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/selling/setup/selling-settings.md b/foundation/www/docs/user/manual/de/selling/setup/selling-settings.md
index cd04a7bb..1dbdb06a 100644
--- a/foundation/www/docs/user/manual/de/selling/setup/selling-settings.md
+++ b/foundation/www/docs/user/manual/de/selling/setup/selling-settings.md
@@ -4,7 +4,7 @@
In den Vertriebseinstellungen können Sie Eigenheiten angeben, die bei Ihren Vertriebstransaktionen mit berücksichtigt werden. Im Folgenden sprechen wir jeden einzelnen Punkt an.
-
+
### 1\. Benennung der Kunden nach
diff --git a/foundation/www/docs/user/manual/de/selling/setup/shipping-rule.md b/foundation/www/docs/user/manual/de/selling/setup/shipping-rule.md
index 74808daa..4622eba0 100644
--- a/foundation/www/docs/user/manual/de/selling/setup/shipping-rule.md
+++ b/foundation/www/docs/user/manual/de/selling/setup/shipping-rule.md
@@ -4,6 +4,6 @@
Wenn Sie eine Versandregel verwenden, können Sie die Kosten der Lieferung des Produktes an einen Kunden festlegen. Sie können für den gleichen Artikel für verschiedene Regionen verschiedene Versandregeln definieren.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/authorization-rule.md b/foundation/www/docs/user/manual/de/setting-up/authorization-rule.md
index a9c654a2..051f2be4 100644
--- a/foundation/www/docs/user/manual/de/setting-up/authorization-rule.md
+++ b/foundation/www/docs/user/manual/de/setting-up/authorization-rule.md
@@ -38,7 +38,7 @@ Wählen Sie die Rolle des Genehmigers aus. Das könnte z. B. die Rolle des Vertr
Geben Sie "Autorisierter Wert" ein. Im Beispiel stellen wir das auf 10.000 Euro ein.
-
+
Wenn ein Benutzer aus dem Vertrieb versucht eine Kundenbestellung mit einem Wert über 10.000 Euro zu übertragen, dann bekommt er eine Fehlermeldung.
diff --git a/foundation/www/docs/user/manual/de/setting-up/bar-code.md b/foundation/www/docs/user/manual/de/setting-up/bar-code.md
deleted file mode 100644
index 3c0f5752..00000000
--- a/foundation/www/docs/user/manual/de/setting-up/bar-code.md
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# Barcode
-
-
-Wenn Sie einen Barcode einlesen wollen, gehen Sie zu:
-
-> Rechnungswesen > Dokumente > Eingangsrechnung
-
-Klicken Sie unter dem Artikel auf "Neue Zeile einfügen". Die Artikelzeile erweitert sich um neue Felder anzuzeigen. Positionieren Sie Ihre Schreibmarke im Barcodefeld und beginnen Sie mit dem Einlesen. Der Barcode wird im entsprechenden Feld aktualisiert. Nachdem der Barcode eingelesen wurd, holt das System automatisch alle Artikeldetails aus dem System.
-
-Aktivieren Sie der Einfachheit halber die POS-Ansicht in ERPNext. Der Aktivierungsprozess ist der selbe wie bei der Barcodeaktivierung. Gehen Sie in die Einstellungen und klicken Sie auf "Funktionen einstellen". Aktivieren Sie dann das Feld "Ist POS".
-
-Gehen Sie dann zu "Rechnungswesen" und klicken Sie auf Ausgangsrechnung. Aktivieren Sie das Feld "Ist POS".
-
-### Abbildung 2: Aktivieren Sie das Feld "Ist POS"
-
-
-
-Gehen Sie zu "Artikel" und klicken Sie auf "Neue Zeile einfügen".
-
-Die Schreibmarke wird automatisch im Barcodefeld positioniert. So können Sie sofort den Barcode einlesen und mit Ihren Arbeiten fortfahren.
-
-{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/data/bulk-rename.md b/foundation/www/docs/user/manual/de/setting-up/data/bulk-rename.md
index 51e3f9c7..67a57964 100644
--- a/foundation/www/docs/user/manual/de/setting-up/data/bulk-rename.md
+++ b/foundation/www/docs/user/manual/de/setting-up/data/bulk-rename.md
@@ -14,4 +14,4 @@ Dieses Werkzeug ermöglicht es Ihnen, gleichzeitig mehrere Datensätze umzubenen
Um mehrere Datensätze umzubenennen, laden Sie eine CSV-Datei mit den alten Namen in der ersten Spalte und den neuen Namen in der zweiten Spalte hoch indem Sie auf "Hochladen" klicken.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/de/setting-up/data/data-import-tool.md b/foundation/www/docs/user/manual/de/setting-up/data/data-import-tool.md
index 2207a1b7..a53116df 100644
--- a/foundation/www/docs/user/manual/de/setting-up/data/data-import-tool.md
+++ b/foundation/www/docs/user/manual/de/setting-up/data/data-import-tool.md
@@ -6,7 +6,7 @@ Das Werkzeug zum Datenimport ist ein großartiger Weg um große Mengen an Daten,
Um das Werkzeug zum Datenimport zu öffnen, gehen Sie entweder zu den Einstellungen oder zur Transaktion, für die Sie importieren wollen. Wenn der Datenimport erlaubt ist, sehen Sie eine Importschaltfläche:
-
+
Das Werkzeug hat zwei Abschnitte, einen um eine Vorlage herunter zu laden, und einen zweiten um Daten hoch zu laden.
@@ -16,7 +16,7 @@ Das Werkzeug hat zwei Abschnitte, einen um eine Vorlage herunter zu laden, und e
Daten werden in ERPNext in Tabellen gespeichert, sehr ähnlich einer Tabellenkalkulation mit Spalten und Zeilen voller Daten. Jede Instanz in ERPNext kann mehrere verschiedene mit Ihr verbundene Untertabellen haben. Die Untertabellen sind mit Ihren übergeordneten Tabellen verknüpft und werden dort eingesetzt, wo es für eine Eigenschaft mehrere verschiedene Werte gibt. So kann z. B. ein Artikel mehrere verschiedene Preise haben, eine Rechnung hat mehrere verschiedene Artikel usw.
-
+
* Klicken Sie auf die Tabelle, die Sie herunter laden wollen, oder auf "Alle Tabellen".
* Für Massenbearbeitung klicken Sie auf "Mit Daten herunterladen".
@@ -35,7 +35,7 @@ Exportieren Sie dann Ihre Vorlage oder speichern Sie sie im CSV-Format (**Comma
Fügen Sie abschliessend die CSV-Datei im Abschnitt Import hinzu. Klicken Sie auf die Schaltfläche "Hochladen und Importieren".
-
+
#### Anmerkungen
diff --git a/foundation/www/docs/user/manual/de/setting-up/email/email-account.md b/foundation/www/docs/user/manual/de/setting-up/email/email-account.md
index a241529a..d099c1d3 100644
--- a/foundation/www/docs/user/manual/de/setting-up/email/email-account.md
+++ b/foundation/www/docs/user/manual/de/setting-up/email/email-account.md
@@ -12,7 +12,7 @@ ERPNext erstellt standardmäßig Vorlagen für einige E-Mail-Konten. Nicht alle
Es gibt zwei Arten von E-Mail-Konten, ausgehend und eingehend. E-Mail-Konten für ausgehende E-Mails verwenden einen SMTP-Service, eingehende E-Mails verwenden einen POP-Service. Die meisten E-Mail-Anbieter wie GMail, Outlook oder Yahoo bieten diese Seriveleistungen an.
-
+
### Konten zu ausgehenden E-Mails
@@ -20,13 +20,13 @@ Alle E-Mails, die vom System aus versendet werden, sei es von einem Benutzer zu
Um ein Konto für ausgehende E-Mails einzurichten, markieren Sie die Option **Ausgehend aktivieren** und geben Sie die Einstellungen zum SMTP-Server an. Wenn Sie einen bekannten E-Mail-Service nutzen, wird das vom System für Sie voreingestellt.
-
+
### Konten zu eingehenden E-Mails
Um ein Konto für eingehende E-Mails einzurichten, markieren Sie die Option **Eingehend aktivieren** und geben Sie die Einstellungen zum POP3-Server an. Wenn Sie einen bekannten E-Mail-Service nutzen, wird das vom System für Sie voreingestellt.
-
+
### Wie ERPNext Antworten handhabt
@@ -36,6 +36,6 @@ Wenn Sie aus ERPNext heraus eine E-Mail an einen Kontakt wie z. B. einen Kunden
Wenn Sie möchten, dass ERPNext Sie benachrichtigt, wenn eine E-Mail für eine bestimmte Zeit unbeantwortet bleibt, dann können Sie die Option **Benachrichtigen, wenn unbeantwortet** markieren. Hier können Sie die Anzahl der Minuten einstellen, die das System warten soll, bevor eine Benachrichtigung gesendet wird, und den Empfänger.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/email/email-alerts.md b/foundation/www/docs/user/manual/de/setting-up/email/email-alerts.md
index 60a6a8f9..2968be1b 100644
--- a/foundation/www/docs/user/manual/de/setting-up/email/email-alerts.md
+++ b/foundation/www/docs/user/manual/de/setting-up/email/email-alerts.md
@@ -33,7 +33,7 @@ Um eine E-Mail-Erinnerung einzustellen, gehen Sie wie folgt vor:
---
#### Beispiel
-1. [Kriterien definieren](
)
-2. [Empfänger und Nachrichtentext eingeben](
)
+1. [Kriterien definieren](
)
+2. [Empfänger und Nachrichtentext eingeben](
)
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/email/email-digest.md b/foundation/www/docs/user/manual/de/setting-up/email/email-digest.md
index 2758e46c..82b2a9a6 100644
--- a/foundation/www/docs/user/manual/de/setting-up/email/email-digest.md
+++ b/foundation/www/docs/user/manual/de/setting-up/email/email-digest.md
@@ -14,6 +14,6 @@ Um einen E-Mail-Bericht einzurichten, gehen Sie zu:
Stellen Sie ein, wie oft Sie eine Benachrichtigung erhalten wollen, markieren Sie alle Artikel, über die Sie in Ihrer wöchentlichen Aktualisierung benachrichtig werden wollen und wählen Sie die Benutzer-IDs aus, an die die Zusammenfassung gesendet werden soll.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/email/sending-email.md b/foundation/www/docs/user/manual/de/setting-up/email/sending-email.md
index 0b044199..89397b6e 100644
--- a/foundation/www/docs/user/manual/de/setting-up/email/sending-email.md
+++ b/foundation/www/docs/user/manual/de/setting-up/email/sending-email.md
@@ -4,7 +4,7 @@
In ERPNext können sie jedes beliebige Dokument per E-Mail versenden (als PDF-Anhang) indem Sie in einem beliebigen geöffneten Dokument auf `Menü > E-Mail` gehen.
-
+
**Anmerkung:** Es müssen Konten zum [E-Mail-Versand](/docs/user/manual/de/setting-up/email/email-account.html) eingerichtet sein.
diff --git a/foundation/www/docs/user/manual/de/setting-up/index.txt b/foundation/www/docs/user/manual/de/setting-up/index.txt
index a607ca23..fff1665e 100644
--- a/foundation/www/docs/user/manual/de/setting-up/index.txt
+++ b/foundation/www/docs/user/manual/de/setting-up/index.txt
@@ -13,7 +13,6 @@ stock-reconciliation-for-non-serialized-item
territory
third-party-backups
workflows
-bar-code
company-setup
setting-company-sales-goal
calculate-incentive-for-sales-team
diff --git a/foundation/www/docs/user/manual/de/setting-up/pos-setting.md b/foundation/www/docs/user/manual/de/setting-up/pos-setting.md
index bd4c441f..ce2730c3 100644
--- a/foundation/www/docs/user/manual/de/setting-up/pos-setting.md
+++ b/foundation/www/docs/user/manual/de/setting-up/pos-setting.md
@@ -10,7 +10,7 @@ Wenn Sie im Endkundengeschäft tätig sind, möchten Sie, dass Ihr POS so schnel
Setzen Sie die Standardeinstellungen wie definiert.
-
+
> Wichtig: Wenn Sie einen bestimmten Benutzer angeben, werden die POS-Einstellungen nur auf diesen Benutzer angewendet. Wenn diese Optin leer bleibt, werden die Einstellungen auf alle Benutzer angewendet. Um mehr über POS zu erfahren, gehen Sie zu POS.
diff --git a/foundation/www/docs/user/manual/de/setting-up/price-lists.md b/foundation/www/docs/user/manual/de/setting-up/price-lists.md
index b2f618dd..32ff4800 100644
--- a/foundation/www/docs/user/manual/de/setting-up/price-lists.md
+++ b/foundation/www/docs/user/manual/de/setting-up/price-lists.md
@@ -12,7 +12,7 @@ Sie können eine neue Preisliste erstellen über:
> Vertrieb/Einkauf/Lagerbestand > Einstellungen > Preisliste > Neu
-
+
* Diese Preislisten werden verwendet, wenn der Datensatz zum Artikelpreis erstellt wird, um den Verkaufs- oder Einkaufspreis eines Artikels nachvollziehen zu können. Klicken Sie hier, wenn Sie mehr über Artikelpreise erfahren wollen.
* Um eine bestimmte Preisliste zu deaktivieren, deaktivieren Sie das Feld "Aktiviert" im der Preisliste. Die deaktivierte Preisliste ist dann in der Auswahl nicht mehr in Verkaufs- oder Einkaufstransaktionen verfügbar.
diff --git a/foundation/www/docs/user/manual/de/setting-up/print/address-template.md b/foundation/www/docs/user/manual/de/setting-up/print/address-template.md
index 7dd88379..8604340a 100644
--- a/foundation/www/docs/user/manual/de/setting-up/print/address-template.md
+++ b/foundation/www/docs/user/manual/de/setting-up/print/address-template.md
@@ -29,6 +29,6 @@ Hier sehen Sie die Standardvorlage:
### Beispiel
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/print/letter-head.md b/foundation/www/docs/user/manual/de/setting-up/print/letter-head.md
index e1df9e83..5eee079f 100644
--- a/foundation/www/docs/user/manual/de/setting-up/print/letter-head.md
+++ b/foundation/www/docs/user/manual/de/setting-up/print/letter-head.md
@@ -16,10 +16,10 @@ Sie können Briefköpfe erstellen/verwalten über:
#### Beispiel
-
+
So sieht der Briefkopf eines Ausdruckes aus:
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/print/print-format-builder.md b/foundation/www/docs/user/manual/de/setting-up/print/print-format-builder.md
index b493fa22..618395e1 100644
--- a/foundation/www/docs/user/manual/de/setting-up/print/print-format-builder.md
+++ b/foundation/www/docs/user/manual/de/setting-up/print/print-format-builder.md
@@ -12,19 +12,19 @@ Oder Sie öffnen das Dokument, für das Sie ein Druckformat erstellen wollen. Kl
### Schritt 1: Erstellen Sie ein neues Format
-
+
### Schritt 2: Ein neues Feld hinzufügen
Um ein Feld hinzuzufügen, nehmen Sie es auf der linken Seitenleiste mit der Maus auf und fügen Sie es Ihrem Layout hinzu. Sie können das Layout bearbeiten, indem Sie auf das Symbol für Einstellungen klicken.
-
+
### Schritt 3: Ein Feld entfernen
Um ein Feld zu entfernen, legen Sie es einfach zurück in die Seitenleiste.
-
+
### Schritt 4
@@ -32,7 +32,7 @@ Sie können benutzerdefinierten Text als HTML in Ihr Druckformat übernehmen. F
Klicken Sie dann auf **HTML bearbeiten** um den Inhalt zu bearbeiten.
-
+
Um Ihr Format abzuspeichern klicken Sie einfach auf die Schaltfläche **Speichern**.
diff --git a/foundation/www/docs/user/manual/de/setting-up/print/print-headings.md b/foundation/www/docs/user/manual/de/setting-up/print/print-headings.md
index 42e03662..7177751f 100644
--- a/foundation/www/docs/user/manual/de/setting-up/print/print-headings.md
+++ b/foundation/www/docs/user/manual/de/setting-up/print/print-headings.md
@@ -10,10 +10,10 @@ Sie können Druckköpfe erstellen über:
#### Abbildung 1: Druckköpfe abspeichern
-
+
Hier ist ein Beispiel abgebildet, wie man einen Druckkopf auswechselt:
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/print/print-settings.md b/foundation/www/docs/user/manual/de/setting-up/print/print-settings.md
index 77bf32ae..8ec6d4b6 100644
--- a/foundation/www/docs/user/manual/de/setting-up/print/print-settings.md
+++ b/foundation/www/docs/user/manual/de/setting-up/print/print-settings.md
@@ -8,6 +8,6 @@ Um die Druckeinstellungen zu bearbeiten, gehen Sie zu:
> Einstellungen > Druck > Druckeinstellungen
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/print/terms-and-conditions.md b/foundation/www/docs/user/manual/de/setting-up/print/terms-and-conditions.md
index 8a4e1a9d..3c635681 100644
--- a/foundation/www/docs/user/manual/de/setting-up/print/terms-and-conditions.md
+++ b/foundation/www/docs/user/manual/de/setting-up/print/terms-and-conditions.md
@@ -10,13 +10,13 @@ Um die Vorlage für die Allgemeinen Geschäftsbedingungen zu erstellen, gehen Si
> Vertrieb > Einstellungen > Vorlage für Allgemeine Geschäftsbedingungen > Neu
-
+
### 2\. Bearbeitung in HTML
Der Inhalt der Allgemeinen Geschäftsbedingungen kann nach Ihren Vorstellungen formatiert werden und es können bei Bedarf auch Bilder eingefügt werden. Für diejenigen, die sich in HTML auskennen, findet Sich auch eine Möglichkeit den Inhalt der Allgemeinen Geschäftsbedingungen in HTML zu formatieren.
-
+
Dies erlaubt es Ihnen auch die Vorlage für die Allgemeinen Geschäftsbedingungen als Fußzeile zu verwenden, was sonst in ERPNext nicht als dedizierte Funktionalität zur Verfügung steht. Da die Inhalte der Allgemeinen Geschäftsbedingungen im Druckformat immer zuletzt erscheinen, sollten die Einzelheiten zur Fußzeile am Ende des Inhaltes eingefügt werden.
@@ -24,6 +24,6 @@ Dies erlaubt es Ihnen auch die Vorlage für die Allgemeinen Geschäftsbedingunge
In Transaktionen finden Sie den Abschnitt Allgemeine Geschäftsbedingungen, wo Sie nach einer Vorlage für die Allgemeinen Geschäftsbedingungen suchen und diese auswählen können.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/setting-up-taxes.md b/foundation/www/docs/user/manual/de/setting-up/setting-up-taxes.md
index c1d0eeff..e6d4ff7e 100644
--- a/foundation/www/docs/user/manual/de/setting-up/setting-up-taxes.md
+++ b/foundation/www/docs/user/manual/de/setting-up/setting-up-taxes.md
@@ -14,11 +14,11 @@ Wenn einige Ihrer Artikel einer anderen Besteuerung unterliegen als andere, gebe
Die Tabelle zu den Artikelsteuern ist ein Abschnitt in den Artikelstammdaten.
-
+
* **Inklusive oder Exklusive Steuer:** ERPNext erlaubt es Ihnen Artikelpreise inklusive Steuer einzugeben.
-
+
* **Ausnahme von der Regel:** Die Einstellungen zur Artikelsteuer werden nur dann benötigt, wenn sich der Steuersatz eines bestimmten Artikels von demjenigen, den Sie im Standard-Steuerkonto definiert haben, unterscheidet.
* **Die Artikelsteuer kann überschrieben werden:** Sie können den Artikelsteuersatz überschreiben oder ändern, wenn Sie in der Artikelsteuertabelle zu den Artikelstammdaten gehen.
@@ -35,7 +35,7 @@ Um eine neue Vorlage zu einer Verkaufssteuer z. B. mit dem Namen Vorlage für Ve
> Einstellungen > Rechnungswesen > Vorlage für Verkaufssteuern und -abgaben
-
+
Wenn Sie eine neue Vorlage erstellen, müssen Sie für jeden Steuertyp eine neue Zeile einfügen.
diff --git a/foundation/www/docs/user/manual/de/setting-up/settings/global-defaults.md b/foundation/www/docs/user/manual/de/setting-up/settings/global-defaults.md
index 50114c07..d3d3b31c 100644
--- a/foundation/www/docs/user/manual/de/setting-up/settings/global-defaults.md
+++ b/foundation/www/docs/user/manual/de/setting-up/settings/global-defaults.md
@@ -8,6 +8,6 @@ Sie können Standardwerte für Ihre Dokumente über die globalen Voreinstellunge
Immer dann, wenn ein neues Dokument erstellt wird, werden diese Werte als Standardeinstellungen verwendet.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/settings/module-settings.md b/foundation/www/docs/user/manual/de/setting-up/settings/module-settings.md
index 3096e9ad..cb91d8c6 100644
--- a/foundation/www/docs/user/manual/de/setting-up/settings/module-settings.md
+++ b/foundation/www/docs/user/manual/de/setting-up/settings/module-settings.md
@@ -12,6 +12,6 @@ Beispiel: Wenn Sie im Dienstleistungsbereich arbeiten, möchten Sie evtl. das Fe
Markieren oder demarkieren Sie die Elemente die angezeigt / ausgeblendet werden sollen.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/settings/naming-series.md b/foundation/www/docs/user/manual/de/setting-up/settings/naming-series.md
index 5c0f1c67..016e4639 100644
--- a/foundation/www/docs/user/manual/de/setting-up/settings/naming-series.md
+++ b/foundation/www/docs/user/manual/de/setting-up/settings/naming-series.md
@@ -34,6 +34,6 @@ Sie können auch den Startpunkt eines Nummernkreises auswählen, indem Sie den N
Sehen Sie hier, wie der Nummernkreis eingestellt wird.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/settings/system-settings.md b/foundation/www/docs/user/manual/de/setting-up/settings/system-settings.md
index ee447f05..56a0c36d 100644
--- a/foundation/www/docs/user/manual/de/setting-up/settings/system-settings.md
+++ b/foundation/www/docs/user/manual/de/setting-up/settings/system-settings.md
@@ -8,6 +8,6 @@ Um die Systemeinstellungen zu öffnen, gehen Sie zu:
> Einstellungen > Einstellungen > Systemeinstellungen
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md
index 0498ef57..17305c5b 100644
--- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md
+++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md
@@ -4,7 +4,7 @@
Wählen Sie Ihre Sprache. ERPNext gibt es in mehr als 20 Sprachen.
-
+
---
diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md
index c23f1fd7..63e00bf3 100644
--- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md
+++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md
@@ -5,7 +5,7 @@
In diesem letzten Schritt geben Sie bitte die Bezeichnungen der Artikel ein, die Sie kaufen oder verkaufen.
+
---
diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md
index fb00719e..e78fec80 100644
--- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md
+++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md
@@ -5,7 +5,7 @@
Geben Sie Details zum Benutzerprofil, wie Name, Benutzer-ID und das bevorzugte Passwort ein.
+
> Anmerkung: Die Zeichenfolge bis zum "?" ist die URL des SMS-Gateways.
@@ -24,7 +24,7 @@ Die oben angegebene URL verschickt SMS über das Konto "abcd" an Mobilnummern "9
Beachten Sie, dass einige Parameter in der URL statisch sind. Sie bekommen von Ihrem SMS-Anbieter statische Werte wie Benutzername, Passwort usw. Diese statischen Werte sollten in die Tabelle der statischen Parameter eingetragen werden.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md b/foundation/www/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md
index 38d7605a..d5ad9d25 100644
--- a/foundation/www/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md
+++ b/foundation/www/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md
@@ -24,18 +24,18 @@ Um einen Lagerabgleich durchzuführen, gehen Sie zu:
Sie sollten sich an eine spezielle Vorlage eines Tabellenblattes halten um den Bestand und den Wert eines Artikels zu importieren. Öffnen Sie ein neues Formular zum Bestandsabgleich um die Optionen für den Download zu sehen.
-
+
#### Schritt 2: Geben Sie Daten in die CSV-Datei ein.
-
+
Das CSV-Format beachtet Groß- und Kleinschreibung. Verändern Sie nicht die Kopfbezeichnungen, die in der Vorlage vordefiniert wurden. In den Spalten "Artikelnummer" und "Lager" geben Sie bitte die richtige Artikelnummer und das Lager ein, so wie es in ERPNext bezeichnet wird. Für die Menge geben Sie den Lagerbestand, den Sie für diesen Artikel erfassen wollen, in einem bestimmten Lager ein. Wenn Sie die Menge oder den wertmäßigen Betrag eines Artikels nicht ändern wollen, dann lassen Sie den Eintrag leer.
Anmerkung: Geben Sie keine "0" ein, wenn sie die Menge oder den wertmäßigen Betrag nicht ändern wollen. Sonst kalkuliert das System eine Menge von "0". Lassen Sie also das Feld leer!
#### Schritt 3: Laden Sie die Datei hoch und geben Sie in das Formular "Bestandsableich" Werte ein.
-
+
##### Buchungsdatum
@@ -53,11 +53,11 @@ Notiz: Wenn Sie die bewerteten Beträge eines Artikels eingeben, können Sie zum
#### Schritt 4: Überprüfen Sie die Daten zum Bestandsabgleich
-
+
### Bericht zum Lagerbuch
-
+
##### So arbeitet der Bestandsabgleich
diff --git a/foundation/www/docs/user/manual/de/setting-up/territory.md b/foundation/www/docs/user/manual/de/setting-up/territory.md
index 5fd88ca1..0e70de86 100644
--- a/foundation/www/docs/user/manual/de/setting-up/territory.md
+++ b/foundation/www/docs/user/manual/de/setting-up/territory.md
@@ -4,6 +4,6 @@
Wenn sich Ihre Geschäftstätigkeit in verschiedenen Regionen abspielt (das können z. B. Länder, Bundesländer oder Städte sein), ist es normalerweise eine großartige Idee, diese Struktur auch im System abzubilden. Wenn Sie Ihre Kunden erst einmal nach Regionen eingeteilt haben, können für jede Artikelgruppe Ziele aufstellen und bekommen Berichte, die Ihnen Ihre aktuelle Leistung in einem Gebiet zeigen und auch das, was Sie geplant haben. Sie können zudem auch eine unterschiedliche Preispolitik für ein und dasselbe Produkt in unterschiedlichen Regionen einstellen.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md
index 282aa497..e4c21481 100644
--- a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md
+++ b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md
@@ -12,7 +12,7 @@ Für einen Benutzer können viele Informationen eingegeben werden. Im Sinne der
### 1. Übersicht der Benutzer
-
+
Um einen neuen Benutzer hinzuzufügen, klicken Sie auf "Neu".
@@ -29,18 +29,18 @@ Nach dem Hinzufügen dieser Details bitte den Benutzer abspeichern.
Nach dem Speichern sehen Sie eine Liste der Rollen und daneben jeweils eine Schaltfläche zum Anklicken. Markieren Sie alle Rollen, von denen Sie möchten, dass sie der Benutzer bekommt, und speichern Sie das Dokument ab. Um zu sehen, welche Berechtigungen die einzelnen Rollen haben, klicken Sie auf den Rollennamen.
-
+
### 4. Zugriff auf Module einstellen
Benutzer haben Zugriff auf alle Module, für die sie aufgrund Ihrer Rollen Berechtigungen haben. Wenn Sie bestimmte Module für den Zugriff sperren möchten, entfernen Sie die Markierung in der Liste.
-
+
### 5. Sicherheitseinstellungen
Wenn Sie dem Benutzer nur zu bestimmten Bürozeiten oder an Wochenenden Zugriff auf das System gewähren möchten, stellen Sie das unter den Sicherheitseinstellungen ein.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
index a8b3a5d2..2fd197ad 100644
--- a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
+++ b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
@@ -8,7 +8,7 @@ Wenn Sie das tun wollen, gehen Sie zu:
> Einstellungen > Berechtigungen > Rollenberechtigungen-Manager
-
+
Berechtigungen werden angewandt auf einer Kombination von:
@@ -44,23 +44,23 @@ Um Benutzerberechtigungen zu setzen, gehen Sie zu:
Der Urlaubsantrag ist ein gutes **Beispiel**, welches alle Bereiche des Berechtigungssystems abdeckt.
-
+
1\. **Er sollte von einem "Mitarbeiter" erstellt werden.** Aus diesem Grund sollte die Rolle "Mitarbeiter" Berechtigungen zum Lesen, Schreiben und Erstellen haben.
-
+
2\. **Ein Mitarbeiter sollte nur auf seine/Ihre eigenen Urlaubsanträge zugreifen können.** Daher sollte der Punkt "Benutzerberechtigungen anwenden" für die Rolle "Mitarbeiter" aktiviert sein und es sollte ein Datensatz "Benutzerberechtigung" für jede Kombination von Benutzer und Mitarbeiter erstellt werden. (Dieser Aufwand reduziert sich für den Dokumententyp, indem über das Programm Datensätze für Benutzerberechtigungen erstellt werden.)
-
+
3\. **Der Personalmanager sollte alle Urlaubsanträge sehen können.** Erstellen Sie für den Personalmanager eine Berechtigungsregel auf der Ebene 0 mit Lese-Rechten. Die Option "Benutzerberechtigungen anwenden" sollte deaktiviert sein.
-
+
4\. **Der Urlaubsgenehmiger sollte die ihn betreffenden Urlaubsanträge lesen und aktualisieren können.** Der Urlaubsgenehmiger erhält Lese- und Schreibzugriff auf Ebene 0, und die Option "Benutzerberechtigungen anwenden" wird aktiviert. Zutreffende Mitarbeiter-Dokumente sollten in den Benutzerberechtigungen des Urlaubsgenehmigers aufgelistet sein. (Dieser Aufwand reduziert sich für Urlaubsgenehmiger, die in Mitarbeiterdokumenten aufgeführt werden, indem über das Programm Datensätze für Benutzerberechtigungen erstellt werden.)
-
+
5\. **Ein Urlaubsantrag sollte nur von einem Mitarbeiter der Personalverwaltung oder einem Urlaubsgenehmiger bestätigt oder abgelehnt werden können.** Das Statusfeld des Urlaubsantrags wird auf Ebene 1 gesetzt. Mitarbeiter der Personalverwaltung und Urlaubsgenehmiger bekommen Lese- und Schreibrechte für Ebene 1, während allen anderen Leserechte für Ebene 1 gegeben werden.
@@ -68,6 +68,6 @@ Der Urlaubsantrag ist ein gutes **Beispiel**, welches alle Bereiche des Berechti
6\. **Der Mitarbeiter der Personalverwaltung sollte die Möglichkeit haben Urlaubsanträge an seine Untergebenen zu delegieren.** Er erhält die Erlaubis Benutzerberechtigungen einzustellen. Ein Nutzer mit der Rolle "Benutzer Personalverwaltung" wäre dann also in der Lage Benutzer-Berechtigungen und Urlaubsanträge für andere Benutzer zu definieren.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/sharing.md b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/sharing.md
index 67aa3a1c..95170340 100644
--- a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/sharing.md
+++ b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/sharing.md
@@ -6,6 +6,6 @@ Zusätzlich zu Benutzer- und Rollenberechtigungen können Sie ein Dokument auch
Um ein Dokument zu teilen, öffnen Sie das Dokument, klicken Sie auf das "+"-Symbol im Abschnitt "Freigegeben für" und wählen Sie den Benutzer aus.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/setting-up/workflows.md b/foundation/www/docs/user/manual/de/setting-up/workflows.md
index 2bdbaab5..dab34f6e 100644
--- a/foundation/www/docs/user/manual/de/setting-up/workflows.md
+++ b/foundation/www/docs/user/manual/de/setting-up/workflows.md
@@ -8,7 +8,7 @@ Unten Sehen Sie ein Beispiel eines Worklflows.
Wenn ein Benutzer einen Urlaub beantragt, dann wird seine Anfrage an die Personalabteilung weiter geleitet. Die Personalabteilung, repräsentiert durch einen Mitarbeiter der Personalabteilung, wird diese Anfrage dann entweder genehmigen oder ablehnen. Wenn dieser Prozess abgeschlossen ist, dann bekommt der Vorgesetzte des Benutzers (der Urlaubsgenehmiger) eine Mitteilung, dass die Personalabteilung den Antrag genehmigt oder abgelehnt hat. Der Vorgesetzte, der die genehmigende Instanz ist, wird dann den Antrag entweder genehmigen oder ablehnen. Dementsprechend bekommt der Benutzer dann eine Genehmigung oder eine Ablehnung.
-
+
Um einen Workflow und Übergangsregeln zu erstellen, gehen Sie zu:
@@ -16,11 +16,11 @@ Um einen Workflow und Übergangsregeln zu erstellen, gehen Sie zu:
#### Schritt 1: Geben Sie die unterschiedlichen Zustände des Prozesses Urlaubsantrag ein.
-
+
#### Schritt 2: Geben Sie die Übergangsregeln ein.
-
+
Hinweise:
@@ -38,14 +38,14 @@ Gehen Sie in das Modul Personalwesen und klicken Sie auf Urlaubsantrag. Beantrag
Wenn ein Urlaubsantrag übertragen wird, steht der Status in der Ecke der rechten Seite auf "Beantragt".
-
+
Wenn sich ein Mitarbeiter der Personalabteilung anmeldet, dann kann er den Antrag genehmigen oder ablehnen. Wenn eine Genehmigung erfolgt, wechselt der Status in der rechten Ecke zu "Genehmigt". Es wird jedoch ein blaues Informationssymbol angezeigt, welches aussagt, dass der Urlaubsantrag noch anhängig ist.
-
+
Wenn der Urlaubsgenehmiger die Seite mit den Urlaubsanträgen öffnet, kann er den Status von "Genehmigt" auf "Abgelehnt" ändern.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md b/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
index 1a888fa3..d995319a 100644
--- a/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -134,11 +134,11 @@ Nehmen wir an, Sie haben 10 Stück des Artikels "RM0001" zu 200€ und 5 Stück
+
**Hauptbuch:**
-
+
Um ein System der doppelten Buchhaltung zu erhalten, werden dadurch, dass sich der Kontensaldo durch den Kaufbeleg erhöht, die Konten "In Verkaufsstellen" und "Anlagevermögen im Lager" belastet und das temporäre Konto "Lagerware erhalten aber noch nicht abgerechnet" entlastet. Zum selben Zeitpunkt wird eine negative Aufwendung auf das Konto "In der Bewertung enthaltene Kosten" verbucht, um die Bewertung hinzuzufügen und um eine doppelte Aufwandsverbuchung zu vermeiden.
@@ -150,7 +150,7 @@ Wenn eine Rechnung des Lieferanten für den oben angesprochenen Kaufbeleg eintri
#### Hauptbuch
-
+
Hier wird das Konto "Lagerware erhalten aber noch nicht bewertet" belastet und hebt den Effekt des Kaufbeleges auf.
@@ -207,11 +207,11 @@ Nehmen wir an, dass Sie eine Kundenbestellung von "Utah Automation Services" üb
**Lagerbuch**
-
+
**Hauptbuch**
-
+
Da der Artikel aus dem Lager "In Verkaufsstellen" geliefert wird, wird das Konto "In Verkaufsstellen" entlastet und ein Betrag in gleicher Höhe dem Aufwandskonto "Selbstkosten" belastet. Der belastete/entlastete Betrag ist gleich dem Gesamtwert (Einkaufskosten) des Verkaufsartikels. Und der Wert wird gemäß der bevorzugten Bewertungsmethode (FIFO/Gleitender Durchschnitt) oder den tatsächlichen Kosten eines serialisierten Artikels kalkuliert.
@@ -232,11 +232,11 @@ Nehmen wir an, dass Sie zur obigen Bestellung keinen Lieferschein erstellt haben
**Lagerbuch**
-
+
**Hauptbuch**
-
+
Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten "In Verkaufsstellen" und "Selbstkosten" basierend auf der Bewertung beeinflusst.
@@ -269,11 +269,11 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten
**Lagerbuch**
-
+
**Hauptbuch**
-
+
* * *
@@ -304,11 +304,11 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten
**Lagerbuch**
-
+
**Hauptbuch**
-
+
* * *
@@ -341,8 +341,8 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten
**Lagerbuch**
-
+
**Hauptbuch**
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/de/stock/batch.md b/foundation/www/docs/user/manual/de/stock/batch.md
index a128befb..39206748 100644
--- a/foundation/www/docs/user/manual/de/stock/batch.md
+++ b/foundation/www/docs/user/manual/de/stock/batch.md
@@ -14,7 +14,7 @@ Bei jeder für einen Chargenartikel generierten Lagertransaktion (Kaufbeleg, Lie
Die Chargenstammdaten werden vor der Ausfertigung des Kaufbelegs erstellt. Somit erstellen Sie immer dann, wenn für einen Chargenartikel ein Kaufbeleg oder ein Produktionsauftrag ausgegeben werden, zuerst die Chargennummer des Artikels und wählen diese dann im Kaufbeleg oder im Produktionsauftrag aus.
-
+
> Anmerkung: Bei Lagertransaktionen werden die Chargen-IDs basierend auf dem Code, dem Lager, dem Verfallsdatum der Charge (verglichen mit dem Veröffentlichungsdatum der Transaktion) und der aktuellen Menge im Lager gefiltert.
diff --git a/foundation/www/docs/user/manual/de/stock/delivery-note.md b/foundation/www/docs/user/manual/de/stock/delivery-note.md
index 221e2834..cd953bc4 100644
--- a/foundation/www/docs/user/manual/de/stock/delivery-note.md
+++ b/foundation/www/docs/user/manual/de/stock/delivery-note.md
@@ -12,7 +12,7 @@ Die Buchung zum Lieferschein ist derjenigen zum Kaufbeleg sehr ähnlich. Sie kö
oder aber über eine "übertragene" Kundenbestellung (die noch nicht versandt wurde) indem Sie auf "Lieferschein erstellen" klicken.
-
+
Sie können die Details auch aus einer noch nicht gelieferten Kundenbestellung "herausziehen".
diff --git a/foundation/www/docs/user/manual/de/stock/material-request.md b/foundation/www/docs/user/manual/de/stock/material-request.md
index 75ba82e6..1eb35420 100644
--- a/foundation/www/docs/user/manual/de/stock/material-request.md
+++ b/foundation/www/docs/user/manual/de/stock/material-request.md
@@ -4,7 +4,7 @@
Eine Materialanfrage ist ein einfaches Dokument, welches einen Bedarf an Artikeln (Produkte oder Dienstleistungen) für einen bestimmten Zweck erfasst.
-
+
Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu:
@@ -12,7 +12,7 @@ Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu:
### Materialanfrage erstellen
-
+
Eine Materialanfrage kann auf folgende Arten erstellt werden:
diff --git a/foundation/www/docs/user/manual/de/stock/projected-quantity.md b/foundation/www/docs/user/manual/de/stock/projected-quantity.md
index 0a17a69d..20e0d31a 100644
--- a/foundation/www/docs/user/manual/de/stock/projected-quantity.md
+++ b/foundation/www/docs/user/manual/de/stock/projected-quantity.md
@@ -8,7 +8,7 @@ Der projizierte Lagerbestand wird vom Planungssystem verwendet um den Nachbestel
Eine strikte Kontrolle des projizierten Lagerbestandes ist entscheidend um Engpässe vorherzusagen und die richtige Bestellmenge kalkulieren zu können.
-
+
> Projizierte Menge = Momentan vorhandene Menge + Geplante Menge + Angefragte Menge + Bestellte Menge - Reservierte Menge
diff --git a/foundation/www/docs/user/manual/de/stock/purchase-receipt.md b/foundation/www/docs/user/manual/de/stock/purchase-receipt.md
index 7bfc82c6..842d5781 100644
--- a/foundation/www/docs/user/manual/de/stock/purchase-receipt.md
+++ b/foundation/www/docs/user/manual/de/stock/purchase-receipt.md
@@ -12,7 +12,7 @@ Sie können einen Kaufbeleg direkt erstellen über:
oder aus einer "übertragenen" Einkaufsbestellung heraus, in dem Sie auf die Schaltfläche "Kaufbeleg erstellen" klicken.
-
+
### Ausschuss
diff --git a/foundation/www/docs/user/manual/de/stock/purchase-return.md b/foundation/www/docs/user/manual/de/stock/purchase-return.md
index ad58e4b8..76b9b51c 100644
--- a/foundation/www/docs/user/manual/de/stock/purchase-return.md
+++ b/foundation/www/docs/user/manual/de/stock/purchase-return.md
@@ -8,18 +8,18 @@ Sie können eine Lieferantenreklamation erstellen indem Sie ganz einfach einen K
Öffnen Sie hierzu zuerst die ursprüngliche Eingangsrechnung zu der der Lieferant die Artikel geliefert hat.
-
+
Klicken Sie dann auf "Lieferantenreklamation erstellen", dies öffnet einen neuen Kaufbeleg bei dem "Ist Reklamation" markiert ist, und bei dem die Artikel mit negativer Menge aufgeführt sind.
-
+
Bei der Ausgabe eines Reklamations-Kaufbelegs vermindert das System die Menge des Artikels auf dem entsprechenden Lager. Um einen korrekten Lagerwert zu erhalten, verändert sich der Lagersaldo entsprechend dem Einkaufspreis des zurückgesendeten Artikels.
-
+
Wenn die Ständige Inventur aktiviert wurde, verbucht das System weiterhin Buchungssätze zum Lagerkonto um den Lagersaldo mit dem Lagerbestand des Lagerbuchs zu synchronisieren.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/stock/sales-return.md b/foundation/www/docs/user/manual/de/stock/sales-return.md
index b4d59010..bfba6f02 100644
--- a/foundation/www/docs/user/manual/de/stock/sales-return.md
+++ b/foundation/www/docs/user/manual/de/stock/sales-return.md
@@ -8,22 +8,22 @@ In ERPNext können Sie eine Kundenreklamation erstellen, indem Sie ganz einfach
Öffnen Sie dazu zuerst den Lieferschein/die Ausgangsrechnung zu dem/der der Kunde einen Artikel zurück sendet.
-
+
Klicken Sie dann auf "Kundenreklamation erstellen", das öffnet einen neuen Lieferschein, bei dem "Ist Reklamation" aktiviert ist, und die Artikel und Steuern mit negativem Betrag angezeigt werden.
Sie können die Reklamation auch über die Originalausgangsrechnung erstellen. Um Material mit einer Gutschrift zurück zu geben, markieren Sie die Option "Lager aktualisieren" in der Reklamationsrechnung.
-
+
Bei der Ausgabe eines Rücksendelieferscheins / einer Reklamationsrechnung erhöht das System den Lagerbestand im entsprechenden Lager. Um den richtigen Lagerwert zu erhalten erhöht sich der Lagerbestand um den Wert des ursprünglichen Einkaufspreises des zurückgeschickten Artikels.
-
+
Für den Fall einer Reklamationsrechnung erhält das Kundenkonto eine Gutschrift und die damit verknüpften Konten für Erträge und Steuern werden belastet.
Wenn die ständige Inventur aktiviert ist, erstellt das System auch Buchungen für das Lagerkonto um den Kontostand des Lagers mit dem Lagerbuch zu synchronisieren.
-
+
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/stock/serial-no.md b/foundation/www/docs/user/manual/de/stock/serial-no.md
index 5fdf2507..3ad1c4d4 100644
--- a/foundation/www/docs/user/manual/de/stock/serial-no.md
+++ b/foundation/www/docs/user/manual/de/stock/serial-no.md
@@ -14,7 +14,7 @@ Wenn Ihr Artikel serialisiert ist, müssen Sie die Seriennummern in der entsprec
Der Lagerbestand eines Artikels kann nur dann beeinflusst werden, wenn die Seriennummer mit Hilfe einer Lagertransaktion (Lagerbuchung, Kaufbeleg, Lieferschein, Ausgangsrechnung) übertragen wird. Wenn eine neue Seriennummer direkt erstellt wird, kann der Lagerort nicht eingestellt werden.
-
+
* Der Status wird aufgrund der Lagerbuchung eingestellt.
* Nur Seriennummern mit dem Status "Verfügbar" können geliefert werden.
diff --git a/foundation/www/docs/user/manual/de/stock/setup/item-attribute.md b/foundation/www/docs/user/manual/de/stock/setup/item-attribute.md
index 1f93b44e..95504014 100644
--- a/foundation/www/docs/user/manual/de/stock/setup/item-attribute.md
+++ b/foundation/www/docs/user/manual/de/stock/setup/item-attribute.md
@@ -4,18 +4,18 @@
Sie können Attribute und Attributwerte für Ihre Artikelvarianten hier auswählen.
-
+
### Nicht-numerische Attribute
* Für nicht-numerische Attribute definieren Sie Attributwerte und deren Abkürzungen in der Tabelle Attributwerte.
-
+
### Numerische Attribute
* Wenn Ihr Attribut numerisch ist, wählen Sie numerische Werte.
* Geben Sie den Bereich an und die Schrittweite.
-
+
diff --git a/foundation/www/docs/user/manual/de/stock/setup/item-group.md b/foundation/www/docs/user/manual/de/stock/setup/item-group.md
index 6fadb9a1..5626c2aa 100644
--- a/foundation/www/docs/user/manual/de/stock/setup/item-group.md
+++ b/foundation/www/docs/user/manual/de/stock/setup/item-group.md
@@ -4,19 +4,19 @@
Die Artikelgruppe ist die Klassifikationskategorie. Ordnen Sie ein Produkt abhängig von seiner Art in einen entsprechenden Bereich ein. Wenn das Produkt dienstleistungsorientiert ist, ordnen Sie es unter dem Hauptpunkt Dienstleistung ein. Wenn das Produkt als Rohmaterial verwendet wird, müssen Sie es in der Kategorie Rohmaterial einordnen. Für den Fall, dass es sich bei dem Produkt um reine Handelsware handelt, können Sie es im Bereich Handelsware einordnen.
-
+
### Eine Artikelgruppe erstellen
* Wählen Sie eine Artikelgruppe aus unter der Sie eine Artikelgruppe erstellen wollen.
* Klicken Sie auf "Unterpunkt hinzufügen".
-
+
### Eine Artikelgruppe löschen
* Wählen Sie die zu löschende Artikelgruppe aus.
* Klicken Sie auf "Löschen"
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/stock/setup/stock-settings.md b/foundation/www/docs/user/manual/de/stock/setup/stock-settings.md
index b9a0bd87..5bd75c60 100644
--- a/foundation/www/docs/user/manual/de/stock/setup/stock-settings.md
+++ b/foundation/www/docs/user/manual/de/stock/setup/stock-settings.md
@@ -4,6 +4,6 @@
Sie können Standardeinstellungen für Ihre mit dem Lager verbundenen Transaktionen hier voreinstellen.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/stock/stock-entry.md b/foundation/www/docs/user/manual/de/stock/stock-entry.md
index 3b0314b5..659ebb21 100644
--- a/foundation/www/docs/user/manual/de/stock/stock-entry.md
+++ b/foundation/www/docs/user/manual/de/stock/stock-entry.md
@@ -8,7 +8,7 @@ Wenn Sie eine Lagerbuchung erstellen möchten, gehen Sie zu:
> Lagerbestand > Dokumente > Lagerbuchung > Neu
-
+
Lagerbuchungen können aus folgenden Gründen erstellt werden:
@@ -28,15 +28,15 @@ Wenn die Lagerbuchung eine Eingangsbuchung ist, d. h. wenn ein beliebiger Artike
Um Zusatzkosten hinzuzufügen, geben Sie die Beschreibung und den Betrag der Kosten in die Tabelle Zusatzkosten ein.
-
+
Die hinzugefügten Zusatzkosten werden basierend auf dem Grundwert der Artikel proportional auf die erhaltenen Artikel verteilt. Dann werden die verteilten Zusatzkosten zum Grundpreis hinzugerechnet, um den Wert neu zu berechnen.
-
+
Wenn die laufende Inventur aktiviert ist, werden Zusatzkosten auf das Konto "Aufwendungen im Wert beinhaltet" gebucht.
-
+
> Hinweis: Um den Lagerbestand über eine Tabellenkalkulation zu aktualisieren, bitte unter Lagerabgleich nachlesen.
{next}
diff --git a/foundation/www/docs/user/manual/de/stock/tools/landed-cost-voucher.md b/foundation/www/docs/user/manual/de/stock/tools/landed-cost-voucher.md
index 4fc7c1fa..d6c590b0 100644
--- a/foundation/www/docs/user/manual/de/stock/tools/landed-cost-voucher.md
+++ b/foundation/www/docs/user/manual/de/stock/tools/landed-cost-voucher.md
@@ -24,7 +24,7 @@ Sie können die Einstandskosten an jedem zukünftigen Zeitpunkt über einen Eins
Im Dokument können Sie verschiedene Kaufbelege auswählen und alle Artikel daraus abrufen. Dann sollten Sie zutreffende Abgaben aus der Tabelle "Steuern und Abgaben" hinzufügen. Die hinzugefügten Abgaben werden proportional auf die Artikel aufgeteilt, basierend auf ihrem Wert.
-
+
### Was passiert bei der Ausgabe?
diff --git a/foundation/www/docs/user/manual/de/stock/tools/packing-slip.md b/foundation/www/docs/user/manual/de/stock/tools/packing-slip.md
index 52f35046..41b65093 100644
--- a/foundation/www/docs/user/manual/de/stock/tools/packing-slip.md
+++ b/foundation/www/docs/user/manual/de/stock/tools/packing-slip.md
@@ -4,6 +4,6 @@
Ein Packzettel ist ein Dokument, welches die Artikel einer Sendung auflistet. Normalerweise wird er den gelieferten Waren beigelegt. Beim Versand eines Produktes wird ein Entwurf für einen Lieferschein erstellt. Sie können aus diesem Lieferschein (Entwurf) einen Packzettel erstellen.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/stock/tools/quality-inspection.md b/foundation/www/docs/user/manual/de/stock/tools/quality-inspection.md
index f00fdfab..c0f00986 100644
--- a/foundation/www/docs/user/manual/de/stock/tools/quality-inspection.md
+++ b/foundation/www/docs/user/manual/de/stock/tools/quality-inspection.md
@@ -6,6 +6,6 @@ In ERPNext können Sie eingehende und ausgehende Produkte für eine Qualitätspr
> Lagerbestand > Werkzeuge > Qualitätsprüfung > Neu
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/stock/warehouse.md b/foundation/www/docs/user/manual/de/stock/warehouse.md
index 94429f22..b4067951 100644
--- a/foundation/www/docs/user/manual/de/stock/warehouse.md
+++ b/foundation/www/docs/user/manual/de/stock/warehouse.md
@@ -8,7 +8,7 @@ Um zum Bereich "Lager" zu gelangen, klicken Sie auf "Lagerbestand" und gehen Sie
> Lagerbestand > Einstellungen > Lager > Neu
-
+
In ERPNext muss jedes Lager einer festen Firma zugeordnet sein, um einen unternehmensbezogenen Lagerbestand zu erhalten. Die Lager werden mit den ihnen zugeordneten Firmenkürzeln abgespeichert. Dies erleichtert es auf einen Blick herauszufinden, welches Lager zu welcher Firma gehört.
diff --git a/foundation/www/docs/user/manual/de/support/issue.md b/foundation/www/docs/user/manual/de/support/issue.md
index 1d3b8faf..6fb212b9 100644
--- a/foundation/www/docs/user/manual/de/support/issue.md
+++ b/foundation/www/docs/user/manual/de/support/issue.md
@@ -8,7 +8,7 @@ Bei einem Fall handelt es ich um eine eingehende Nachricht vom Kunden, normalerw
> Support > Dokumente > Anfrage > Neu
-
+
### Gesprächsaufzeichnung
diff --git a/foundation/www/docs/user/manual/de/support/maintenance-schedule.md b/foundation/www/docs/user/manual/de/support/maintenance-schedule.md
index 48ffe93e..1ae71a03 100644
--- a/foundation/www/docs/user/manual/de/support/maintenance-schedule.md
+++ b/foundation/www/docs/user/manual/de/support/maintenance-schedule.md
@@ -10,7 +10,7 @@ Um einen neuen Wartungsplan zu erstellen, gehen Sie zu:
> Support > Dokumente > Wartungsplan > Neu
-
+
Im Wartungsplan gibt es zwei Abschnitte:
diff --git a/foundation/www/docs/user/manual/de/support/maintenance-visit.md b/foundation/www/docs/user/manual/de/support/maintenance-visit.md
index 68cccecc..52b9328f 100644
--- a/foundation/www/docs/user/manual/de/support/maintenance-visit.md
+++ b/foundation/www/docs/user/manual/de/support/maintenance-visit.md
@@ -6,7 +6,7 @@ Ein Wartungsbesuch ist ein Datensatz über einen Besuch eines Technikers bei ein
> Support > Dokumente > Wartungsbesuch > Neu
-
+
Der Wartungsbesuch inhält Informationen über:
diff --git a/foundation/www/docs/user/manual/de/support/warranty-claim.md b/foundation/www/docs/user/manual/de/support/warranty-claim.md
index bde40cdc..4dd64f48 100644
--- a/foundation/www/docs/user/manual/de/support/warranty-claim.md
+++ b/foundation/www/docs/user/manual/de/support/warranty-claim.md
@@ -12,7 +12,7 @@ Um einen neuen **Garantiefall** zu erstellen, gehen Sie zu:
> Support > Dokukumente > Garantieantrag > Neu
-
+
Wenn für die Lösung des Problems ein Besuch beim Kunden notwendig ist, können Sie einen neuen Wartungsbesuch erstellen.
diff --git a/foundation/www/docs/user/manual/de/using-erpnext/calendar.md b/foundation/www/docs/user/manual/de/using-erpnext/calendar.md
index cfc454f2..00c4541c 100644
--- a/foundation/www/docs/user/manual/de/using-erpnext/calendar.md
+++ b/foundation/www/docs/user/manual/de/using-erpnext/calendar.md
@@ -6,7 +6,7 @@ Der Kalender ist ein Werkzeug, mit dem Sie Ereignisse erstellen und teilen könn
Sie können die Kalenderansicht umschalten zwischen Monatsansicht, Wochenansicht und Tagesansicht.
-
+
### Ereignisse im Kalender erstellen
@@ -16,7 +16,7 @@ Um ein Ereignis manuell zu erstellen, sollten Sie zuerst die Kalenderansicht fes
Diese Ansicht zeigt die 24 Stunden des Tages aufgeteilt in verschiedene Zeitfenster an. Klicken Sie für den Startzeitpunkt auf ein Zeitfenster und ziehen Sie den Rahmen auf bis Sie den Endzeitpunkt erreichen.
-
+
Auf Grundlage der Auswahl des Zeitfensters werden Start- und Endzeitpunkt in die Ereignisvorlage übernommen. Sie können dann noch die Bezeichnung des Ereignisses angeben und speichern.
@@ -24,7 +24,7 @@ Auf Grundlage der Auswahl des Zeitfensters werden Start- und Endzeitpunkt in die
Im Leadformular finden Sie die Felder "Nächster Kontakt durch" und "Nächstes Kontaktdatum". Wenn Sie in diesen Feldern einen Termin und eine Kontaktperson eintragen, wird automatisch ein Ereignis erstellt.
-
+
#### Geburtstag
@@ -34,7 +34,7 @@ Auf Basis der in den Mitarbeiterstammdaten eingetragenen Geburtstage werden Gebu
Sie können Ereignisse als wiederkehrend in bestimmten Intervallen markieren, indem Sie "Dieses Ereignis wiederholen" aktivieren.
-
+
### Erinnerungen an Ereignisse
@@ -44,7 +44,7 @@ Es gibt zwei Arten, wie Sie eine Erinnerung zu einem Ereignis per E-Mail erhalte
Wenn Sie in der Ereignisvorlage den Punkt "E-Mail-Erinnerung am Morgen senden" anklicken, erhalten alle Teilnehmer an diesem Ereignis eine Benachrichtungs-E-Mail.
-
+
#### Einen täglichen E-Mail-Bericht erstellen
@@ -54,6 +54,6 @@ Der tägliche E-Mail-Bericht kann eingestellt werden über:
> Einstellungen > E-Mail > Täglicher E-Mail-Bericht
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/website/blog-post.md b/foundation/www/docs/user/manual/de/website/blog-post.md
index 27d073b2..46ae46d4 100644
--- a/foundation/www/docs/user/manual/de/website/blog-post.md
+++ b/foundation/www/docs/user/manual/de/website/blog-post.md
@@ -10,12 +10,12 @@ Um einen neuen Blog zu erstellen, gehen Sie zu:
> Webseite > Blog-Eintrag > Neu
-
+
Sie können einen Blog mit Hilfe des Markdown-Formats formatieren. Sie können auf Ihren Blog auch zugreifen, indem Sie zur Seite "blog.html" gehen.
#### Ein Beispiel für einen Blog.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/website/blogger.md b/foundation/www/docs/user/manual/de/website/blogger.md
index 61ac7a43..ec3476f2 100644
--- a/foundation/www/docs/user/manual/de/website/blogger.md
+++ b/foundation/www/docs/user/manual/de/website/blogger.md
@@ -4,6 +4,6 @@
Ein Blogger ist ein Benutzer, der Blog-Einträge erstellen kann. Sie können eine Kurzbiografie des Bloggers angeben und dazu einen Avatar.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/de/website/setup/website-settings.md b/foundation/www/docs/user/manual/de/website/setup/website-settings.md
index 16f48e94..c61f9de9 100644
--- a/foundation/www/docs/user/manual/de/website/setup/website-settings.md
+++ b/foundation/www/docs/user/manual/de/website/setup/website-settings.md
@@ -4,7 +4,7 @@
Die meisten der Einstellungen, die Ihre Webseite betreffen, können hier eingestellt werden.
-
+
### Zielseite
@@ -16,7 +16,7 @@ Die meisten der Einstellungen, die Ihre Webseite betreffen, können hier eingest
Wählen Sie das Thema für Ihre Webseite aus. Sie können auch neue Themen für Ihre Webseite erstellen.
-
+
* Wählen "Neues Webseiten-Thema erstellen" wenn Sie das Standars-Thema der Webseite anpassen wollen.
@@ -24,13 +24,13 @@ Wählen Sie das Thema für Ihre Webseite aus. Sie können auch neue Themen für
Hier können Sie ein Banner/Logo auf Ihrer Webseite hinzufügen. Hängen Sie das Bild an und klicken Sie auf "Banner aus Bild einrichten". Das System erstellt einen HTML-Kode unter Banner HTML.
-
+
### Kopfleiste
Hier können Sie die Menüeinträge in der Kopfleiste einstellen.
-
+
* In ähnlicher Art und Weise können Sie auch die Verknüpfungen auf der Seitenleiste und in der Fußzeile einstellen.
@@ -38,7 +38,7 @@ Hier können Sie die Menüeinträge in der Kopfleiste einstellen.
Sie können Google Analytics und soziale Netzwerke in Ihre Webseite mit einbinden und Einträge auf der Webseite teilen.
-
+
* Sie können ein öffentliches Anmelden auf Ihr ERPNext-Konto unterbinden indem Sie auf "Anmelden deaktivieren" klicken.
diff --git a/foundation/www/docs/user/manual/de/website/web-form.md b/foundation/www/docs/user/manual/de/website/web-form.md
index 0f9f7ee7..639ac48b 100644
--- a/foundation/www/docs/user/manual/de/website/web-form.md
+++ b/foundation/www/docs/user/manual/de/website/web-form.md
@@ -19,7 +19,7 @@ Um ein neues **Webformular** zu erstellen, gehen Sie zu:
3. Geben Sie an, ob sich der Benutzer einloggen muss, Daten ändern muss, mehrere verschiedene Datensätze verwalten soll, etc.
4. Fügen Sie die Felder, die Sie in den Datensätzen haben wollen, hinzu.
-
+
* * *
@@ -27,7 +27,7 @@ Um ein neues **Webformular** zu erstellen, gehen Sie zu:
Wenn Sie das Web-Formular erstellt haben, können Sie es unter der URL ansehen und ausprobieren!
-
+
* * *
diff --git a/foundation/www/docs/user/manual/de/website/web-page.md b/foundation/www/docs/user/manual/de/website/web-page.md
index b08b4363..786398ac 100644
--- a/foundation/www/docs/user/manual/de/website/web-page.md
+++ b/foundation/www/docs/user/manual/de/website/web-page.md
@@ -8,7 +8,7 @@ Um eine neue Webseite zu erstellen, gehen Sie zu:
> Webseite > Webseite > Neu
-
+
### Bezeichnung
diff --git a/foundation/www/docs/user/manual/en/CRM/contact.md b/foundation/www/docs/user/manual/en/CRM/contact.md
index aab2c1dd..ffd54682 100644
--- a/foundation/www/docs/user/manual/en/CRM/contact.md
+++ b/foundation/www/docs/user/manual/en/CRM/contact.md
@@ -19,12 +19,12 @@ To create a new Contact go to,
> CRM > Contact > New
-
+ src="{{docs_base_url}}/assets/img/crm/report/lead.png">
###Sales Funnel
By using the sales funnel report, and by quantifying the number of prospects at each stage of the process, you can get an idea of your potential customers.
@@ -16,28 +16,28 @@ More than this, by looking at the way these numbers change over time, you can id
For example, if you notice that very few communications with the prospects has taken place in a month which might indicate a decrease in the sales. From the next month, organization should make sure that more communications has to take place with the prospects.
+ src="{{docs_base_url}}/assets/img/crm/report/sales_funnel.png">
###Prospects Engaged But Not Converted
Using this report, user gets the information about the leads who has shown interest in the business with you but due to some reason they were not converted into the customers.
+ src="{{docs_base_url}}/assets/img/crm/report/prospects_engaged_but_not_converted.png">
###Minutes to First Response for Opportunity
Immediacy is so important – and so valued
In this internet area, we all expect a quicker response time to any of our query. This report gives you the information about the first response time given to an opportunities or issues. Using this report, the organization can improve their first response time to the prospects which can help to the better sales in the future.
+ src="{{docs_base_url}}/assets/img/crm/report/minutes_to_first_response.png">
###Customer Addresses And Contacts
It has data about the customers and their contact and address details.
+ src="{{docs_base_url}}/assets/img/crm/report/customer_address_and_contact.png">
###Inactive Customers
This report shows the list of customers who has not purchased since long time.
+ src="{{docs_base_url}}/assets/img/crm/report/inactive_customers.png">
diff --git a/foundation/www/docs/user/manual/en/CRM/customer.md b/foundation/www/docs/user/manual/en/CRM/customer.md
index 39effa70..30c81fff 100644
--- a/foundation/www/docs/user/manual/en/CRM/customer.md
+++ b/foundation/www/docs/user/manual/en/CRM/customer.md
@@ -12,13 +12,13 @@ You can either directly create your Customers via
> Selling > Customer
-
+
> Note: Customers are separate from Contacts and Addresses. A Customer can
have multiple Contacts and Addresses.
diff --git a/foundation/www/docs/user/manual/en/CRM/lead.md b/foundation/www/docs/user/manual/en/CRM/lead.md
index eb6965d7..5e27ff10 100644
--- a/foundation/www/docs/user/manual/en/CRM/lead.md
+++ b/foundation/www/docs/user/manual/en/CRM/lead.md
@@ -27,7 +27,7 @@ To create a Lead, go to:
> CRM > Lead > New Lead
-
+
---
diff --git a/foundation/www/docs/user/manual/en/CRM/newsletter.md b/foundation/www/docs/user/manual/en/CRM/newsletter.md
index f953a7da..be013086 100644
--- a/foundation/www/docs/user/manual/en/CRM/newsletter.md
+++ b/foundation/www/docs/user/manual/en/CRM/newsletter.md
@@ -15,8 +15,8 @@ see how it looks to the recepient, you can use the test function. Save the
document before testing. A test email will be sent to your Email Address. You can
send the email to all the intended receipients by clicking on the send button.
-
+
You can also go to an “Open” Lead and select “Opportunity” from the **Make** dropdown.
#### Figure 2: Create Opportunity from an open Lead
-
+
An Opportunity can also come from an existing Customer. You can create
multiple Opportunities against the same Lead. In Opportunity, apart from the
@@ -30,7 +30,7 @@ looking for.
#### Make Supplier Quotation
In some businesses, users collect the rates from their supplier against the customer requirement and based on the supplier rates they prepare the quotation for the customer. With ERPNext, you can make a supplier quotation from the opportunity itself.
-
+
> Best Practice: Leads and Opportunities are often referred as your “Sales
Pipeline” this is what you need to track if you want to be able to predict how
diff --git a/foundation/www/docs/user/manual/en/CRM/setup/campaign.md b/foundation/www/docs/user/manual/en/CRM/setup/campaign.md
index aec3b1a5..e3a1a2d0 100644
--- a/foundation/www/docs/user/manual/en/CRM/setup/campaign.md
+++ b/foundation/www/docs/user/manual/en/CRM/setup/campaign.md
@@ -5,7 +5,7 @@ A Campaign is a full-scale implementation of a sales strategy to promote a
product or a service. This is done in a market segment of a particular
geographical area, to achieve specified objectives.
-
+
#####Step 2.2: Allocate Against Sales Invoice
@@ -33,6 +33,6 @@ Against Sales Invoice, allocate 20,000 (explained in GIF below).
You can notice that there is a difference of 400 in the Payment Amount and the Amount Allocated against Sales Invoice. You can book this difference account under Withhold Account.
-
+
Following same steps, you can also manage difference availed due to Currency Exchange Gain/Loss.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md b/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md
index 82af8df9..0e58f309 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md
@@ -15,22 +15,22 @@ Click on Account for which Parent Account is to be changed.
####2. Edit Account
-
+
####3. Change Parent Account
Search and select preferred Parent Account and save.
-
+
Refresh system from Help menu to experience the change.
-
+
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/common-receivable-account.md b/foundation/www/docs/user/manual/en/accounts/articles/common-receivable-account.md
index 8b439ee9..97af52e6 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/common-receivable-account.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/common-receivable-account.md
@@ -3,7 +3,7 @@
As per the party model, a common receivable account called **Debtor** is auto-created. This is a default Receivable Account for all the Customers.
-
+
If needed, you can also create a new receivable account and update in the Customer master.
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md b/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md
index f290c8b2..1c89ab6f 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md
@@ -3,13 +3,13 @@
As per accounting standards, debit in a accounting entry must be equal to credit. If not, system does allow submission of accounting transaction, thereby stops ledger posting. In ERPNext, on saving accounting entry, system validates if debit and credit is tallying.
-
+
To have entry balanced, you should one more row, select another account, and update different amount in it. Or you can add difference amount in one of the Account's row itself.
On clicking 'Make Difference Entry' button, new Row will be added under Journal Entry Accounts table, with difference amount. You can edit that row to select appropriate Account.
-
+
On selecting account under new row, debit and credit an entry will be tallying, and you should be able to submit Journal Entri correctly.
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-error.md b/foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-error.md
index 60702d25..0280d6f0 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-error.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-error.md
@@ -19,13 +19,13 @@ Click [here](/docs/user/manual/en/accounts/setup/fiscal-year.html) to learn more
After Fiscal Year is saved, you will find option to set that Fiscal year as Default.
-
+
Default Fiscal Year will be updated in the Global Default setting as well. You can manually update Default Fiscal Year from:
`Setup > Settings > Global Default`
-
+
Save Global Default, and Reload your ERPNext account. Then, default Fiscal Year will be auto-updated in your transactions.
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/freeze-account.md b/foundation/www/docs/user/manual/en/accounts/articles/freeze-account.md
index 9d41e676..53307766 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/freeze-account.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/freeze-account.md
@@ -7,8 +7,8 @@ Once an Account is Frozen, you won't be able to use it any accounting transactio
To freeze an Account, go to Chart of Accounts, and edit an Account.
-
+
If User has Role define in the Account Setting assigned, then he/she will be able to set an Account as Frozen.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md b/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
index 405de6e5..36d70dd2 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
@@ -11,12 +11,12 @@ To freeze accounting entries upto a certain date, follow below given steps.
Set date in the **Accounts Frozen Upto** field.
-
+
Now, the system will not allow to make any accounting entries before set date. If at all someone tries creating entries, system will show error message as below.
-
+
You can still allow user with certain role to create/edit entries within accounts frozen date. You can set that Role in the Account Settings itself.
-
+
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/how-to-customise-cash-flow-report.md b/foundation/www/docs/user/manual/en/accounts/articles/how-to-customise-cash-flow-report.md
new file mode 100644
index 00000000..48a4ff86
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/accounts/articles/how-to-customise-cash-flow-report.md
@@ -0,0 +1,157 @@
+
+# How To Customise Cash Flow Report
+
+As your chart of accounts begins to get more complex and reporting standards change and evolve, the default cash flow
+report might no longer suffice. This is because ERPNext might not be able to accurately guess the classification and
+purpose of all accounts in the charts of accounts. Another gripe you might have is the inability to adjust the report
+format to fit your needs.
+
+This will no longer be a problem because ERPNext now allows users to customise the cash flow report.
+
+
+## Technical Overview
+Customisation is made possible by the introduction of two new doctypes - Cash Flow Mapper and Cash Flow Mapping. Both
+doctypes contain the information required to generate a cash flow report.
+
+Cash Flow Mapping shows how accounts in your charts of accounts map to a line item in your cash flow report while
+Cash Flow Mapper gets all the Cash Flow Mappings that relate to the three sections of a cash flow statement.
+
+With this, you generate detailed cash flow reports to your requirements. This might not make a lot of sense but it will
+after we go through an example.
+
+## Example
+### Background information
+Let's assume we have a fictitious company for which we want to generate a cash flow report.
+This is what the cash flow report looks like at the moment:
+
+
+We don't like the report for the following reasons:
+- The reporting format is too scant.
+- The 'Net Cash From Operations' figure is wrong
+
+### Customisation Process
+
+We wants the Cash Flow Report to look something similar to the format in the images below:
+
+
+
+#### Activate Customised Cash Flow Report
+Do this in Accounts Settings by checking the 'Use Custom Cash Flow Format' checkbox. This will cause ERPNext to only
+use your custom format for cash flow reports.
+
+After doing that, your cash flow report should look like this:
+
+
+Move to the next section to build the report.
+
+#### Create Cash Flow Mappings
+For each line, we need to create a Cash Flow Mapping document to represent it.
+
+
+
+You can think of the Cash Flow Mapping as a representation of each line in the cash flow report. A Cash Flow Mapping
+is a child of a Cash Flow Mapper which will be explained later.
+
+Let's start by creating Cash Flow Mappings that will represent the add back of non cash expenses already recodgnised in
+the Profit or Loss statement. We want them to appear on the cash statement as:
+- Income taxes recognised in profit or loss
+- Finance costs recognised in profit or loss
+- Depreciation of non-current assets
+
+Start by opening a new Cash Flow Mapping form.
+
+The fields in the Cash Flow Mapping doctype are:
+- **Name**: This something to identify this document. Name it something related to the label
+- **Label**: This is what will show in the cash flow statement
+- **Accounts**: This table contains all the accounts which this line relates to.
+
+With this information, let's go ahead and create the Cash Flow Mapping Document for the line 'Income taxes recognised in profit or loss'
+
+
+
+I have named it 'Income Tax Charge' and given it a label 'Income taxes recognised in profit or loss'. We want this
+line to reflect income tax charges from our profit or loss statement. The account where this happens in our chart
+of account is named 'Income Taxes' (an expense) so I have added 'Income Taxes' into the accounts table. If you have
+more accounts representing income tax expenses, you should add all of them here.
+
+Because Income Tax expense needs to be adjusted further in the cash flow statement, check the 'Is Income Tax Expense'
+checkbox. This is what will help ERPNext properly calculate the adjustments to be made.
+
+*For best results, let parent accounts have child accounts that have the same treatment for cash flow reporting
+purposes because ERPNext will calculate net change of all children accounts in a situation where the selected account
+is a parent account.*
+
+In the same way, I have created for the remaining two mappings.
+
+
+
+Finance costs also need to be adjusted so make sure to check the 'Is Finance Cost' checkbox.
+
+
+
+Next let's add Cash Flow Mapping for items that show changes in working capital:
+- Increase/(decrease) in other liabilities
+- (Increase)/decrease in trade and other receivables
+- Increase/(decrease) in trade and other payables
+- VAT payable
+- (Increase)/decrease in inventory
+
+
+
+
+
+
+
+
+
+
+
+Don't forget to tell ERPNext that these mappings represent changes in working capital by checking the 'Is Working
+Capital' checkbox.
+
+At this point we have created all the mappings necessary for the Operating Activities section of our cash flow
+statement. However, ERPNext doesn't know that yet until we create Cash Flow Mapper documents. We'll create Cash Flow
+Mapper documents next.
+
+
+#### Create Cash Flow Mappers
+Cash Flow Mappers represents the sections of the cash flow statement. A standard cash flow statement has only three
+sections so when you view the Cash Flow Mapper list, you will that three have been created for you named:
+- Operating Activities
+- Financing Activities
+- Investing Activities
+
+You will not be able to add or remove any of them but they are editable and can be renamed.
+
+
+
+Open the Operating Activities Cash Flow Mapper so we can add the Cash Flow Mappings we have created.
+
+
+- **Section Name**: This is the heading of the section.
+- **Section Leader**: This is the first sub-header immediately after the profit figure. Relates only to Operating
+Activities Cash Flow Mapper
+- **Section Subtotal**: This is the label for subtotal in the cash flow statement section. Relates only to Operating
+Activities Cash Flow Mapper
+- **Section Footer**: This is the label for the total in the cash flow statement section.
+- **Mapping**: This table contains all the Cash Flow Mappings related to the Cash Flow Mapper.
+
+Now add all the Cash Flow Mappings you have created and Save. You should have something like this:
+
+
+ Refresh the cash flow statement and view the changes.
+
+
+Looks close to our requirements but we are not done yet. Create new mappings for 'Investing Activities' and 'Financing
+Activities' sections of the cash flow statement.
+
+
+
+
+
+
+
+
+
+Here's what our cash flow statement now looks like:
+
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md b/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
index 075e969c..54bd29b9 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
@@ -13,7 +13,7 @@ To edit an Account, go to Chart of Accounts:
`Explore > Accounts > Chart of Accounts`
-
+
#### Book Payment Entry
@@ -17,7 +17,7 @@ In the below scenario, Sales Invoice was made EUR, at the exchange rate of 1.090
One receipt of payment, exchange rate changed. As per the new exchange rate, payment received in the base currency was $1080. This means gain of $80 due to change in exchange rate. Following is how Foreign Exchange Gain will be booked in this scenerio.
-
+
In case you incur loss due to change foriegn exchnage rate, then different amount about be updated in the debit of Foreign Exchange Gain/Loss account. Also you can add another row to update another expenses like bank charges, remittance charges etc.
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md b/foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
index d01da800..6c6c9443 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
@@ -17,7 +17,7 @@ Select Customer from the Customer master. If default Currency is updated in the
Currency Exchange between base currency and customer currency will auto-fetch.
-
+
#### Step 4: Update Details
@@ -27,7 +27,7 @@ Update other details like Item, Taxes, Terms. In the Taxes and other Charges tab
Save Sales Invoice and then check Print Format. For all the Currency field (rate, amount, totals) Customer's Currency symbol will be updated as well.
-
+
#### Currency Exchange Masters
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md b/foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
index bf08a4a3..63b1feea 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
@@ -15,7 +15,7 @@ To open new journal voucher go to
Assuming your Cheque Date is 31st December, 2016 (or any future date). As a result, this posting in your bank ledger will appear on Posting Date updated.
-
+
Note: Payment Entry Reference Date should equal to or less than Posting Date.
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md b/foundation/www/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md
index 1a64643b..d877f6f4 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md
@@ -3,7 +3,7 @@
**Question:** On saving the Purchase Invoice, I am getting a validation message that Credit To Account must be a Balance Sheet account.
-
+
**Answer: **On submission of a Purchase Invoice, payable is updated towards the Supplier. As per the accounting standards, Payable Account is aligned under Current Liability (credit side of Balance Sheet).
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md b/foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
index 23a0911d..eaf46712 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
@@ -16,7 +16,7 @@ To create new Project, go to:
`Projects > Project > New`
-
+
#### 1.2 Create Cost Center
@@ -32,7 +32,7 @@ To create new Cost Center, go to:
Update Cost Center in the Project master.
-
+
In the sales and purchase transactions, if Project is selected, then Cost Center will fetched from the Project master.
@@ -44,7 +44,7 @@ Let's check how this setting will affect your sales and purchase entries.
In the sales transactions (which are Sales Order, Delivery Note and Sales Invoice), Project will be selected in the More Info section. On selection of a Project, respective Cost Center will be updated for all the items in that transaction. Cost Center will be updated on in the transactions which has Cost Center field.
-
+
#### 2.2 Project in the Purchase Transactions
@@ -52,7 +52,7 @@ In the purchase transactions, Project is define for each line item. This is beca
As per perpetual inventory valuation system, expense for the purchased item will be booked when raw-materials are consumed. On consumption of goods, if you are creating Material Issue (stock) entry, then Expense Cost (says Cost of Goods Sold) and Project's Cost Center should be updated in that entry.
-
+
### 3. Accounting Report for a Project
@@ -62,11 +62,11 @@ Since Project's Cost Center is updated in both sales and purchase entries, you c
**Monthly Project Analysis**
-
+
**Overall Profitability**
-
+
#### 3.2 Projectwise Budgeting
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/types-in-tax-template.md b/foundation/www/docs/user/manual/en/accounts/articles/types-in-tax-template.md
index 3be3b1ca..be14ce4c 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/types-in-tax-template.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/types-in-tax-template.md
@@ -3,7 +3,7 @@
In the Sales Taxes and Purchase Taxes master, you will find a column called Type. Following a brief on a meaning of each Type and how you can use it.
-
+
**Actual:** This allows you to enter expense amount directly. For example, Rs. 500 incurred for Shipping.
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md b/foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
index e42eb1d7..9f7da0c3 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
@@ -3,7 +3,7 @@
If you have items delivery and invoicing happening at the same time, you can create delivery from with Sales Invoice itself. Sales Invoice has field called **Update Stock**, just before Item table. If this field is checked, on submission of Sales Invoice, stock of Item will be deducted from selected Warehouse.
-
+
On checking Update Stock, Sales Invoice Item will show relevant fields like Warehouse, Serial No., Batch No., Item valuation etc.
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md b/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md
index 79de7fb2..ceea4b66 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md
+++ b/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md
@@ -7,7 +7,7 @@ Consider Tax or Charge field in Purchase Taxes and Charges master has three valu
- Valuation
- Total and Valuation
-
+
Let's consider an example to understand an effect of each charge type. We purchase ten units of item, at the rate of 800. total purchase amount is 800. Purchased item has 4% VAT applied on it, and INR 100 was incurred in transportation.
diff --git a/foundation/www/docs/user/manual/en/accounts/bank-guarantee.md b/foundation/www/docs/user/manual/en/accounts/bank-guarantee.md
index 6f51fbf4..800bab4a 100644
--- a/foundation/www/docs/user/manual/en/accounts/bank-guarantee.md
+++ b/foundation/www/docs/user/manual/en/accounts/bank-guarantee.md
@@ -7,6 +7,6 @@ A client may ask you to provide a Bank Guarantee from a third party such as a ba
This document allows you to track Bank Guarantees given to clients. You can set Email Alerts as the Bank Guarantee expiry date approaches to remind yourself to get the Bank Guarantee back from your client.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/accounts/budgeting.md b/foundation/www/docs/user/manual/en/accounts/budgeting.md
index 31029602..7336e4a0 100644
--- a/foundation/www/docs/user/manual/en/accounts/budgeting.md
+++ b/foundation/www/docs/user/manual/en/accounts/budgeting.md
@@ -13,7 +13,7 @@ To create new Cost Center, go to:
> Accounts > Budget and Cost Center > Chart of Cost Center > Add New Cost Center
-
+
####Budget Variance Report
@@ -54,6 +54,6 @@ To check Budget Variance report, go to:
Accounts > Budget and Cost Center > Budget Variance Report
-
+
#### Profit and Loss Report
-
+
#### Balance Sheet Report
-
+
To edit your Chart of Accounts in ERPNext go to:
@@ -49,7 +49,7 @@ based on statutory (tax, compliance to government regulations) requirements.
Let us understand the main groups of the Chart of Accounts.
-
+
For the item which is exempted from GST totally, mention 0% as tax rate in the Item master.
-
+
####Step 2: Setup Taxes and Other Charges
In Sales Taxes and Other Charges master, select GST 16% account and mention Tax Rate as 16. This tax rate will be applied on all the Items selected in the Sales Order, unless specific Tax Rate is defined in the Item master.
-
+
+
Please note that item's tax rate will be pulled from the item master only if you have update same tax account (GST 16% in this case) in both Item master and tax master.
diff --git a/foundation/www/docs/user/manual/en/accounts/journal-entry.md b/foundation/www/docs/user/manual/en/accounts/journal-entry.md
index 19f588f6..350e3945 100644
--- a/foundation/www/docs/user/manual/en/accounts/journal-entry.md
+++ b/foundation/www/docs/user/manual/en/accounts/journal-entry.md
@@ -8,9 +8,9 @@ multiple Accounts and the sum of debits is equal to the sum of credits.
To create a Journal Entry go to:
-> Accounts > Documents > Journal Entry > New
+> Accounts > Company and Accounts > Journal Entry > New
-
+
In the Journal Entry, manually select an Account for which opening balance is to be updated. For each Account, enter opening balance value in the Debit or Credit column, based on it's Account Type (Asset or Liability).
For example, if you want to update balance in bank accounts, create Journal Entry as following.
-
+
Once all your invoices are entered, your **Temporary Opening** account will have a balance of zero!
@@ -71,7 +71,7 @@ Once all your invoices are entered, your **Temporary Opening** account will have
After completing the accounting entries, the trial balance report will look like the one given below:
-
+
To update stock opening balance, create [Stock Reconciliation entry](/docs/user/manual/en/stock/opening-stock.html). Based on the valuation of items's update in the Warehouse, balance will be updated in the Warehouse account.
@@ -87,9 +87,9 @@ To update stock opening balance, create [Stock Reconciliation entry](/docs/user/
Opening balance for the fixed asset account should be updated via Journal Entry. Assets which are not fully depreciated should be added in the [Asset master](/docs/user/manual/en/accounts/managing-fixed-assets.html). For adding Assets in your possession, ensure to check **Is Existing Asset** field.
-### Outstanding Invoices
+### Outstanding Payables and Receivables
-After opening Journal Entries are made, you will need to enter each Sales Invoice and Purchase Invoice that is yet to be paid.
+After opening Journal Entries are made, you will need to enter the Sales Invoice and Purchase Invoice that is yet to be paid.
Since you have already booked the income or expense on these invoices in the previous period, select **Temporary Opening** in the “Income” and “Expense” accounts.
@@ -97,4 +97,12 @@ Since you have already booked the income or expense on these invoices in the pre
If you don’t care what items are in that invoice, just make a dummy item entry in the Invoice. Item code in the Invoice is not necessary, so it should not be such a problem.
+You can also do this quickly using the **Opening Invoice Creation Tool**
+
+To use this tool, just type "Opening Invoice" in the search bar and select the **Opening Invoice Creation Tool**
+
+Here, select the company and type of invoice (sales or purchase) and add a line item for each invoice you want to create.
+
+
+
{next}
diff --git a/foundation/www/docs/user/manual/en/accounts/payment-entry.md b/foundation/www/docs/user/manual/en/accounts/payment-entry.md
index 498ec215..af655c0c 100644
--- a/foundation/www/docs/user/manual/en/accounts/payment-entry.md
+++ b/foundation/www/docs/user/manual/en/accounts/payment-entry.md
@@ -13,25 +13,25 @@ Payment Entry can be made against following transactions.
On submitting a document against which Payment Entry can be made, you will find Make Payment button.
-
+
####Step 2: Mode of Payment
In the Payment Entry, select Mode of Payment (eg: Bank, Cash, Wire Transfer). In the Mode of Payment master, default Account can be set. This default payment Account will fetch into Payment Entry.
-
+
####Step 3: Payment Amount
Enter actual payment amount received from the Customer or paid to the Supplier or Employee.
-
+
####Step 4: Allocate Amount
If creating Payment Entry for the Customer, Payment Amount will be allocated against Sales Invoice.
-
+
On the same lines, when creating Payment Entry for a Supplier, Payment Amount will be allocated against Purchase Invoice.
@@ -41,13 +41,13 @@ You Entry can be created directly from `Account > Payment Entry > New`. In the n
When making payment entry, there could be some difference in the actual payment amount and the invoice outstanding. This difference could be due to rounding error, or change in the currency exchange rate. You can set an Account here where this difference amount will be booked.
-
+
####Step 6: Submit
Save and Submit Payment Entry. On submission, outstanding will be updated in the Invoices.
-
+
If payment entry was created against Sales Order or Purchase Order, field Advance Paid will be updated in them. when creating Payment invoice against those transactions, Payment Entry will auto-update in that Invoice, so that you can allocate invoice amount against advance payment entry.
@@ -65,11 +65,11 @@ For outgoing payment:
ERPNext allows you maintain accounts and invoicing in the [multiple currency](/docs/user/manual/en/accounts/multi-currency-accounting.html). If invoice is made in the party currency, Currency Exchange Rate between companies base currency and party currency is also entered in the invoice. When creating Payment Entry against that invoice, you will again have to mention the Currency Exchange Rate at the time of payment.
-
+
Since Currency Exchange Rate is fluctuating all the time, it can lead to difference in the payment amount against invoice total. This difference amount can be booked in the Currency Exchange Gain/Loss Amount.
-
+
Payments can also be made independent of invoices by creating a new Payment Entry.
@@ -82,7 +82,7 @@ Following internal transfers can be managed from the Payment Entry.
3. Cash - Cash
4. Bank - Bank
-
+
###Difference between Payment Entry and Journal Entry?
diff --git a/foundation/www/docs/user/manual/en/accounts/payment-request.md b/foundation/www/docs/user/manual/en/accounts/payment-request.md
index b1b2931d..7869cb68 100644
--- a/foundation/www/docs/user/manual/en/accounts/payment-request.md
+++ b/foundation/www/docs/user/manual/en/accounts/payment-request.md
@@ -4,10 +4,10 @@
Payment Request is sent via Email and will contain a link to a Payment Gateway if setup. You can create payment request via Sales Order or Sales Invoice.
- Create Payment Request via Sales Order
-
+
- Create payment Request via Sales Invoice
-
+
---
@@ -16,16 +16,16 @@ considered to create journal entry.
Note: Invoice/Order currency and Payment Gateway Account currency should be same.
-
+
---
##### Notify Customer
You can notify customer from Payment Request with print format. If customer contact email is mentioned, it will automatically fetch email. If not so you can set Email Address on Payment Request.
-
+
##### Request Mail
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/accounts/payment-terms.md b/foundation/www/docs/user/manual/en/accounts/payment-terms.md
new file mode 100644
index 00000000..ccfa1738
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/accounts/payment-terms.md
@@ -0,0 +1,71 @@
+
+# Payment Terms
+You can save your business' payment terms on ERPNext and include it in all documents in the sales/purchase cycle and ERPNext will make all the proper general ledger entries accordingly.
+
+The documents you can attach Payment Terms to are:
+- Sales Invoice
+- Purchase Invoice
+- Sales Order
+- Purchase Order
+- Quotation
+
+Note that the introduction of Payment Terms removes "Credit Days" and "Credit Days Based On" fields in Customer/Supplier master. Payment Term contains the same information and makes it more flexible to use.
+
+## Payment Terms
+Navigate to the Payment Term list page and click "New".
+> Accounts > Payment Term > New Payment Term
+
+Payment Term has the following fields:
+**Payment Term Name:** (optional) The name for this Payment Term.
+
+**Due Date Based On:** The basis by which the due date for the Payment Term is to be calculated. There are three options:
+- Day(s) after invoice date: Due date should be calculated in days with reference to the posting date of the invoice
+- Day(s) after the end of the invoice month: Due date should be calculated in days with reference to the last day of the month in which the invoice was created
+- Month(s) after the end of the invoice month: Due date should be calculated in months with reference to the last day of the month in which the invoice was created
+
+**Invoice Portion:** (optional) The portion of the total invoice amount for which this Payment Term should be applied. Value given will be regarded as percentage i.e 100 = 100%
+
+**Credit Days:** (optional) The number of days or month credit is allowed depending on the option chosen in the `Due Date Based On` field. 0 means no credit allowed.
+
+**Description:** (optional) A brief description of the Payment Term.
+
+## Payment Terms In Converted Documents
+When converting or copying documents in the sales/purchase cycle, the attached Payment Term(s) will not be copied. The reason for this is because the copied information might no longer be true. For example, a Quotation is created for a service costing $1000 on January 1 with payment term of "N 30" (Net payable within 30 days) and then sent to a customer. On the quotation, the due date on the invoice will be January 30. Let's say the customer agrees to the quotation of January 20 and you decide to make an invoice from the Quotation. If the Payment Terms from the Quotation is copied, the due date on the invoice will still wrongly read January 30. This issue also applies for recurring documents.
+
+This does not mean you have manually set Payment Terms for every document. If you want the Payment Terms to be copyable, make use of Payment Terms Template.
+
+## Payment Terms Template
+Payment Terms Template tells ERPNext how to populate the table in the Payment Terms Schedule section of the sales/purchase document.
+
+You should use it if you have a set of standard Payment Terms or if you want the Payment Term(s) on a sales/purchase document to be copyable.
+
+To create a new Payment Terms Template, navigate to the Payment Term Template creation form:
+> Accounts > Payment Terms Template > New Payment Terms Template
+
+**Payment Term:** (optional) The name for this Payment Term.
+
+**Due Date Based On:** The basis by which the due date for the Payment Term is to be calculated. There are three options:
+- Day(s) after invoice date: Due date should be calculated in days with reference to the posting date of the invoice
+- Day(s) after the end of the invoice month: Due date should be calculated in days with reference to the last day of the month in which the invoice was created
+- Month(s) after the end of the invoice month: Due date should be calculated in months with reference to the last day of the month in which the invoice was created
+
+**Invoice Portion:** (optional) The portion of the total invoice amount for which this Payment Term should be applied. Value given will be regarded as percentage i.e 100 = 100%
+
+**Credit Days:** (optional) The number of days or month credit is allowed depending on the option chosen in the `Due Date Based On` field. 0 means no credit allowed.
+
+**Description:** (optional) A brief description of the Payment Term.
+
+Add as many rows as needed but make sure that the sum of the values in the `Invoice Portion` fields in all populated rows equals 100.
+
+## How to Add Payment Terms To Documents
+You can add Payments Terms in the "Payment Terms Schedule" section of the Document. Each row in the table represents a portion of the document's grand total. The table collects the following information:
+
+**Payment Term:** (optional) The name of the Payment Term document you require. If this is added, the data from the selected Payment Term will be used to populate the remaining columns in the row.
+
+**Description:** (optional) Description of the Payment Term.
+
+**Due Date:** (optional) The due date for the portion of the invoice. Set this value only if you did not specify anything in the `Payment Term` column.
+
+**Invoice Portion:** The percentage portion of the document represented in each row.
+
+**Payment Amount:** The amount due from the portion of the invoice represented by each row.
diff --git a/foundation/www/docs/user/manual/en/accounts/payments.md b/foundation/www/docs/user/manual/en/accounts/payments.md
index dc0b2df4..f36e5345 100644
--- a/foundation/www/docs/user/manual/en/accounts/payments.md
+++ b/foundation/www/docs/user/manual/en/accounts/payments.md
@@ -19,11 +19,11 @@ In ERPNext, there is two options through which user can capture the payment
On submitting a document against which Payment Entry can be made, you will find Make Payment button.
-
+
### Adding an Item
@@ -40,7 +40,7 @@ At the billing counter, the retailer needs to select Items which the consumer bu
**Barcode / Serial No** \- A Barcode / Serial No is an optical machine-readable representation of data relating to the object to which it is attached. Enter Barcode / Serial No in the box as shown in the image below and pause for a second, the item will be automatically added to the cart.
-
+
> Tip: To change the quantity of an Item, enter your desired quantity in the
quantity box. These are mostly used if the same Item is purchased in bulk.
@@ -52,7 +52,7 @@ in Search box.
1. Select row in the cart and clik on delete button in the numeric keypad
-
+
2. Set Qty as zero to remove Item from the POS invoice. There are two ways to remove an Item.
@@ -70,7 +70,7 @@ ready to make the Payment. Payment process is divided into 3 steps -
2. Select your “Mode of Payment”.
3. Click on “Pay” button to Save the document.
-
+
Submit the document to finalise the record. After the document is submitted,
you can either print or email it directly to the customer.
@@ -79,7 +79,7 @@ you can either print or email it directly to the customer.
Outstanding amount can be write off from the POS, user has to enter the amount under write off field on the payment screen.
-
+
System books the write off amount into the ledger which has selected on the POS Profile.
@@ -87,12 +87,12 @@ System books the write off amount into the ledger which has selected on the POS
POS calculate the extra amount paid by the customer, which user can return from the cash account. User has to set the account for the change amount on the POS profile.
-
+
### Offline Records
All the records from the POS stores into the browser's local storegae and sync submitted records after every minute of the interval if system is connected to internet. User can view the offline records by clicking on Menu > View Offline Records
-
+
#### Accounting entries (GL Entry) for a Point of Sale:
@@ -113,7 +113,7 @@ To see entries after “Submit”, click on “View Ledger”.
### Email
User can send email from the POS, after submission of an order, user has to click on menu > email
-
+
After sync of an order, email sent to the customer with the print of the bill in the attachment
{next}
diff --git a/foundation/www/docs/user/manual/en/accounts/pricing-rule.md b/foundation/www/docs/user/manual/en/accounts/pricing-rule.md
index 0aa5ec79..2e9251eb 100644
--- a/foundation/www/docs/user/manual/en/accounts/pricing-rule.md
+++ b/foundation/www/docs/user/manual/en/accounts/pricing-rule.md
@@ -22,11 +22,11 @@ Pricing Rule master has two sections:
### 1. Applicability Section:
-In this section, conditions are set for the application of Pricing Rule. When transaction meets condition as specified in this section, Price or Discount as specified in the Pricing Rule will be applied. You can set condition on following values.
+In this section, conditions are set for the application of Pricing Rule. When transaction meets condition as specified in this section, Rate or Discount as specified in the Pricing Rule will be applied. You can set condition on following values.
####1.1 Applicable On:
-
+
If you want Pricing Rule to be applied on all the items, select based on Item Group. For value, select **All Item Group** (parent Item Group).
@@ -34,31 +34,31 @@ If you want Pricing Rule to be applied on all the items, select based on Item Gr
Applicability option will updated based on our selection for Selling or Buying or both. You can set applicability on one of the following master.
-
+
####1.3 Quantity:
Specify minimum and maximum qty of an item when this Pricing Rule should be applicable.
-
+
###2. Application:
-Using Price List Rule, you can ultimately define price or %discount to be applied on an item.
+Using Price List Rule, you can ultimately define rate or %discount to be applied on an item.
-
+
-####2.1 Price
+####2.1 Rate
-Price or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Price mentioned in Pricing Rule will be given priority over item's Price List rate.
+Rate or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Rate mentioned in Pricing Rule will be given priority over item's Price List rate.
-
+
+
If %Discount is to be applied on all Price Lists, then leave Price List field blank.
@@ -66,19 +66,19 @@ If %Discount is to be applied on all Price Lists, then leave Price List field bl
Enter From and To date between which this Pricing Rule will be applicable. This will be useful if creating Pricing Rule for sales promotion exercise available for certain days.
-
+
#### Priority
If two or more Pricing Rules are found based on same conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.
-
+
#### Disable
Check to Disable Pricing Rule.
-
+
### Add Margin
@@ -90,20 +90,20 @@ For example : User want to add 10% margin on the supplier price list at the tim
Create price list for supllier and create item price against the price list.
-
+
####2. Make Pricing Rule
Create pricing rule for the item against which supplier rate has created
-
+
####2. Make Invoice
System apply the margin rate on the item price on selection of an item.
-
+
For more details about pricing rule [Click Here](/docs/user/manual/en/selling/articles/adding-margin.html)
diff --git a/foundation/www/docs/user/manual/en/accounts/purchase-invoice.md b/foundation/www/docs/user/manual/en/accounts/purchase-invoice.md
index 00198a5d..5d049e63 100644
--- a/foundation/www/docs/user/manual/en/accounts/purchase-invoice.md
+++ b/foundation/www/docs/user/manual/en/accounts/purchase-invoice.md
@@ -15,7 +15,7 @@ or click on “Make Purchase Invoice” in Purchase Order or Purchase Receipt.
You can also create a Purchase Invoice from:
> Accounts > Billing > Purchase Invoice > New Purchase Invoice
-
+
**From Date and To Date:** This defines contract period with the customer.
diff --git a/foundation/www/docs/user/manual/en/accounts/sales-invoice.md b/foundation/www/docs/user/manual/en/accounts/sales-invoice.md
index 08a3e310..323e7082 100644
--- a/foundation/www/docs/user/manual/en/accounts/sales-invoice.md
+++ b/foundation/www/docs/user/manual/en/accounts/sales-invoice.md
@@ -9,7 +9,7 @@ You can create a Sales Invoice directly from
or you can Make a new Sales Invoice after you submit the Delivery Note.
-
+
+Note that if the first batch in the queue cannot satisfy the order on the invoice,
+the next batch in the queue that can satisfy the order will be selected. If there is
+no batch that can satisfy the order, ERPNext will cancel its attempt to automatically
+fetch a suitable batch number.
+
#### POS Invoices
Consider a scenario where retail transaction is carried out. For e.g: A retail shop.
@@ -65,7 +80,7 @@ into the Sales Invoice and you can easily make payments.
Also, if you check the **Update Stock** the stock will also update automatically,
without the need of a Delivery Note.
-
+
#### Billing Timesheet with Project
@@ -74,7 +89,7 @@ they can fill out Timesheets which consists their billing rate. When you make a
Sales Invoice, select the Project for which the billing is to be made, and the
corresponding Timesheet entries for that Project will be fetched.
-
+
* * *
diff --git a/foundation/www/docs/user/manual/en/accounts/setup/accounts-settings.md b/foundation/www/docs/user/manual/en/accounts/setup/accounts-settings.md
index fcbfa9db..35368a41 100644
--- a/foundation/www/docs/user/manual/en/accounts/setup/accounts-settings.md
+++ b/foundation/www/docs/user/manual/en/accounts/setup/accounts-settings.md
@@ -2,7 +2,7 @@
# Accounts Settings
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/accounts/setup/fiscal-year.md b/foundation/www/docs/user/manual/en/accounts/setup/fiscal-year.md
index 548d90ac..15da8df2 100644
--- a/foundation/www/docs/user/manual/en/accounts/setup/fiscal-year.md
+++ b/foundation/www/docs/user/manual/en/accounts/setup/fiscal-year.md
@@ -26,6 +26,6 @@ To set the Fiscal Year as default, click on the 'Default' button.
In case you have multiple companies sharing the same Fiscal Year, you can add
it into the grid as shown below.
-
+
+
diff --git a/foundation/www/docs/user/manual/en/accounts/share/share_ledger.md b/foundation/www/docs/user/manual/en/accounts/share/share_ledger.md
new file mode 100644
index 00000000..b05a1b3a
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/accounts/share/share_ledger.md
@@ -0,0 +1,10 @@
+
+# Share Ledger
+
+This is a report view which gives the list of all the transactions made by a given Shareholder
+
+> Accounts > Share Ledger
+
+
+
+
diff --git a/foundation/www/docs/user/manual/en/accounts/share/share_transfer.md b/foundation/www/docs/user/manual/en/accounts/share/share_transfer.md
new file mode 100644
index 00000000..5d46cfd3
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/accounts/share/share_transfer.md
@@ -0,0 +1,10 @@
+
+# Shareholder Transfer
+
+There may be times when you want to change the share structure of your company; either by adding a new shareholder or by changing the existing proportion of shares between shareholders. A share transfer is the process of transferring existing shares from one person to another; either by sale or gift.
+
+You can directly create your Shareholders via
+
+> Accounts > Share Transfer
+
+
diff --git a/foundation/www/docs/user/manual/en/accounts/share/shareholder.md b/foundation/www/docs/user/manual/en/accounts/share/shareholder.md
new file mode 100644
index 00000000..eb5f08db
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/accounts/share/shareholder.md
@@ -0,0 +1,22 @@
+
+# Shareholder
+
+A shareholder is any person, company or other institution that owns at least one share of a company’s stock. Because shareholders are a company's owners, they reap the benefits of the company's successes in the form of increased stock valuation. If the company does poorly, however, shareholders can lose money if the price of its stock declines.
+
+A shareholder is uniquely identified by the Shareholder ID. Normally this ID is a naming series, starting with `SH-`. Also as soon as the Shareholder makes even a single transaction, a Folio number is allocated to him. This also is a unique to the Shareholder.
+
+You can directly create your Shareholders via
+
+> Accounts > Shareholder
+
+
+
+A Shareholder can avail the features (operations) in the [Share Transfer](/docs/user/manual/en/accounts/share/share_transfer.html) process.
+
+> Note: Shareholders are separate from Contacts and Addresses. A Shareholder can
+have multiple Contacts and Addresses.
+
+### Contacts and Addresses
+
+[Contacts and Addresses](/docs/user/manual/en/CRM/contact.html) in ERPNext are stored separately so that you can
+attach multiple Contacts or Addresses to Shareholders, Customers and Suppliers
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/accounts/subscription.md b/foundation/www/docs/user/manual/en/accounts/subscription.md
index a0ee889b..477989ad 100644
--- a/foundation/www/docs/user/manual/en/accounts/subscription.md
+++ b/foundation/www/docs/user/manual/en/accounts/subscription.md
@@ -3,7 +3,7 @@
If you have a contract with the Customer where your organization gives bill to the Customer on a monthly, quarterly, half-yearly or annual basis, you can use subscription feature to make auto invoicing.
-
+
#### Scenario
@@ -12,7 +12,7 @@ Subscription for your hosted ERPNext account requires yearly renewal. We use Sal
To set the subscription for the sales invoice
Goto Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save
-
+
**From Date and To Date**: This defines contract period with the customer.
diff --git a/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md b/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md
index 2215fade..a000f20c 100644
--- a/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md
+++ b/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md
@@ -9,7 +9,7 @@ The Bank Reconciliation Report provide the difference between the bank balance s
####Bank Reconciliation Statement
-
+
In the report, check whether the field 'Balance as per bank' matches the Bank Account Statement. If it is matching, it means that Clearance Date is correctly updated for all the bank entries. If there is a mismatch, Its because of bank entries for which Cleanrane Date is not yet updated.
@@ -37,7 +37,7 @@ All the entries in the specified date range will be shown in a table below.
__Step 4:__ Click on the JV from the table and update clearance date.
-
+
+Repeat step 2 for as many crops as you need. You can save some time by duplicating existing crops and modifying only the necessary items
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md
new file mode 100644
index 00000000..34ef5592
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md
@@ -0,0 +1,31 @@
+
+# Crop Cycle
+
+Once we have defined our crop, we can create as many crop cycles as we like, using the parameters outlined previously
+
+On the desk, clik on the Crop Cycle icon. A list will show any existing Crop Cycles.
+
+> Agriculture > Crop Cycle
+
+On the top right, click on New to create the first Crop Cycle. A new Crop Cycle document will open, and right away you see that two of the required items are a Land Unit and a Crop. We shall give it a descriptive name, to differentiate it from Crop Cycles we might create later.
+
+* Title: Carrot Planting 2017
+* Land Unit: Add a row, and select, Carrot Field 1
+* Crop: Carrot from carrot-top
+* Start Date: Today
+* Leave the ISO 8016 Standard (week count) box unchecked
+* Skip the next four fields for Crop Spacing
+
+Save the new Crop Cycle
+
+It should now look something like this
+
+
+
+Repeat these for every Crop Cycle you need
+
+As you can see a Project was created, with the same name as the Crop Cycle and linked to the Crop Cycle. If you click on the project, you'll see all the 'Sample Tasks' from the linked Crop, i.e. 'Carrot from carrot-top' in this case, were converted into actual 'Tasks' and linked to the Project, for easy management
+
+> Projects > Project
+
+
diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.md b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.md
new file mode 100644
index 00000000..f2dafe65
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.md
@@ -0,0 +1,16 @@
+
+# Crops and Land
+
+The core and most important elements of Agriculture module are:
+
+* Land Unit: Representing the physical space where the crops are planted.
+* Crop: Characteristics of the crop, inputs and expected outputs, expected calendar of activities and harvest, etc.
+* Crop Cycle: Individual representation of a single planting in a specific area. (Links a crop to a Land Unit for a specified period)
+
+Here we will learn to do a quick setup with the essential requirements to manage a simple example crop, Carrots.
+
+ These instructions assume you have already completed the basic ERPNext setup, and you have the ERPNext desk on your browser window.
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.txt b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.txt
new file mode 100644
index 00000000..1b24d5b4
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.txt
@@ -0,0 +1,3 @@
+land_unit
+crop
+crop_cycle
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/land_unit.md b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/land_unit.md
new file mode 100644
index 00000000..0a828603
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/land_unit.md
@@ -0,0 +1,32 @@
+
+# Land Unit
+
+Before we do anything, we need to define some details about where our crops will be planted. We will first create our farm as a parent land unit, and then we will add one or more fields as children or nodes, belonging to the parent.
+
+> Agriculture > Land Unit
+
+On the desk, click on the Land Unit icon. assets/img/new-land-unit-icon.png A list will show any existing Land Units.
+
+On the top right, click on New to create the first Land Unit.
+
+* Land Unit Name: Carrot Farm
+* Parent Land Unit: All Land Units
+* Check the box next to 'Is Group'
+* Location: plot the area as you please
+
+Click Save
+
+It should look something like this
+
+
+
+With the farm created, we can now create our first Carrot Field! Click on New
+
+* Land Unit Name: Carrot Field 1
+* Parent Land Unit:select the one we just created in step two, i.e. Carrot Farm
+* Leave the 'Is Group' box unchecked
+* Location: plot the area as you please
+
+Click Save
+
+Repeat step 3 for as many fields as you need
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/__init__.py b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/_sidebar.json b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md
new file mode 100644
index 00000000..3027caa5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md
@@ -0,0 +1,25 @@
+
+# Disease
+
+This part of Agriculture module deals with the management of Diseases, which may include various types of bacteria, funcgi, viruses, or pests which affect he Crop
+
+On the desk, click on the Disease icon. A list will show any existing Diseases.
+
+> Agriculture > Disease
+
+The basic information should be entered as such:
+
+* Disease Name: Aphids
+* Scientific name: Aphidoidea
+* Description: you could give a description of the disease here
+* Treatment Task: This may contain a list of all the Tasks which need to to be executed in orfer to get rid of the Disease
+
+Once you fill the form, click Save
+
+Click Save
+
+Now it should look something like this
+
+
+
+These Tasks will be imported into the Crop Cycle Project if you choose to add this Disease to the list of Detected Diesase in Crop Cycle
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md
new file mode 100644
index 00000000..c535ed84
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md
@@ -0,0 +1,6 @@
+
+# Fertilizer
+
+This is used to keep track of available fertilizers, and their chemical composition, which is linked to the Item master
+
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.md b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.md
new file mode 100644
index 00000000..d2b05815
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.md
@@ -0,0 +1,8 @@
+
+# Disease and Fertilizer
+
+This part of Agriculture module deals with the management of Diseases which affect the Crop and Fertilizers which may be used to promote the growth of the Crop
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.txt b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.txt
new file mode 100644
index 00000000..eb13febe
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.txt
@@ -0,0 +1,2 @@
+disease
+fertilizer
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/agriculture/index.md b/foundation/www/docs/user/manual/en/agriculture/index.md
new file mode 100644
index 00000000..5ed981c4
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/agriculture/index.md
@@ -0,0 +1,23 @@
+
+# Agriculture
+
+Farmers know that even a small operation requires intensive recordkeeping. A well-run farm requires proper management of accounting, payroll, suppliers, customers and logistics to name a few areas. ERPNext already helps organize these activities.
+
+A farm requires additional attention to manage its productive units (plots of land), time sensitive crop activities (such as planting, irrigating, fertilizing, etc.), recording environmental and crop data for analysis, and reports to help make effective decisions.
+
+
+
+The Agriculture module in ERPNext helps you keep track of your farming operations. It allows you keep records for each field where you farm, such as geospatial and soil texture characteristics. It allows you to:
+
+* Manage the physical spaces where you plant your crops
+* Manage your crops
+* Record analysis data
+* Plan activities related to your crops
+* Record sale of the harvest or transfer to warehouse for further processing
+* View reports
+
+
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/agriculture/index.txt b/foundation/www/docs/user/manual/en/agriculture/index.txt
new file mode 100644
index 00000000..a7f92f56
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/agriculture/index.txt
@@ -0,0 +1,3 @@
+crops_and_land
+diseases_and_fertlizers
+analytics
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/asset/__init__.py b/foundation/www/docs/user/manual/en/asset/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/asset/_sidebar.json b/foundation/www/docs/user/manual/en/asset/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/asset/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/asset/asset-maintenance.md b/foundation/www/docs/user/manual/en/asset/asset-maintenance.md
new file mode 100644
index 00000000..1552460a
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/asset/asset-maintenance.md
@@ -0,0 +1,32 @@
+
+# Asset Maintenance Management
+ERPNext provides features to track the details of individual maintenance/calibration tasks for an asset by date, the person responsible for the maintenance and future maintenance due date.
+
+To perform Asset Maintenance in ERPNext,
+
+ 1. Enable Asset Maintenance.
+ 2. Create Asset Maintenance Team.
+ 3. Create Asset Maintenance.
+ 4. Create Asset Maintenance Log.
+ 5. Create Asset Repair Log.
+
+### Enable Asset Maintenance
+Check Maintain Required in Asset to enable Asset Maintenance
+
+
+### Asset Maintenance Team
+Create Asset Maintenance Team, select team members and their role.
+
+
+
+### Asset Maintenance
+For each asset create a Asset Maintenance record listing all the associated maintenance tasks, maintenance type (Preventive Maintenance or Calibration), periodicity, assign to and start and end date of maintenance. Based on start date and periodicity the next due date is auto-calculated and a ToDo is created for the Assignee.
+
+
+### Asset Maintenance Log
+For each task in Asset Maintenance, Asset Maintenance Log is auto created to keep track of the upcoming Maintenances. It will have status, completion date and actions performed. Based on completion date here, next due date is calculated automatically and new Asset Maintenance Log is created.
+
+
+### Asset Repair
+You can also maintain the records of Repair/Failures of your asset which are not listed in Asset Maintenance.
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/accounts/managing-fixed-assets.md b/foundation/www/docs/user/manual/en/asset/assets.md
similarity index 78%
rename from foundation/www/docs/user/manual/en/accounts/managing-fixed-assets.md
rename to foundation/www/docs/user/manual/en/asset/assets.md
index 6951c451..3d8130fc 100644
--- a/foundation/www/docs/user/manual/en/accounts/managing-fixed-assets.md
+++ b/foundation/www/docs/user/manual/en/asset/assets.md
@@ -7,7 +7,7 @@ In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Car
Based on the type of assets, create Asset Category. For example, all your desktops and laptops can be part of an Asset Category named "Computers". Here you can set default depreciation method, periodicity and depreciation related accounts, which will be applicable to all the assets under the category.
-
+
> **Note:** You can also set default depreciation related Accounts and Cost Centers in Company master.
@@ -15,13 +15,13 @@ Based on the type of assets, create Asset Category. For example, all your deskto
Asset master is the heart of fixed asset management feature. All the transactions related to Asset like purchasing, sales, depreciation, scrapping will be managed from the Asset master.
-
+
Explanation of the fields:
1. Item Code: An Item for the Asset must be a non-stock item, with "Is Asset" field checked.
- 
+ 
2. Asset Category: The category of assets it belongs to.
3. Is Existing Asset: Check if the asset is being carried forward from the previous Fiscal Year. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference.
@@ -43,24 +43,31 @@ Explanation of the fields:
The system automatically creates a schedule for depreciation based on depreciation method and other related inputs in the Asset record.
-
+
On the scheduled date, system creates depreciation entry by creating a Journal Entry and the same Journal Entry is updated in the depreciation table for reference. Next Depreciation Date and Current Value are also updated on submission of depreciation entry.
-
+
In the depreciation entry, the "Accumulated Depreciation Account" is credited and "Depreciation Expense Account" is debited. The related accounts can be set in the Asset Category or Company.
+If you are required to calculate the depreciation based on your Fiscal Year and prorated by the number of days left, select the corresponding option in "Account Settings".
+
+The system will automatically set the fiscal year end date as the next depreciation date and calculate the depreciation amount prorata temporis based on the Available-for-use Date (IFRS16)
+
+
+
+
For better visibility, net value of the asset on different depreciation dates are shown in a line graph.
-
+
## Purchase an Asset
For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in the Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice.
-
+
On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no. in the Asset master.
@@ -74,23 +81,23 @@ To sell an asset, open the asset record and create a Sales Invoice by clicking o
- "Accumulated Depreciation Account" will be debited by the total depreciated amount till now.
- "Gain/Loss Account on Asset Disposal" will be credited/debited based on gain/loss amount. The Gain/Loss account can be set in Company record.
-
+
## Scrap an Asset
You can scrap an asset anytime using the "Scrap Asset" button in the Asset record. The "Gain/Loss Account on Asset Disposal" mentioned in the Company is debited by the Current Value (After Depreciation) of the asset. After scrapping, you can also restore the asset using "Restore Asset" button.
-
+
## Asset Movement
The movement of the assets (from one warehouse to another) is also tracked via Asset Movement form.
-
+
There is also a dedicated button "Transfer Asset" inside the Asset form to track the Asset Movement.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md b/foundation/www/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
index cad5e1c7..71aa7229 100644
--- a/foundation/www/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
+++ b/foundation/www/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
@@ -7,7 +7,7 @@ For each item, code assigned might differ from the code your supplier has given
In the Item master, under Supplier Details section, enter Item Code as given by the Supplier to this item.
-
+
#### 2. Supplier's Item Code in Transactions
@@ -15,7 +15,7 @@ Each purchase transaction has field in the Item table where Supplier's Item Code
Supplier Item Code will only be fetched in the purchase transaction, if both Supplier and Item Code selected in purchase transaction is mapped with value mentioned in the Item master.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md b/foundation/www/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md
index 851f94c3..84311897 100644
--- a/foundation/www/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md
+++ b/foundation/www/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md
@@ -13,7 +13,7 @@ To pull items from Material Request for specific Supplier only, follow below giv
Update Default Supplier in the Item master.
-
+
####Step 2: New Purchase Order
@@ -23,13 +23,13 @@ Update Default Supplier in the Item master.
From the options available to pull data in the Purchase Order, click on `For Supplier`.
-
+
####Step 4: Get Items
Select Supplier name and click on `Get`.
-
+
####Step 5: Edit Items
diff --git a/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md b/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md
index d5ea1162..94c0f0f1 100644
--- a/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md
+++ b/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md
@@ -16,28 +16,28 @@ In the Purchase Order, you will find two UoM fied.
In both the fields, default UoM of an item will be fetched by default. You should edit UoM field, and select Purchase UoM (Box in this case). Updating Purchase UoM is mainly for the reference of the supplier. In the print format, you will see item qty in the Purchase UoM.
-
+
#### Step 2: Update UoM Conversion Factors
In one Box, if you get 20 Nos. of Pen, UoM Conversion Factor would be 20.
-
+
Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you purchase just one Box, then Qty in the stock UoM will be set as 20.
-
+
### Stock Ledger Posting
Irrespective of the Purchase UoM selected, stock ledger posting will be done in the Default UoM of an item. Hence you should ensure that conversion factor is entered correctly while purchasing item in different UoM.
-
+
### Set Conversion Factor in Item
In the Item master, under Purchase section, you can list all the possible purchase UoM of an item, with its UoM Conversion Factor.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/buying/purchase-order.md b/foundation/www/docs/user/manual/en/buying/purchase-order.md
index 236987f8..58efe502 100644
--- a/foundation/www/docs/user/manual/en/buying/purchase-order.md
+++ b/foundation/www/docs/user/manual/en/buying/purchase-order.md
@@ -10,7 +10,7 @@ Supplier Quotation.
#### Purchase Order Flow Chart
-
+
In ERPNext, you can also make a Purchase Order directly by going to:
@@ -18,7 +18,7 @@ In ERPNext, you can also make a Purchase Order directly by going to:
#### Create Purchase Order
-
+
#### Show Tax break-up
-
+
For example you buy Items worth X and sell them for 1.3X. So your Customer
pays 1.3 times the tax you pay your Supplier. Since you have already paid tax
@@ -82,7 +82,7 @@ Nos (from the Item form)
#### Figure 3: Conversion of Purchase UOM to stock UOM
-
+
You can specify if the tax / charge is only for valuation (not a part of
diff --git a/foundation/www/docs/user/manual/en/buying/request-for-quotation.md b/foundation/www/docs/user/manual/en/buying/request-for-quotation.md
index 0c4bd087..1d412277 100644
--- a/foundation/www/docs/user/manual/en/buying/request-for-quotation.md
+++ b/foundation/www/docs/user/manual/en/buying/request-for-quotation.md
@@ -14,35 +14,35 @@ After creation of Request for Quotation, there are two ways to generate Supplier
__Step 1:__ Open Request for Quotation and click on make Supplier Quotation.
-
+
__Step 2:__ Select supplier and click on make Supplier Quotation.
-
+
__Step 3:__ System will open the Supplier Quotation, user has to enter the rate and submit it.
-
+
#### For Supplier
__Step 1:__ User has to create contact or enter Email Address against the supplier on Request for Quotation.
-
+
__Step 2:__ User has to click on send supplier emails button.
* If supplier's user not available: system will create supplier's user and send details to the supplier, supplier will need to click on the link(Password Update) present in the email. After password update supplier can access his portal with the Request for Quotation form.
-
+
* If supplier's user available: system will send Request for Quotation link to supplier, supplier has to login using his credentials to view Request for Quotation form on portal.
-
+
__Step 3:__ Supplier has to enter amount and notes(payment terms) on the form and click on submit
-
+
__Step 4:__ On submission, system will create Supplier Quotation (draft mode) against the supplier. The user has to review the Supplier Quotation
and submit it. When all items from the Request for Quotation have been quoted by a supplier, the status is updated in the Supplier
@@ -52,4 +52,4 @@ __Step 4:__ On submission, system will create Supplier Quotation (draft mode) ag
If a supplier indicates that they will not provide a quotation for the item, this can be indicated in the RFQ document by checking the 'No Quote' box after the Request for Quotation has been submitted.
-
+
diff --git a/foundation/www/docs/user/manual/en/buying/setup/buying-settings.md b/foundation/www/docs/user/manual/en/buying/setup/buying-settings.md
index 968fb28c..d85955e0 100644
--- a/foundation/www/docs/user/manual/en/buying/setup/buying-settings.md
+++ b/foundation/www/docs/user/manual/en/buying/setup/buying-settings.md
@@ -3,7 +3,7 @@
Buying Settings is where you can define properties which will be applied in the Buying module's transactions.
-
+
Let us look at the various options that can be configured:
diff --git a/foundation/www/docs/user/manual/en/buying/setup/supplier-type.md b/foundation/www/docs/user/manual/en/buying/setup/supplier-type.md
index 01fb913b..ebd5fc74 100644
--- a/foundation/www/docs/user/manual/en/buying/setup/supplier-type.md
+++ b/foundation/www/docs/user/manual/en/buying/setup/supplier-type.md
@@ -17,7 +17,7 @@ You can create your own category of Supplier Type.
> Buying > Setup > Supplier Type > New Supplier Type
-
+
#### Final Score and Standings
The supplier scorecard consists of a set evaluation periods, during which the performance of a supplier is
evaluated. This period can be daily, monthly or yearly. The current score is calculated from the score of each evaluation
period based on the weighting function. The default formula is linearly weight over the previous 12 scoring periods.
-
+
This formula is customizable.
The supplier standing is used to quickly sort suppliers based on their performance. These are customizable for each supplier.
The scorecard standing of a supplier can also be used to restrict suppliers from being included in Request for Quotations or
being issued Purchase Orders.
-
+
#### Evaluation Criteria and Variables
A supplier can be evaluated on several individual evaluation criteria, including (but not limited to) quotation response time,
delivered item quality, and delivery timeliness. These criteria are weighed to determine the final period score.
-
+
The method for calculating each criteria is determined through the criteria formula field, which can use a number of pre-established variables.
The value of each of these variables is calculated over the scoring period for each supplier. Examples of such variables include:
- The total number of items received from the supplier
diff --git a/foundation/www/docs/user/manual/en/buying/supplier.md b/foundation/www/docs/user/manual/en/buying/supplier.md
index e9226c8f..85d81171 100644
--- a/foundation/www/docs/user/manual/en/buying/supplier.md
+++ b/foundation/www/docs/user/manual/en/buying/supplier.md
@@ -7,13 +7,13 @@ You can create a new Supplier from:
`Explore > Supplier > New Supplier`
-
+
> Tip: When you select a Supplier in any transaction, Contact for which "Is Primary" field id checked, it will auto-fetch with the Supplier details.
@@ -23,7 +23,7 @@ For all the Supplier, "Creditor" account is set as default payable Account. When
If you want to customize payable account for the Supplier, you should first add a payable Account in the Chart of Account, and then select that Payable Account in the Supplier master.
-
+
If you don't want to customize payable account, and proceed with default payable account "Creditor", then do not update any value in the Default Supplier Account's table.
diff --git a/foundation/www/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/foundation/www/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
index 3475a4d8..09aacccc 100644
--- a/foundation/www/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
+++ b/foundation/www/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
@@ -3,18 +3,18 @@
ERPNext Web Portal gives your customers quick access to their Orders, Invoices and Shipments Customers can check the status of their orders, invoices, and shipping status by logging on to the web.
-
+
#### Step 3: Edit Field Property
In the fields section, click on the Custom field and check the **Allow On Submit**.
-
+
#### Step 3: Update Customize Form
-
+
After updating Customize Form, you should reload your ERPNext account. Then check form, and field to confirm its editable in submitted form as well.
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/child-table-.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/child-table-.md
index ee28f288..b34812cb 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/child-table-.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/child-table-.md
@@ -7,28 +7,28 @@
This is how Quotation Item table renders value when Editable Grid is enabled. It will maximum list four columns in the table.
-
+
As per the default setting, only four columns are listed in the child table. Following is how you can add more columns in the editable itself.
For the field to be added as a column in the table, enter a value in the Column field. Also, ensure that "Is List View" property is checked for that field.
-
+
Based on the value in the Column field, columns will be added in the child table. Ensure that sum total of value added in the Column field doesn't exceed 10. Based on the Column value, width for that column will be set.
-
+
**Switch to Un-editable Grid**
To have more values shown in the preview of Quotation Item table, you can disable Editable Grid for the Quotation Item Doctype. Steps below.
-
+
Once Editable Grid is disabled for the Quotation Item, the following is how values will be rendered in a preview of the Quotation Item table.
-
+
To have specific field's value shown in the preview, ensure that for that field, in the Customize Form tool, "In List View" property is checked.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
index 5338e675..48518d58 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
@@ -14,7 +14,7 @@ You can insert Custom Link Field by following steps below.
In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.). Once fields are updated in the accompanying table below, open a field above the one you wish to insert your Custom Field. Then click on "Insert Above" to insert the new Custom Field.
-
+
####Step 4: Custom Field Values
@@ -25,6 +25,6 @@ To set field as Link, enter values as below.
1. Name: Desired name for the field
1. Options: Enter the name of the Doctype to which the field is linked
-
+
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
index 718228ca..ecd1b775 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
@@ -13,13 +13,13 @@
Select document type for which Sort Order is to be customized.
-
+
####Step 3: Update Sort Details
In the Customize Form, you will find these fields.
-
+
1. Sort Field: Select field based on which sorting will be done. It will be "Item_Code" field in scenario.
2. Sort Order: Sort Order will be two possible options, **Asc** for ascending, and **Desc** for descending.
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
index a20d6bcc..a72744e3 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
@@ -9,16 +9,16 @@ If there is a report custom report which needs to be deleted, it can be achieved
In the Awesome Bar, type and select "Report List" for an option.
-
+
####Selecting and Deleting Report
The Report List will have all the standard and custom reports of your account. You can select Custom Report to be deleted from the list itself, and click on Delete icon.
-
+
Or you can open that report, and delete it from File menu option.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
index 71dbf353..3a31a8c4 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
@@ -3,7 +3,7 @@
All the sales transactions like Sales Order, Sales Invoice has Rounded Total in it. It calculated based on the value of Grand Total. Also Rounded Total is also visible in the Standard Print Formats.
-
+
Follow steps given below to hide rounded total from Standard Print Formats, for all the sales transactions.
@@ -15,7 +15,7 @@ Follow steps given below to hide rounded total from Standard Print Formats, for
Check Disable Rounded Total, and Save Global Defaults.
-
+
For system to take effect of this setting, you should clear cache and refresh your ERPNext account. Then your print formats shall not render value for the Rounded Total in the print formats.
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md
index 85409f44..d66c2fc0 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md
@@ -9,12 +9,12 @@ For example, if you want Customer's PO No. and PO Date to be fetched from Sales
Sales Order (standard fields)
-
+
Sales Invoice (custom fields)
-
+
Since names for the Customer's PO related fields are same in the Sales Order and Sales Invoice, when creating Sales Invoice from the Sales Order, values in these fields are auto-fetched.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md
index 4c44cec0..1517fd72 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md
@@ -57,6 +57,17 @@ Integer field holds numeric value, without decimal place.
Link field is connected to another master from where it fetches data. For example, in the Quotation master, Customer is a Link field.
+- Geolocation
+
+Use Geolocation field to store GeoJSON 
+
#### Step 3: Set Limit
Set Maximum Attachments as five.
-
+
After update Max Attachments, Update Customization Form. Reload your ERPNext account and then check specific Quotation to confirm if Max Attachment limit is applied.
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
index dfe6cbcc..ed6ebf9d 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
@@ -15,13 +15,13 @@ Go to:
As per our scenario, Sales Order will be selected as Document Type.
field-visible-2.gif
-
+
#### Step 3: Uncheck Print Hide
click to open field to be made visible in the Standard Print Format. Uncheck **Print Hide** field.
-
+
#### Step 4: Update
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
index e309341c..e278b5c2 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
@@ -7,7 +7,7 @@ There are three kind of reports in ERPNext.
Report Builder is an in-built report customization tool in ERPNext. This allows you to define specific fields of the form which shall be added in the report. Also you can set required filters, sorting and give preferred name to report.
-
+
### 2. Query Report
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
index 89a5c407..e9e2a8c6 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
@@ -13,7 +13,7 @@ Below are the steps to insert Custom Dynamic Field. For an instance, we will ins
Firstly we will create a link field which will be linked to the Doctype.
-
+
By **Doctype** mentioned in the Option field, we mean parent Doctype. So, just like Quotation is one Doctype, which has multiple Quotation under it. Same way, Doctype is also a Doctype which has Sales Order, Purchase Order and other doctypes created as Doctype records.
@@ -28,17 +28,17 @@ By **Doctype** mentioned in the Option field, we mean parent Doctype. So, just l
So linking this field with parent Doctype will list all the Doctype records.
-
+
#### Step 2: Insert Dynamic Link Field
This custom field's type will be "Dynamic Link". In the Option field, name of Doctype link field will be mentioned.
-
+
This field will allow selecting document id, based on value selected in the Doctype link field. For example, if we select Sales Order in the prior field, Dynamic Link field will list all the Sales Orders ids.
-
+
+
If Website is checked in All Application, but still not visible for the User, check if is hidden by System Manager. In the Setup module, feature called Show/Hide Modules allows System Manager to hide specific module from all the Users.
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
index 8cb9e68a..db442b5d 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
@@ -17,12 +17,12 @@ Let's assume that while creating Sales Invoice, you wish to see Serial No result
Update Warehouse field name in the Search By field.
-
+
#### Searching in Another Record.
While creating transaction, to get filtered result for Customer, you should firstly click on search magnifier.
-
+
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md
index 638959f3..44eceb0b 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md
@@ -9,13 +9,13 @@ Following are the steps to set language in your ERPNext account.
#### 1.1 Go to My Setting
-
+
#### 1.2 Select Language
-
+
-
+
#### 1.3 Save User
@@ -31,13 +31,13 @@ Being a System Manager, you can set language in other user's master as well.
#### Set Language
-
+
#### Save
Save System Settings, and refresh your EPRNext account. On refreshing, you should language in your ERPNext account changed as per your preference.
-
+
Note: For now, we have translation available only for few languages. You can contribute to make translation better, and add new languages from [here](https://translate.erpnext.com).
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-precision.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-precision.md
index deba31b9..69279a92 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-precision.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-precision.md
@@ -9,11 +9,11 @@ To change the precision globally, go to:
`Setup > Settings > System Settings`.
-
+
You can also set field specific precision. To do that go to `Setup > Customize > Customize Form` and select the DocType there. Then go to the specific field row and change precision. Precision field is only visible if field-type is one of the Float, Currency and Percent.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/user-restriction.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/user-restriction.md
index 41cd92df..f9018853 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/user-restriction.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/user-restriction.md
@@ -11,10 +11,10 @@ Following are the steps to restrict User to a document based on Owner/creator.
Select Document Type for which you want to set user permission. After permissions are loaded for selected document, scroll to role for which you want to set restriction.
-
+
#### Step 3: Apply User Permission
For Role to be restricted (Sales User in this case), check "If Owner".
-
+
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-doctype.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-doctype.md
index 47e17b3d..ed442865 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-doctype.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-doctype.md
@@ -22,7 +22,7 @@ in the Sales Order Doctype, then you should check Is Child Table. Else no.
not be able to re-produce.
1. Custom?: This field will be checked by default when adding Custom Doctype.
-
+
#### Fields
@@ -37,7 +37,7 @@ Fields are much more than database columns, they can be:
1. Actions (button)
1. Attachments or Images
-
+
When you add fields, you need to enter the **Type**. **Label** is optional for Section Break and Column Break. **Name** (`fieldname`) is the name of the database table column.
@@ -47,19 +47,19 @@ You can also set other properties of the field like whether it is mandatory, rea
In this section, you can define criteria based on which document for this doctype will be named. There are multiple criterion based on which document can be named, like naming based on the value in the specific field, or based on Naming Series, or based on value provided by the user in the prompt, which will be shown when saving document. In the following example, we are doing naming based on the value in the field **book_name**.
-
+
#### Permission
In this table, you should select roles and define permission roles for them for this Doctype.
-
+
#### Save DocType
On saving doctype, you will get pop-up to provide name for this Doctype.
-
+
#### DocType in System
@@ -68,12 +68,12 @@ Human Resource module, to access this doctype, go to:
`Human Resource > Document > Book`
-
+
#### Book master
Using the fields entered, following is the master one book.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-field.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-field.md
index 1c14abdf..6a3ed040 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-field.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-field.md
@@ -15,25 +15,25 @@ To add a Custom Field, go to:
In the Customize Form, select Document Type in which you want to insert Custom Field. Let's assume we are inserting Custom Field in the Employee master.
-
+
####Step 2: Select Document Type
@@ -22,7 +22,7 @@ If navigate from the list view, Document Type will be automatically set in the C
If you reach customize form from the Setup module, or from awesome bar, then you will have to manually select Document Type in which customization needs to be made.
-
+
####Step 3: Edit Property
@@ -30,7 +30,7 @@ On selecting Document Type, all the fields of the Document Type will updated as
To customized Project field, click on the respective row, and check "Mandatory". With this, Project field will become mandatory in the Sales Order.
-
+
Like setting setting field Mandatory, following are the other customization options in the Customize Form tool.
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/document-title.md b/foundation/www/docs/user/manual/en/customize-erpnext/document-title.md
index bdc366c3..f3bf9d7f 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/document-title.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/document-title.md
@@ -24,14 +24,14 @@ You can define the title by setting document properties in braces `{}`. For exam
{customer_name} for {project}
+
Click [here](/docs/user/manual/en/customize-erpnext/articles/module-visibility.html) to learn about other features from where icons from the desktop can be hidden.
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md b/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md
index 32fa5e68..3554a2b5 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md
@@ -9,35 +9,35 @@ In ERPNext Kanban board can be an alternative for the list views. It helps you i
To create a Kanban board in ERPNext click the Kanban dropdown on the sidebar, and select New Kanban Board.
-
+
###Add new Card/Document
To add Cards on Kanban Board click Add Tasks. You can Edit a card details by click on the card and it will take you to the Task Doctype where you can further add and edit card details.
-
+
###Update Cards/Document Status
Based on the Task status you can drag and drop the Cards in the respective column. For example if the task is work in progress you can move the card for the task from the status Open to Working.
-
+
###Manage Columns
To add more columns in the Kanban board click Add columns.
-
+
To move columns based on the priority drag and drop the columns as per requirement.
-
+
To set Colors to a Card click drop down menu on the card and assign color to it.
-
+
You can also Archive and Restore the columns added in a Kanban board. To do so click Archive in drop down menu on the card. Once archived you can restore the column from the list of the archived columns in the Kanban board.
-
+
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/print-format.md b/foundation/www/docs/user/manual/en/customize-erpnext/print-format.md
index 849287a7..2a300a24 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/print-format.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/print-format.md
@@ -19,7 +19,7 @@ To create your own versions, open an existing template from:
`Setup > Printing > Print Formats`
-
+
Select the type of Print Format you want to edit and click on the “Copy”
button on the right column. A new Print Format will open up with “Is Standard”
@@ -46,7 +46,7 @@ To edit / update your print and PDF settings, go to:
`Setup > Printing and Branding > Print Settings`
-
+
#### Example
diff --git a/foundation/www/docs/user/manual/en/education/Assessment/__init__.py b/foundation/www/docs/user/manual/en/education/Assessment/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/education/Assessment/_sidebar.json b/foundation/www/docs/user/manual/en/education/Assessment/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/Assessment/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md
new file mode 100644
index 00000000..aa232e2f
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md
@@ -0,0 +1,27 @@
+
+#Assessment Criteria
+
+Assessment Criteria is the parameter based on which you assess the Student.
+
+
+
+After assessment is conducted for a Course, marks earned are entered based on the Assessment Criteria. For example, if assessment was conducted for science subject, then you can evaluate Student in Science on various criteria like Writing, Practicals, Presentation etc.
+
+Assessment Criteria is be used when scheduling Assessment Plan for Student Group and Course.
+
+
+
+#### Video Tutorial on Assessment Criteria
+
+
+
+
+
+On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute.
+
+
+
+#### Video Tutorial on Assessment Group
+
+
+
+
+
+5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned.
+
+
+
+#### Video Tutorial on Assessment Result
+
+
+
+
+As you go on entering marks for a Student, and switch to next student, in the backend, Student Result record will be auto-created for that Student.
+
+#### Video Tutorial on Assessment Result Tool
+
+
+
+
+
+#### Video Tutorial on Grading Scale
+
+
+
+
+
+#### Tutorial Video for Student Attendance Tool
+
+
+
+
+
**Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**.
+#### Tutorial Video on Student Attendance
+
+
+
+
+
+Incase the student is not attending the institute in order to participate or represent institute in any event, he/she can be mark as present from the Leave Application itself.
+
+Once a Leave Application is recorded for a student it will not be recorded in the absent student report as he has applied for a leave.
+
+#### Tutorial Video for Student Leave Application
+
+
+
+
+
+2. **Program Enrollment**: List of students already enrolled in selected **Program** for the given **Academic Year**, **Academic Term** (if provided) and **Student Batch** will be fetched and can be used to enroll students from one academic year/term to another in the same **Program** or a new **Program**.
+
+
+
+**New Student Batch**: This can be selected for the entire students fetched in the table. Priority will be given to the Batch selected in the table (for individual students).
+
+For promoting the students, the new academic year, academic term and program can also be selected for the enrollment of the fetched students list.
+
+#### Video Tutorial for Program Enrollment Tool
+
+
+
+
+If any institution has skipped the online admission process then Program Enrollment can also be considered as the confirmation of the admission in a particular Program.
+
+> TIP: Academic Term is optional in the Program Enrollment. If your institution has only annual curriculum, you can skip the Academic Term
+
+Student Batch: To categorize student into different sections/batches, you can assign the batch to the student. On the basis of this field, later student groups can be created.
+
+Student Category: For the Institutions having multiple Fees Structure, this field can be used to differentiate the student enrollment in a given fee category.
+
+#### Video Tutorial For Program Enrollment
+
+
+
+
### Application Status
@@ -21,11 +21,23 @@ You can Approve or Reject a student applicant. By accepting a student applicant
### Student Enrollment
Once the form is submitted you can either approve or reject the application form.
-
+
Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom,
-the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/schools/student/program-enrollment.html).
+the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/education/student/program-enrollment.html).
-
+
+
+#### Video Tutorial for Student Application
+
+
+
+
+
+Once an admission record is created, the age eligibility criteria can be determined for the every program. Similarly, you can also determine the application fee and naming series for every student applicant. If you keep the naming series blank then the default naming series will be applied for every student applicant.
+
+The information provided in the Student Admission records will be used for the validation and creation of the Student Admission records (only if student admission link is filled there)
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/fees/__init__.py b/foundation/www/docs/user/manual/en/education/fees/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/education/fees/_sidebar.json b/foundation/www/docs/user/manual/en/education/fees/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/fees/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/fees/fee-category.md b/foundation/www/docs/user/manual/en/education/fees/fee-category.md
new file mode 100644
index 00000000..a3c2c473
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/fees/fee-category.md
@@ -0,0 +1,8 @@
+
+# Fee Category
+
+List of all different type of fees collected.
+
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/fees/fee-structure.md b/foundation/www/docs/user/manual/en/education/fees/fee-structure.md
new file mode 100644
index 00000000..738f9e6b
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/fees/fee-structure.md
@@ -0,0 +1,36 @@
+
+# Fee Structure
+
+A Fee Structure is a template that can be used while making Fees records or generating them via the Fee Schedule. In the Accounts section, you can set also the different accounts as for the Fees is an accounting transaction.
+
+You can create the Fee Structure directly from
+
+> Education > Fees > Fee Structure > New Fee Structure
+
+or you can create the Fee Structure from Program also.
+
+
+
+#### Academic Year Impact
+
+If the Fee amount doesn't change every academic year then Fee Structure can be created without the Acadamic year. In doing so, the same Fee Structure can be used every academic year until the Fees for that particular program doesn't change. Still you can set the academic year and term while creating the Fees or Fee Schedule records.
+
+#### Accounting Impact
+
+You can set the "Income Account" and "Receivable Account" in the Accounts section which refers to an Account of you [Chart of Accounts](/docs/user/manual/en/accounts/chart-of-accounts.md). You must also mention the Cost Center in which your income will be booked.
+
+If you are going to use this in the Fee Schedule, you must select the Accounts carefully as Fee Schedule updates the respected Accounts in bulk.
+
+#### Video Tutorial for Fee Structure
+
+
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/fees/index.md b/foundation/www/docs/user/manual/en/education/fees/index.md
new file mode 100644
index 00000000..770b1764
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/fees/index.md
@@ -0,0 +1,10 @@
+
+# Fees
+
+This section contains 'Fee' related documents.
+
+
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/fees/index.txt b/foundation/www/docs/user/manual/en/education/fees/index.txt
similarity index 100%
rename from foundation/www/docs/user/manual/en/schools/fees/index.txt
rename to foundation/www/docs/user/manual/en/education/fees/index.txt
diff --git a/foundation/www/docs/user/manual/en/education/index.md b/foundation/www/docs/user/manual/en/education/index.md
new file mode 100644
index 00000000..e22eaf6d
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/index.md
@@ -0,0 +1,9 @@
+
+# Education
+
+
+The Education Domain in ERPNext is designed to meet requirements of any educational Institute whether that is a school, college or any other private firm. ERPNext provides a centralized system, which can be used to maintain and update all the activities related to an Institution. It will provide a complete package for every funcationality required in any institute like Online Admission, Fees, Attendance, Examination.
+
+
+
+{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/index.txt b/foundation/www/docs/user/manual/en/education/index.txt
similarity index 100%
rename from foundation/www/docs/user/manual/en/schools/index.txt
rename to foundation/www/docs/user/manual/en/education/index.txt
diff --git a/foundation/www/docs/user/manual/en/education/schedule/__init__.py b/foundation/www/docs/user/manual/en/education/schedule/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/education/schedule/_sidebar.json b/foundation/www/docs/user/manual/en/education/schedule/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/schedule/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md b/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md
new file mode 100644
index 00000000..757f23d3
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md
@@ -0,0 +1,38 @@
+
+# Course Schedule
+
+Course Schedule is the schedule of a session conducted by an Instructor for a particular Course.
+You can see the overall course schedule in the Calendar view.
+
+
+
+#### Video Tutorial on Course Scheduling
+
+
+
+
+- To make attendance, expand the attendance section.
+- Check the students who were present for that session.
+- Click on 'Mark Attendance'. The system will create the Attendance records.
+
+###View Attendance
+
+Once you have marked Attendance against a Course Schedule the Attendance section in the Course Schedule shall be hidden.
+A View Attendance button shall appear. Click on that button to view all attendance records created against that Course Schedule.
+
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/schedule/examination.md b/foundation/www/docs/user/manual/en/education/schedule/examination.md
similarity index 55%
rename from foundation/www/docs/user/manual/en/schools/schedule/examination.md
rename to foundation/www/docs/user/manual/en/education/schedule/examination.md
index bd604501..7bdee05a 100644
--- a/foundation/www/docs/user/manual/en/schools/schedule/examination.md
+++ b/foundation/www/docs/user/manual/en/education/schedule/examination.md
@@ -3,7 +3,7 @@
The Examination record can be used to track the exam schedule and the results of that exam.
-
+
{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/schedule/index.md b/foundation/www/docs/user/manual/en/education/schedule/index.md
new file mode 100644
index 00000000..11d75709
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/schedule/index.md
@@ -0,0 +1,8 @@
+
+# Schedule
+
+
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/schedule/index.txt b/foundation/www/docs/user/manual/en/education/schedule/index.txt
similarity index 100%
rename from foundation/www/docs/user/manual/en/schools/schedule/index.txt
rename to foundation/www/docs/user/manual/en/education/schedule/index.txt
diff --git a/foundation/www/docs/user/manual/en/schools/schedule/scheduling-tool.md b/foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md
similarity index 63%
rename from foundation/www/docs/user/manual/en/schools/schedule/scheduling-tool.md
rename to foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md
index 82ba0075..5ce1faf5 100644
--- a/foundation/www/docs/user/manual/en/schools/schedule/scheduling-tool.md
+++ b/foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md
@@ -3,7 +3,7 @@
This tool can be used to create 'Course Schedules'.
-
+
### Creating Course Schedules
@@ -21,4 +21,14 @@ This tool can be used to create 'Course Schedules'.
- Check the 'Reschedule' checkbox and then click 'Schedule Course' button.
- System will delete existing Course Schedules for specified Course within the mentioned Course Start Date and Course End Date and crate new Course Schedules.
+#### Video Tutorial on Scheduling Tool
+
+
+
{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/setup/academic-year.md b/foundation/www/docs/user/manual/en/education/setup/academic-year.md
new file mode 100644
index 00000000..86f08839
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/setup/academic-year.md
@@ -0,0 +1,12 @@
+
+# Academic Year
+
+An academic year is a period of time which education, colleges and universities use to measure a quantity of study.
+
+The **Academic year** form have the Start and End date for the Academic year.
+
+
+
+**Student group** link is given to view or add the respective groups to the Academic year.
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/course.md b/foundation/www/docs/user/manual/en/education/setup/course.md
similarity index 54%
rename from foundation/www/docs/user/manual/en/schools/setup/course.md
rename to foundation/www/docs/user/manual/en/education/setup/course.md
index 596051e0..b0b37e4d 100644
--- a/foundation/www/docs/user/manual/en/schools/setup/course.md
+++ b/foundation/www/docs/user/manual/en/education/setup/course.md
@@ -5,12 +5,24 @@
To create a **Course** enter the Course name and Code. Code for the course should be unique for every course. You can also link the department under which the course is conducted.
-
+
Once a **Course** is created, a course schedule can defined for the same.
-
-
The Course form is further linked to **Program, Student Group and Assessment Plan** doctypes. The links allow to view/create the related documents for a **Course**.
+#### Video Tutorial for Course
+
+
+
+
+
+The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group**
+
+
+
+You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group**
+
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/setup/index.md b/foundation/www/docs/user/manual/en/education/setup/index.md
new file mode 100644
index 00000000..69a1c3a0
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/setup/index.md
@@ -0,0 +1,10 @@
+
+# Setup
+
+The Setup section of education module provides facility to make some basic master records and configuration. Below are doctypes for those masters and configuration.
+
+
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/index.txt b/foundation/www/docs/user/manual/en/education/setup/index.txt
similarity index 84%
rename from foundation/www/docs/user/manual/en/schools/setup/index.txt
rename to foundation/www/docs/user/manual/en/education/setup/index.txt
index 8fb9bb2d..9f88c5de 100644
--- a/foundation/www/docs/user/manual/en/schools/setup/index.txt
+++ b/foundation/www/docs/user/manual/en/education/setup/index.txt
@@ -6,4 +6,4 @@ student-category
student-batch-name
academic-term
academic-year
-school-settings
\ No newline at end of file
+education-settings
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/setup/instructor.md b/foundation/www/docs/user/manual/en/education/setup/instructor.md
new file mode 100644
index 00000000..365dcc53
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/setup/instructor.md
@@ -0,0 +1,32 @@
+
+# Instructor
+
+An Instructor can be a teacher, tutor, coach, or professor, of a specialised subject that involves any skill.
+
+To create new Instructor go to:
+
+> Education > Instructor > New
+
+
+
+An **Instructor** can also be linked to a **Course Schedule**, where you can define the schedule for a **Course** for a give date and **Room no**.
+
+It is also linked to **Student group** where an **Instructor** is assigned to the Student Group.
+
+While creating the **Assessment Plan** for a Student Group, **Instructor** can be linked as the Examiner or the Supervisor for that assessment.
+
+Further, the log for the Instructor can be entered in the Instructor Log table which can be used for keeping the records of subjects taught by that Instructor.
+
+#### Video Tutorial for Instructor
+
+
+
+
+Add the relevant Course and the Fee details for a program.
+
+
+
+The Program Doctype is further linked to the **Student applicant**, **Program enrollment, Student group, Fee structre and Fee**. The links allow to view or create the related document for a Program.
+
+#### Video Tutorial on Program and Courses
+
+
+
+
The course schedule validate the availability of the Room number and an alert message is shown if there is an overlap for the Room number for a given time slot.
-
+
The Room number is further linked to the Assesment plan. It validates the availability of examination room for the assessment to be held for a given date and time.
-
+
{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/student-batch-name.md b/foundation/www/docs/user/manual/en/education/setup/student-batch-name.md
similarity index 79%
rename from foundation/www/docs/user/manual/en/schools/setup/student-batch-name.md
rename to foundation/www/docs/user/manual/en/education/setup/student-batch-name.md
index 33768684..1c198d41 100644
--- a/foundation/www/docs/user/manual/en/schools/setup/student-batch-name.md
+++ b/foundation/www/docs/user/manual/en/education/setup/student-batch-name.md
@@ -3,7 +3,7 @@
Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch
-
+
You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
diff --git a/foundation/www/docs/user/manual/en/schools/setup/student-category.md b/foundation/www/docs/user/manual/en/education/setup/student-category.md
similarity index 50%
rename from foundation/www/docs/user/manual/en/schools/setup/student-category.md
rename to foundation/www/docs/user/manual/en/education/setup/student-category.md
index 53423fae..ee4a3420 100644
--- a/foundation/www/docs/user/manual/en/schools/setup/student-category.md
+++ b/foundation/www/docs/user/manual/en/education/setup/student-category.md
@@ -3,11 +3,15 @@
Student Category doctype allow you to classify student based various categories. In Institutions, there may be fee concession for some categories such as Handicapped students, foreign, nationals, reserved category by the government etc.
-To create Student category go to Setup >> Student Category >> New.
+To create Student category go to:
+
+> Setup > Student Category > New
We can create new student category by adding a name and save it
-
+
+
+You can select the Student Category while making the Fee Structure and accordingly the student from the selected groups can be filtered out while making the Fee Schedule.
{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/student/__init__.py b/foundation/www/docs/user/manual/en/education/student/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/education/student/_sidebar.json b/foundation/www/docs/user/manual/en/education/student/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/student/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/student/guardian.md b/foundation/www/docs/user/manual/en/education/student/guardian.md
similarity index 70%
rename from foundation/www/docs/user/manual/en/schools/student/guardian.md
rename to foundation/www/docs/user/manual/en/education/student/guardian.md
index be92e1cd..6461447b 100644
--- a/foundation/www/docs/user/manual/en/schools/student/guardian.md
+++ b/foundation/www/docs/user/manual/en/education/student/guardian.md
@@ -3,7 +3,7 @@
The Guardian doctype allows you to record the guardian details for a **Student**.
-
+
The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements.
diff --git a/foundation/www/docs/user/manual/en/schools/student/index.md b/foundation/www/docs/user/manual/en/education/student/index.md
similarity index 100%
rename from foundation/www/docs/user/manual/en/schools/student/index.md
rename to foundation/www/docs/user/manual/en/education/student/index.md
diff --git a/foundation/www/docs/user/manual/en/schools/student/index.txt b/foundation/www/docs/user/manual/en/education/student/index.txt
similarity index 100%
rename from foundation/www/docs/user/manual/en/schools/student/index.txt
rename to foundation/www/docs/user/manual/en/education/student/index.txt
diff --git a/foundation/www/docs/user/manual/en/schools/student/student-batch.md b/foundation/www/docs/user/manual/en/education/student/student-batch.md
similarity index 79%
rename from foundation/www/docs/user/manual/en/schools/student/student-batch.md
rename to foundation/www/docs/user/manual/en/education/student/student-batch.md
index 33768684..1c198d41 100644
--- a/foundation/www/docs/user/manual/en/schools/student/student-batch.md
+++ b/foundation/www/docs/user/manual/en/education/student/student-batch.md
@@ -3,7 +3,7 @@
Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch
-
+
+By default the student group is created based on the **Course** only. The check box for "Separate course based Group for every Batch" allows you to create batchwise Student groups for a course.
+
+You can leave it unchecked if you don't want to consider batch while making course based groups.
+
+#### Tutorial Video on Student Group Creation Tool
+
+
+
-
To create a Student group based on **Batch**, select the **Progam** and **Batch**, where as to create a Student group based on **Course**, you will only have to select the Course Code. Creating a student group based on activity allows you to group of student for events and activities happening in the institute.
Once a student group is created you can mark attendance for the group.
-
+
You can also update the **Email Group** for the Student Group. Click on Update Email Group to add all the email ids of the gaurdians in the respective email group and **Newsletter** can be created and sent to the Email group.
+#### Tutorial Video on Student Groups
+
+
+
+
+
{next}
diff --git a/foundation/www/docs/user/manual/en/education/student/student.md b/foundation/www/docs/user/manual/en/education/student/student.md
new file mode 100644
index 00000000..b0d208c0
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/education/student/student.md
@@ -0,0 +1,26 @@
+
+# Student
+
+A Student is a person who has enrolled at your institute and you have accepted their application.
+The Student doctype maintains detials like personal information, date of birth, address etc. It also records the **Guardian** and sibling details.
+
+
+
+
+The student is enrolled in a **Program** when the application is approved. Once the enrollement is done the **Student Applicant** status is update to Admitted.
+
+You can view every doctype created for a particular student. Eg : Fees, Student Group, etc
+
+#### Video Tutorial on Student Management
+
+
+
+ 
* Enter details like Insurance,Chassis,Vehicle Value,Location and Employee.
- 
+ 
* Enter Vehicle attributes like color,wheels,doors and last carbon check
- 
+ 
### Vehicle Log
@@ -40,17 +40,17 @@ ERPNext > Vehicle Log
* Enter License Plate,Employee,Date,Odometer reading for a quick entry.
- 
+ 
* Enter Refuelling details,Service details if applicable.
- 
+ 
### Make Expense Claim
* Click on Make Expense Claim button .This button appears only in case of Submitted Vehicle Logs.
- 
+ 
When you click on 'Make Expense Claim',
@@ -58,10 +58,10 @@ When you click on 'Make Expense Claim',
2. The sum of Fuel Expenses and Service Expenses is copied over to Expense Claim Amount.
3. Employee can submit the Expense Claim for further processing.
- 
+ 
### Vehicle Expenses Report
* To track and monitor Vehicle Expenses you can use the Vehicle Expenses report.This report gives a one stop view of all your vehicle expenses month wise.
- 
+ 
diff --git a/foundation/www/docs/user/manual/en/healthcare/appointment.md b/foundation/www/docs/user/manual/en/healthcare/appointment.md
index 266f0941..3afa7944 100755
--- a/foundation/www/docs/user/manual/en/healthcare/appointment.md
+++ b/foundation/www/docs/user/manual/en/healthcare/appointment.md
@@ -7,15 +7,15 @@ You can create a Patient Appointment from
You can book appointments for a registered Patient by searching and selecting the Patient field. You can search the Patient by Patient ID, Name, Email or Mobile number. You can also register a new Patient from the Appointment screen by selecting "Create a new patient" in the Patient field.
-
+
If you have a front desk executive to manage your appointments, you can configure a user role to have access to Patient Appointment so that she can do the bookings by selecting the Physician whom the Patient wish to consult and the date for booking. "Check Availability" button will pop up all the available time slots with status indicators for the date. She can select a time slot and "Book" the Appointment for the Patient.
-
+
After Booking, the scheduled time of the Appointment and duration will be updated and seved in the document.
-
+
You can configure ERPNext to send an SMS alert to the Patient about the booking confirmation or a reminder on the day of Appointment by doing necessary configurations in -
diff --git a/foundation/www/docs/user/manual/en/healthcare/consultation.md b/foundation/www/docs/user/manual/en/healthcare/consultation.md
index 1af2397c..640ae569 100755
--- a/foundation/www/docs/user/manual/en/healthcare/consultation.md
+++ b/foundation/www/docs/user/manual/en/healthcare/consultation.md
@@ -5,13 +5,13 @@ ERPNext Healthcare allows you to record Patient encounters through the Consultat
If you are creating the Consultation document from an Appointment, Patient and other related data will automatically be populated else you can search the Patient by name, email phone number etc. The Patient Details section will list the latest Vital Signs record of the patient and other information captured in the Patient screen.
-
+
### Assessment
Encounter Impression section allows you to select (or create new) Complaints and your assessment based on the presented complaints. You can opt to include the captured data in Consultation print by selecting the "In Print" flag
-
+
### Prescriptions
@@ -19,11 +19,11 @@ You can prescribe medicines in the Drug Prescription section by selecting the dr
Prescribing a laboratory investigation is similar and if you have Lab Tests configured, you can select from the list. Or key in the Lab Test name to be printed as part of the Prescription.
-
+
### Medical Coding
You can also attach one or more Medical Codes to designate the Diagnosis in the Medical Coding Section. You will have to select the Medical Code Standard you wish to encode the diagnosis and then select the Code by searching the Code itself or the Code Description.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/healthcare/index.md b/foundation/www/docs/user/manual/en/healthcare/index.md
index 798e1f20..d8a94383 100755
--- a/foundation/www/docs/user/manual/en/healthcare/index.md
+++ b/foundation/www/docs/user/manual/en/healthcare/index.md
@@ -3,7 +3,7 @@
ERPNext Healthcare helps you manage your Clinic or Practice efficiently by scheduling **Appointments** and recording **Patient Encounters** (Consultations). You can easily pull out a **Patient's Health Record** anytime to review all the history of treatments assisting you in providing effective, high quality care.
-
+
Patients can view various documents relevant to them and book Appointments via the **ERPNext Portal**. The healthcare module is integrated with **Accounts** and **Human Resources** modules, helping you in **Billing**, **Payroll Management** etc. and benefit from other rich features of ERPNext. You can configure the **Selling** and **Stock** modules manage your Pharmacy.
diff --git a/foundation/www/docs/user/manual/en/healthcare/lab_test.md b/foundation/www/docs/user/manual/en/healthcare/lab_test.md
index 085df504..2d262fac 100755
--- a/foundation/www/docs/user/manual/en/healthcare/lab_test.md
+++ b/foundation/www/docs/user/manual/en/healthcare/lab_test.md
@@ -7,11 +7,11 @@ ERPNext Healthcare allows you to manage a clinical laboratory efficiently by all
Once you have all necessary Lab Test Templates configured, you can start creating Lab Tests by selecting a Test Template every time you create a Test. To create a new Lab Test
>Healthcare > Laboratory > Lab Test > New Lab Test
-
+
You can record the test results in the Lab Test document as the results gets ready.
-
+
> Note: To create Sample Collection documents for every Lab Test, check "Manage Sample Collection" flag in Healthcare Settings and select Sample in the Lab Test Template
diff --git a/foundation/www/docs/user/manual/en/healthcare/medical_codes.md b/foundation/www/docs/user/manual/en/healthcare/medical_codes.md
index 5f0950de..880ea8f6 100755
--- a/foundation/www/docs/user/manual/en/healthcare/medical_codes.md
+++ b/foundation/www/docs/user/manual/en/healthcare/medical_codes.md
@@ -5,6 +5,6 @@ Medical Coding are in many countries required for regulatory compliance and many
Medical Code Standard document is used to name the Code Standard and act as a container for all the medical codes which are standardized under it. Medical Codes and descriptions can then be imported to the Medical Code document, after ensuring that you set the Medical Code Standard field to the appropriate Standard name.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/healthcare/medical_record.md b/foundation/www/docs/user/manual/en/healthcare/medical_record.md
index a2e33cd9..97552848 100755
--- a/foundation/www/docs/user/manual/en/healthcare/medical_record.md
+++ b/foundation/www/docs/user/manual/en/healthcare/medical_record.md
@@ -4,11 +4,11 @@ The maintenance of complete and accurate medical records is a requirement of hea
Medical Record automatically keeps track of all Consultations, recorded Vital Signs, Lab Investigations etc. Complaints, Diagnosis etc. captured as part of consultation are easily viewable but to look at the details of other documents, links are provided.
-
+
##### Adding notes manually to Medical Record
In the Patient screen Create > Medical Record will allow you to record notes to the Medical Record manually. You can also attach files when doing this, and the Medical Record will display links to the attached file along side the notes. Create > Medical Record button is also made available in the Consultation screen
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/healthcare/patient.md b/foundation/www/docs/user/manual/en/healthcare/patient.md
index 1a084eaa..e323bc85 100755
--- a/foundation/www/docs/user/manual/en/healthcare/patient.md
+++ b/foundation/www/docs/user/manual/en/healthcare/patient.md
@@ -4,11 +4,11 @@
In ERPNext Healthcare, the Patient document corresponds any individual who is the recipient of healthcare services you provide. For every ERPNext Healthcare document, it is important to have a Patient associated with it. You can create a new Patient from
> Healthcare > Masters > Patient > New Patient
-
+
The Patient document holds most details that are required to identify and qualify a patient. You can enter as much information available while creating the Patient. All information in the patient document is presented on the Consultation screen for easy lookup and you can always update this information. Other data like observations, vital signs etc. are not part of the Patient document. These could be recorded during patient encounters and will be available as part of the Patient Medical Record.
-
+
### Patient as a Customer
@@ -17,7 +17,7 @@ ERPNext Accounts makes use of "Customer" document for booking all transactions.
In many cases, you may want to associate multiple Patients to a single Customer against whom you want to book the transactions. For instance, a Veterinarian would require the care services provided to different pets of an individual invoiced against a single Customer.
-
+
The Patient Relation section of the Patient allows you to select how a Patient is related to another Patient in the system. This is optional, but will be quite handy if you want to use ERPNext in a fertility clinic, for example.
diff --git a/foundation/www/docs/user/manual/en/healthcare/physician.md b/foundation/www/docs/user/manual/en/healthcare/physician.md
index 34667691..8e89a781 100755
--- a/foundation/www/docs/user/manual/en/healthcare/physician.md
+++ b/foundation/www/docs/user/manual/en/healthcare/physician.md
@@ -6,12 +6,12 @@ ERPNext Healthcare allows you to create multiple physicians and optionally link
Linking a User to the Physician makes the system populate the Physician field in all documents to the Physician associated with the logged in User.
>Note: You should also relate the User to an Employee to utilize the various features of Human Resources module.
-
+
### Scheduling and Availability
Each Physician can have a "Physician Schedule" and a "Time per Appointment" on the basis of which, the scheduler will book Appointments. Also, you can select appropriate Income Accounts for a Physician to book all Consultation charges into separate accounts.
-
+
### Referring Physicians
You may also want to manage a list of Doctors who refers Patients to your facility. You can manage such data in the Physician document itself by leaving out the User link.
diff --git a/foundation/www/docs/user/manual/en/healthcare/physician_schedule.md b/foundation/www/docs/user/manual/en/healthcare/physician_schedule.md
index 0c388f2d..bd64005a 100755
--- a/foundation/www/docs/user/manual/en/healthcare/physician_schedule.md
+++ b/foundation/www/docs/user/manual/en/healthcare/physician_schedule.md
@@ -5,10 +5,10 @@ Physician Schedule will help you to configure the availability and work hours of
You can create Physician Schedule from -
> Healthcare > Masters > Physician Schedule
-
+
After naming the schedule you can use the "Add Time Slots" button to create time slots for each day of the week. These time slots will then be displayed while checking the availability of a Physician when booking an Appointment.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/healthcare/sample_collection.md b/foundation/www/docs/user/manual/en/healthcare/sample_collection.md
index 7acdc7ae..c93d0ff5 100755
--- a/foundation/www/docs/user/manual/en/healthcare/sample_collection.md
+++ b/foundation/www/docs/user/manual/en/healthcare/sample_collection.md
@@ -3,7 +3,7 @@
It's critical for a Laboratory to manage collected samples and you may want to ID the sample, print stickers etc. ERPNext Healthcare "Sample Collection" document helps you to easily manage the sample collection process by creating a sample collection document for every Lab Test automatically. You will have to turn on the flag in Healthcare Settings to enable this feature.
> Healthcare Settings > Laboratory Settings > Manage Sample Collection
-
+
> Note: You will have to select a Sample in the Lab Test Template for the system to automatically create a Sample Collection document
diff --git a/foundation/www/docs/user/manual/en/healthcare/vital_signs.md b/foundation/www/docs/user/manual/en/healthcare/vital_signs.md
index 1fda1482..31ddf4b0 100755
--- a/foundation/www/docs/user/manual/en/healthcare/vital_signs.md
+++ b/foundation/www/docs/user/manual/en/healthcare/vital_signs.md
@@ -3,11 +3,11 @@
ERPNext Healthcare allows you to record Vital Signs of Patients and manage this information as part of the Patient's health record. You can create a new document and record Vital Signs of a Patient from most of the Healthcare documents or directly by
> Healthcare > Consultation > Vital Signs > New Vital Signs
-
+
You can select the Patient for whom you are recording the vitals and start by entering each of the fields. Normal values or ranges are provided for ease of assessment. Also present is an auto BMI calculator.
-
+
All recorded Vital Signs are made available in the Patient Medical Record and the last recorded Vital Sign is displayed on the left hand side pane for easy review.
diff --git a/foundation/www/docs/user/manual/en/hospitality/__init__.py b/foundation/www/docs/user/manual/en/hospitality/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/hospitality/_sidebar.json b/foundation/www/docs/user/manual/en/hospitality/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/hospitality/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/hospitality/hotel-room.md b/foundation/www/docs/user/manual/en/hospitality/hotel-room.md
new file mode 100644
index 00000000..3822f196
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/hospitality/hotel-room.md
@@ -0,0 +1,6 @@
+
+# Hotel Room
+
+Hotel Room is a master to create hotel rooms for reservation
+
+
diff --git a/foundation/www/docs/user/manual/en/hospitality/index.md b/foundation/www/docs/user/manual/en/hospitality/index.md
new file mode 100644
index 00000000..15cb348a
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/hospitality/index.md
@@ -0,0 +1,14 @@
+
+# Hospitality
+
+ERPNext Hospitality module is designed to handle workflows for Hotels and Restaurants. This is still in early development stage.
+
+### Manage Restaurants
+
+The Restaurant module in ERPNext will help you manage a chain of restaurants. You can create Restaurants, Menus, Tables, Reservations and a manage Order Entry and Billing.
+
+### Manage Hotels
+
+The Hotels module in ERPNext will help you manage creating Hotel Rooms, create Hotel Room Reservation. It will also help in creating Invoice from hotel room reservation
+
+{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/hospitality/index.txt b/foundation/www/docs/user/manual/en/hospitality/index.txt
new file mode 100644
index 00000000..0c909d84
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/hospitality/index.txt
@@ -0,0 +1,5 @@
+restaurant
+restaurant-menu
+reservations
+order-entry
+hotel-room
diff --git a/foundation/www/docs/user/manual/en/hospitality/order-entry.md b/foundation/www/docs/user/manual/en/hospitality/order-entry.md
new file mode 100644
index 00000000..c949663d
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/hospitality/order-entry.md
@@ -0,0 +1,27 @@
+
+# Restaurant Order Entry
+
+The Restaurant Order Entry is the screen where the waiters will punch in orders related to a particular table.
+
+This screen makes it easy for the waiters in your restaurant to punch in orders from various tables.
+
+When the guest places an order, the waiter will select the table number and add the items in the Order Entry. This can be changed until it is time for the bill. Unless you bill a table, you can change the items and they will automatically appear when you select the table ID.
+
+To place an order you can select an item and click the enter key so that the item will be updated in the items table.
+
+
+
+You can also choose items with the POS style item selector.
+
+### Billing
+
+When it is time for billing, you just choose the bill and you can select the customer and mode of payment. On saving, a Sales Invoice is generated and the order section becomes empty.
+
+
+
+### Sales Invoice
+
+To print the invoice, you can click on the Invoice Link and print the invoice
+
+
+
diff --git a/foundation/www/docs/user/manual/en/hospitality/reservations.md b/foundation/www/docs/user/manual/en/hospitality/reservations.md
new file mode 100644
index 00000000..a6064603
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/hospitality/reservations.md
@@ -0,0 +1,14 @@
+
+# Restaurant Reservations
+
+Once you have setup the restaurant and tables, you can start taking in reservations for your restaurant.
+
+To take a reservation, just make a new Restaurant Reservation from the Restaurant Page and set the time, number of people and name of the guest.
+
+
+
+### Kanban
+
+As your guests walk in, You can also manage the reservations by making a simple Kanban board for the same.
+
+
diff --git a/foundation/www/docs/user/manual/en/hospitality/restaurant-menu.md b/foundation/www/docs/user/manual/en/hospitality/restaurant-menu.md
new file mode 100644
index 00000000..e856e038
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/hospitality/restaurant-menu.md
@@ -0,0 +1,8 @@
+
+# Restaurant Menu
+
+For every restaurant you must set an active Restaurant Menu from which orders can be placed. You can also set the rates for each of the item for the day.
+
+When you save the Restaurant Menu, a Price List is created for that Menu and all pricing is linked to that price list. This way you can easily control the items on offer and pricing from the menu.
+
+
diff --git a/foundation/www/docs/user/manual/en/hospitality/restaurant.md b/foundation/www/docs/user/manual/en/hospitality/restaurant.md
new file mode 100644
index 00000000..4f3614de
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/hospitality/restaurant.md
@@ -0,0 +1,20 @@
+
+# Restaurant
+
+The Restaurant record represents one restaurant in your organization. To create a new Restaurant, just set the name, Company and Default Customer.
+
+You can set a unique numbering prefix for each of your restaurants. All invoices for that restuarant will follow that numbering prefix.
+
+If you have a default Sales Taxes and Charges Template, you can add it so that the same charge + tax will be applicable for all invoices in the restaurant.
+
+
+
+After your restaurant is created, you can add Tables and Menus for that restaurant
+
+### Adding Tables
+
+You can add a Restaurant Table by creating a new Restaurant Table from the dashboard.
+
+
+
+
diff --git a/foundation/www/docs/user/manual/en/human-resources/appraisal.md b/foundation/www/docs/user/manual/en/human-resources/appraisal.md
index 7ae085c2..ff5b27c4 100644
--- a/foundation/www/docs/user/manual/en/human-resources/appraisal.md
+++ b/foundation/www/docs/user/manual/en/human-resources/appraisal.md
@@ -9,13 +9,13 @@ giving appropriate weightage to each parameter.
#### Step 1: Select an Appraisal Template
-
+
+
To learn how to define holidays for your company, check [Holiday List](/user/manual/en/human-resources/holiday-list) feature in the HR module.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/human-resources/attendance.md b/foundation/www/docs/user/manual/en/human-resources/attendance.md
index fd541570..46bfad92 100644
--- a/foundation/www/docs/user/manual/en/human-resources/attendance.md
+++ b/foundation/www/docs/user/manual/en/human-resources/attendance.md
@@ -6,7 +6,7 @@ day can be created manually by:
> Human Resources > Documents > Attendance > New Attendance
-
+
+Set the Employee ID, date, purpose and requested amount and “Save” the record.
+
+### Employee Advance Submission
+
+Employee Advance record can be created by any employee but they cannot submit the record.
+
+After saving Employee Advance, Employee should [Assign document to Approver](/docs/user/manual/en/using-erpnext/assignment.html). On assignment, approving user will also receive email notification. To automate email notification, you can also setup [Email Alert](/docs/user/manual/en/setting-up/email/email-alerts.html).
+
+After verification, approver can submit the Employee Advance form or reject the request.
+
+### Make Payment Entry
+After submission of Employee Advance record, accounts user will be able to create payment entry via Journal Entry or Payment Entry form.
+The payment entry will look like following:
+
+
+
+
+On submission of payment entry, the paid amount and status will be updated in Employee Advance record.
+
+### Adjust advances on Expense Claim
+Later when employee claims the expense and advance record can be fetched in Expense Claim and linked to the claim record.
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/human-resources/employee-loan-management.md b/foundation/www/docs/user/manual/en/human-resources/employee-loan-management.md
index 85a0e17e..acad6252 100644
--- a/foundation/www/docs/user/manual/en/human-resources/employee-loan-management.md
+++ b/foundation/www/docs/user/manual/en/human-resources/employee-loan-management.md
@@ -11,7 +11,7 @@ To create a new Loan Type go to:
Configure Loan limit and Rate of interest.
-
+
### Employee Loan Application
@@ -19,7 +19,7 @@ Employee can apply for loan by going to:
> Human Resources > Employee Loan Management > Employee Loan Application > New Employee Loan Application
-
+
#### In the Employee Loan Application,
@@ -28,7 +28,7 @@ Employee can apply for loan by going to:
On save, Employee can see Repayment Information and make changes if required before submitting.
-
+
### Employee Loan
@@ -36,7 +36,7 @@ Once the Loan is approved, Manager can create Employee Loan record for the Emplo
> Human Resources > Employee Loan Management > Employee Loan > New Employee Loan
-
+
#### In the Employee Loan,
@@ -45,13 +45,13 @@ Once the Loan is approved, Manager can create Employee Loan record for the Emplo
* Enter Disbursement Date and Account Info
* As soon as you hit save, the repayment schedule is generated.
-
+
#### Loan repayment deduction from Salary
To auto deduct the Loan repayment from Salary, check "Repay from Salary" in Employee Loan. It will appear as Loan repayment in Salary Slip.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/human-resources/employee.md b/foundation/www/docs/user/manual/en/human-resources/employee.md
index 5d29dfde..846148b3 100644
--- a/foundation/www/docs/user/manual/en/human-resources/employee.md
+++ b/foundation/www/docs/user/manual/en/human-resources/employee.md
@@ -7,6 +7,6 @@ To create new Employee go to:
> Human Resources > Employee > New
-
+
### Approving Expenses
@@ -28,16 +28,16 @@ Comments can be added in the Comments section explaining why the claim was appro
### Booking the Expense
On submission of Expense Claim, system books an expense against the expense account and the employee account
-
+
User can view unpaid expense claim using report "Unclaimed Expense Claims"
-
+
### Payment for Expense Claim
To make payment against the expense claim, user has to click on Make > Bank Entry
#### Expense Claim
-
+
#### Payment Entry
@@ -56,6 +56,6 @@ from. All outstanding expense claims will be pulled in and payments amounts can
* To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim
-
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
You can quickly add Weekly Off in the Holiday List as following.
-
+
After that, you can also add specific days (like festival holidays) manually.
-
+
### Holiday List in Employee
If you have created multiple Holiday List, then select specific Holiday List for an Employee in the respective master.
-
+
When an Employee applies for the Leave, then days mentioned in the Holiday List will not be counted, as they are holiday already. For more configuration option in Holiday List, check `HR > HR Settings`.
diff --git a/foundation/www/docs/user/manual/en/human-resources/human-resources-reports.md b/foundation/www/docs/user/manual/en/human-resources/human-resources-reports.md
index 1f360ca3..33a4ae99 100644
--- a/foundation/www/docs/user/manual/en/human-resources/human-resources-reports.md
+++ b/foundation/www/docs/user/manual/en/human-resources/human-resources-reports.md
@@ -5,37 +5,37 @@
Employee Leave Balance Report shows employees and their respective balance leaves under various leave types. Report is generated as per the number of allowed leaves.
-
+
### Monthly Salary Register
Monthly Salary Register shows net pay and its components of employee(s) at a glance.
-
+ src="{{docs_base_url}}/assets/img/human-resources/new-leave-type.png">
**Max Days Leave Allowed:** It refers to maximum number of days this particular Leave Type can be availed at a stretch. If an employee exceeds the maximum number of days under a particular Leave Type, his/her extended leave may be considered as ‘Leave Without Pay’ and this may affect his/her salary calculation.
@@ -46,7 +46,7 @@ Leave Allocation enables you to allot a specific number of leaves to a particula
To allocate leaves to an Employee, select the period and the number of leaves you want to allocate. You can also add unused leaves from previous allocation period.
+ src="{{docs_base_url}}/assets/img/human-resources/manual-leave-allocation.png">
###Via Leave Allocation Tool
> Human Resources > Tools > Leave Allocation Tool
@@ -54,7 +54,7 @@ To allocate leaves to an Employee, select the period and the number of leaves yo
This tool enables you to allocate leaves for a category of employees, instead of individual ones. You can allocate leaves based on Employee Type, Branch, Department and Designation. Leave Allocation Tool is also known as Leave Control Panel.
+ src="{{docs_base_url}}/assets/img/human-resources/leave-allocation-tool.png">
---
@@ -72,7 +72,7 @@ Leave Application section enables an employee to apply for leaves. Employee can
- Employee gets notification on the status of his/her Leave Application
+ src="{{docs_base_url}}/assets/img/human-resources/new-leave-application.png">
**Notes:**
@@ -90,4 +90,4 @@ Leave Application section enables an employee to apply for leaves. Employee can
Leave Block List is a list of dates in a year, on which employees can not apply for leave. You can define a list of users who can approve Leave Application on blocked days, in case of urgency. You can also define whether the list will applied on entire company or any specific departments.
\ No newline at end of file
+ src="{{docs_base_url}}/assets/img/human-resources/leave-block-list.png">
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/human-resources/offer-letter.md b/foundation/www/docs/user/manual/en/human-resources/offer-letter.md
deleted file mode 100644
index 85143b66..00000000
--- a/foundation/www/docs/user/manual/en/human-resources/offer-letter.md
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# Offer Letter
-
-Offer Letter is given to candidate after Interview & selection which states the offered salary package,
-designation, grade, department working, no of days entitled for leave.
-
-In ERPNext you can make a record of the Offer Letters that you can given to candidates. To create a new offer Letter go to
-
-> Human Resource > Offer Letter > New
-
-
+
+In Payroll Entry,
+
+ 1. Select the Company for which you want to create the Salary Slips. You can also select the other fields like Branch, Department, Designation or Project to be more specific.
+ 2. Check "Salary Slip based on Timesheet" if you want to process timesheet based Salary Slips.
+ 3. Select the Start Date and End Date or Fiscal year and month for which you want to create the Salary Slips.
+ 4. Click on "Get Employee Details" to get a list of Employees for which the Salary Slips will be created based on the selected criteria.
+ 5. Select the Cost Center and Payment Account.
+ 6. Save the form and Submit it to create Salary Slip records for each active Employee for the time period selected. If the Salary Slips are already created, the system will not create any more Salary Slips. You can also just save the form as Draft and create the Salary Slips later.
+
+
+
+Once all Salary Slips are created, you can check by clicking on "View Salary Slips", if they are created correctly or edit it if you want to deduct Leave Without Pay (LWP).
+
+After checking, you can "Submit" them all together by clicking on "Submit Salary Slip".
+
+### Booking Salaries in Accounts
+
+The final step is to book the Salaries in your Accounts.
+
+Salaries in businesses are usually dealt with extreme privacy. In most cases,
+the companies issues a single payment to the bank combining all salaries and
+the bank distributes the salaries to each employee’s salary account. This way
+there is only one payment entry in the company’s books of accounts and anyone
+with access to the company’s accounts will not have access to the individual
+salaries.
+
+The salary payment entry is a Journal Entry that debits the total of the
+earning type salary component and credits the total of deduction type salary
+component of all Employees to the default account set at Salary Component level
+for each component.
+
+To generate your salary payment voucher from Payroll Entry, click on,
+> Make > Bank Entry
+
+
+
+It will ask to enter the Bank Transaction Reference Number and date. All other details will be auto-filled according to your Payroll Entry form. Click on Save and create it.
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/human-resources/salary-and-payroll.md b/foundation/www/docs/user/manual/en/human-resources/salary-and-payroll.md
index 62cfcc25..6a7052a9 100644
--- a/foundation/www/docs/user/manual/en/human-resources/salary-and-payroll.md
+++ b/foundation/www/docs/user/manual/en/human-resources/salary-and-payroll.md
@@ -8,7 +8,7 @@ Payroll is the administration of financial records of employees' salaries, wages
To process Payroll in ERPNext,
1. Create Salary Structures for all Employees.
- 2. Generate Salary Slips via Process Payroll.
+ 2. Generate Salary Slips via [Payroll Entry](/docs/user/manual/en/human-resources/payroll-entry.html).
3. Book the Salary in your Accounts.
### Salary Structure
@@ -47,7 +47,7 @@ To create a new Salary Structure go to:
#### Figure 1.1:Salary Structure
-
+
### Salary Slip Based on Timesheet
@@ -73,20 +73,20 @@ In the “Earnings” and “Deductions” tables, you can calculate the values
#### Figure 1.3:Condition and Formula
-
+
* Condition and Amount
#### Figure 1.4:Condition and Amount
-
+
* Only Formula
* Only Amount
#### Figure 1.5:Account Details
-
+
* Select Mode of Payment and Payment Account for the Salary Slips which will be generated using this Salary Structure
@@ -116,7 +116,7 @@ Earning Types and Deduction Types.
### Creating Salary Slips
Once the Salary Structure is created, you can make a salary slip from the same
-form or you can process your payroll for the month using Process Payroll.
+form or you can process your payroll for the month using Payroll Entry.
To create a new Salary Slip go to:
@@ -124,7 +124,8 @@ To create a new Salary Slip go to:
#### Figure 2: Salary Slip
-
+
+
{next}
diff --git a/foundation/www/docs/user/manual/en/human-resources/setup/branch.md b/foundation/www/docs/user/manual/en/human-resources/setup/branch.md
index 4fc31b71..3d0658c2 100644
--- a/foundation/www/docs/user/manual/en/human-resources/setup/branch.md
+++ b/foundation/www/docs/user/manual/en/human-resources/setup/branch.md
@@ -3,6 +3,6 @@
Branches of your organization
-
+
{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/human-resources/tools/upload-attendance.md b/foundation/www/docs/user/manual/en/human-resources/tools/upload-attendance.md
index b091ca0e..285dac71 100644
--- a/foundation/www/docs/user/manual/en/human-resources/tools/upload-attendance.md
+++ b/foundation/www/docs/user/manual/en/human-resources/tools/upload-attendance.md
@@ -7,6 +7,6 @@ To upload the attendance go to:
> Human Resources > Upload Attendance
-
+
+
+
+
+
Follow are the steps to use Capacity Planning Feature in your ERPNext account.
@@ -33,7 +33,7 @@ Follow are the steps to use Capacity Planning Feature in your ERPNext account.
**Question:** On Submission of Production Order, we are getting following error message.
-
+
**Answer: **Please check if you have updated Working Hours in the Workstation master? If not, then please update it and then try to submit Production Order.
@@ -46,7 +46,7 @@ If you have update working hours in the Workstation, but still getting this issu
If you want to ignore above validation and allow scheduling of production job beyond the working hours of the Workstation, enable
Overtime in the Manufacturing Settings.
-
+
If you want to complete disable Capacity Planning feature, in the Manufacturing Settings, check field "Disable Capacity Planning and Time Tracking".
diff --git a/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md b/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
index 5f7aeba4..a48dffa0 100644
--- a/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
+++ b/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
@@ -9,7 +9,7 @@ A computer assembler is creating a BOM for PC. They also manufacture Hard Disk a
BOM of PC will have all the raw-material items selected in it. Hard Disk and DVD Drive (sub-assemblies) will also be selected as raw-material items. For the sib-assembly items, respective BOM no. will be fetched as well.
-
+
Following is how the structure of nested BOM will look:
diff --git a/foundation/www/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md b/foundation/www/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md
index 278beb30..0d50ab60 100644
--- a/foundation/www/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md
+++ b/foundation/www/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md
@@ -5,7 +5,7 @@
**Answer:** There are 3 available options in the Valuation Based On field:
-
+
**Valuation Rate:** Item valuation rate is defined based on it's purchase or manufacture value.
diff --git a/foundation/www/docs/user/manual/en/manufacturing/bill-of-materials.md b/foundation/www/docs/user/manual/en/manufacturing/bill-of-materials.md
index ad285178..1eb618a5 100644
--- a/foundation/www/docs/user/manual/en/manufacturing/bill-of-materials.md
+++ b/foundation/www/docs/user/manual/en/manufacturing/bill-of-materials.md
@@ -11,11 +11,11 @@ To make a new BOM:
> Manufacturing > Bill of Materials > New BOM
-
+
### Materials Required(exploded)
This table lists down all the Material required for the Item to be Manufactured.
It also fetches sub-assemblies along with the quantity.
-
+
### Types of Production Planning
diff --git a/foundation/www/docs/user/manual/en/manufacturing/operation.md b/foundation/www/docs/user/manual/en/manufacturing/operation.md
index 52cd0126..54b934ae 100644
--- a/foundation/www/docs/user/manual/en/manufacturing/operation.md
+++ b/foundation/www/docs/user/manual/en/manufacturing/operation.md
@@ -9,6 +9,6 @@ You can also create a Operation by:
> Manufacturing > Documents > Operation > New
-
+
A Production Order (also known as a Work Order) is a document that is given to
the manufacturing shop floor by the Production Planner as a signal to produce
a certain quantity of a certain Item. The Production Order also helps to generate
@@ -14,7 +14,7 @@ by:
> Manufacturing > Documents > Production Order > New
-
+
###Updating Finished Goods
@@ -93,11 +93,11 @@ If this is the case, you can select the Skip Material Transfer check box, which
* This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
* Click on 'Finish'.
-
+
+## Planning for Production
+
+#### Production Against Sales Orders
+
+* Select option as Sales Order from the drop down list of get items from. System will show the filters, using that we can pull the sales orders for the production.
+
+
+
+* Click on Get Sales Orders to fetch sales orders based on above filters
+
+
+
+* Click on Get Items for Production Order to fetch the items from the above sales orders.
+
+
+ * Include Exploded Items :- To include subassembly items of raw materials in the production.
+
+#### Production Against Material Requests
+
+* Select option as Material Request from the drop down list of get items from. System will show the filters, using that we can pull the material requests for the production.
+
+
+
+* Click on Get Material Request to fetch material requests based on above filters
+
+
+
+* Click on Get Items for Production Order to fetch the items from the above material requests.
+
+
+
+## Planning for Material Requests
+* Click on get raw materials for production button to fetech raw materials required in the production.
+
+
+
+ * Include Non Stock Items :- To add non stock items in the material request planning.
+ * Include Subcontracted Items :- To add subcontracted item's raw materials if include exploded items is disabled
+ * Ignore Existing Ordered Quantity :- If enabled then system will not check the projected quantity to make material request.
+
+# Options To Make Production Order and Material Request
+
+
diff --git a/foundation/www/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md b/foundation/www/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
index 1ca2c3fd..4b37a763 100644
--- a/foundation/www/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
+++ b/foundation/www/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
@@ -5,7 +5,7 @@ Manufacturing Settings can be found at:
`Manufacturing > Setup > Manufacturing Settings`
-
+
####Disable Capacity Planning and Time Tracking
@@ -17,7 +17,7 @@ If you don't track actual operations time, and want to disable creation of Time
In the Workstation master, actual working hours are defined (say 101m to 6pm). As per the Capacity Planning, Time Logs are created against Workstation, for tracking actual operations hour. It also considers working hours of a Workstation when scheduling job (via Time Log).
-
+
As per the standard validation, if Operation cannot be completed within working hours of Workstation, then user is asked to divide an Operation into multiple and smaller Operations. However, if `Allow Overtime` field is checked, while creating Time Logs for Operation, working hours of Workstation will not be validated. In this case, Time Logs for Operation will be created beyond working hours of Workstation as well.
@@ -25,7 +25,7 @@ As per the standard validation, if Operation cannot be completed within working
Holiday of a company can be recorded in the [Holiday List](/docs/user/manual/en/human-resources/) master. While scheduling production job on workstation, system doesn't consider a day listed in the Holiday list. If you want production job to be scheduled on holidays as well, `Allow Production on Holidays` field should be checked.
-
+
####Over Production Allowance Percentage
@@ -35,7 +35,7 @@ While making Production Orders against a Sales Order, the system will only allow
When creating Manufacture Entry, raw-material items are back-flush based on BOM of production item. If you want raw-material items to be back-flushed based on Material Transfer entry made against that Production Order instead, then you should set Back-flush Raw Materials Based On "Material Transferred for Manufacture".
-
+
####Capacity Planning For (Days)
diff --git a/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md b/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md
index a40c97a3..1a3d0fce 100644
--- a/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md
+++ b/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md
@@ -18,7 +18,7 @@ sub-contracting feature of ERPNext.
2. Create a Warehouse for your Supplier so that you can keep track of Items supplied. (you may supply a months worth of Items in one go).
3. For the processed Item, in the Item master, set “Is Sub Contracted Item” to “Yes”.
-
+
-__Step 2:__ Make a Purchase Order for the processed Item. When you “Save”, in the “Raw Materials Supplied”, all your un-processed Items will be updated based on your Bill of Materials.
+__Step 2:__ Make a Purchase Order for the processed Item. When you “Save”, in the “Raw Materials Supplied”, all your un-processed Items will be updated based on your Bill of Materials. You can also select the warehouse from which the material would be reserved for sub contracting.
-
+
+
+Once the PO is submitted, you can view the reserved quantity of the item from the item dashboard as well.
+
+
__Step 3:__ Make a Stock Entry to deliver the raw material Items to your Supplier.
-
+
__Step 4:__ Receive the Items from your Supplier via Purchase Receipt. Make sure to check the “Consumed Quantity” in the “Raw Materials” table so that the
correct stock is maintained at the Supplier’s end.
-
+
> Note 1: Make sure that the “Rate” of processed Item is the processing rate
(excluding the raw material rate).
@@ -47,6 +51,10 @@ correct stock is maintained at the Supplier’s end.
> Note 2: ERPNext will automatically add the raw material rate for your
valuation purpose when you receive the finished Item in your stock.
+> Note 3: ERPNext will automatically default the Reserve Warehouse in the PO
+from the BOM. If not found in the BOM, it would default it from the default
+warehouse setup in the Item.
+
### Video Help
diff --git a/foundation/www/docs/user/manual/en/manufacturing/tools/production-planning-tool.md b/foundation/www/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
index 5358c611..26c49822 100644
--- a/foundation/www/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
+++ b/foundation/www/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
@@ -14,7 +14,7 @@ To use the Production Planning Tool, go to:
> Manufacturing > Tools > Production Planning Tool
-
+
+System User or Chapter Head can add chapter Member directly from the desk or
+User can join directly by visiting chapter page on website
+
+to join chapter online
+
+> My Account on website > Chapter from sidebar > Select Available chapter and click on join chapter button
+
+
+
+
+
+
+To leave chapter click on leave chapter button
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Chapter/index.md b/foundation/www/docs/user/manual/en/non_profit/Chapter/index.md
new file mode 100644
index 00000000..e7971818
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Chapter/index.md
@@ -0,0 +1,11 @@
+
+# Chapter
+
+This section contains Chapter related documents.
+
+Chapter doctype is for people to organize or join offline group meetings in various cities around the world. user/members can find and join groups with a common interest.
+
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Chapter/index.txt b/foundation/www/docs/user/manual/en/non_profit/Chapter/index.txt
new file mode 100644
index 00000000..9eb7bdd7
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Chapter/index.txt
@@ -0,0 +1 @@
+chapter
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/__init__.py b/foundation/www/docs/user/manual/en/non_profit/Donor/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Donor/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Donor/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/donor.md b/foundation/www/docs/user/manual/en/non_profit/Donor/donor.md
new file mode 100644
index 00000000..0b9d4740
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Donor/donor.md
@@ -0,0 +1,22 @@
+
+#Donor
+
+The Donor doctype allows you to record the Donor details.
+
+Donor are simply contacts in your ERPNext database with one or more Donation. The contact may be an individual, a household, an organisation, or some other contact sub-type, but it is always a contact to which a donation is applied.
+
+To create new Donor go to:
+
+> Non Profit > Donor > New
+
+
+
+**Email:** Email field is the id of Member doctype.
+
+**Donor Type:** DonorType is link field to Donor Type Doctype. Member can select Available Doctype.
+
+**Address and Contact Section:** This Section linked to address and contact doctypes.
+
+**Accounting Section:** This section allowed to set member accounting details such as Account Receivable.
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/donor_type.md b/foundation/www/docs/user/manual/en/non_profit/Donor/donor_type.md
new file mode 100644
index 00000000..0fa89d31
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Donor/donor_type.md
@@ -0,0 +1,18 @@
+
+#Donor Type
+
+The Donor Type doctype allows you to Create different Donor Profile for the Donor.
+
+Donor Types are a basic building block for Donor and contribution management. Typically an organization will set up a donor type for each of the different donation that they offer. For example, an organisation may define three donation types for 'regular', 'Organization', and 'honorary' donor.
+
+In this chapter we will cover the most common set-up for donor types.
+
+To create new donor Type go to:
+
+> Non Profit > Donor Type > New
+
+
+
+**Donor Type:** The Donor Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a donor type name that is appropriate to both audiences. It can be changed at a later date
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/index.md b/foundation/www/docs/user/manual/en/non_profit/Donor/index.md
new file mode 100644
index 00000000..cfa50df4
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Donor/index.md
@@ -0,0 +1,10 @@
+
+# Donor
+
+This section contains Donors and Donors Contribution related documents.
+
+A donor in general is a person, organization or government who donates something voluntarily. The term is usually used to represent a form of pure altruism but sometimes used when the payment for a service is recognized by all parties as representing less than the value of the donation and that the motivation is altruistic. In business law, a donor is someone who is giving the gift (law), and a donee the person receiving the gift.
+
+### Topics
+
+{index}
diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/index.txt b/foundation/www/docs/user/manual/en/non_profit/Donor/index.txt
new file mode 100644
index 00000000..7f36f92b
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Donor/index.txt
@@ -0,0 +1,2 @@
+donor_type
+donor
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Grant Application/__init__.py b/foundation/www/docs/user/manual/en/non_profit/Grant Application/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/non_profit/Grant Application/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Grant Application/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Grant Application/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Grant Application/grant_application.md b/foundation/www/docs/user/manual/en/non_profit/Grant Application/grant_application.md
new file mode 100644
index 00000000..4bb9462a
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Grant Application/grant_application.md
@@ -0,0 +1,44 @@
+
+#Grant Application
+
+The Grant Application doctype allows you to record the Grant Applicants details.
+
+To Generate Online Grant Application go to:
+
+> My Account on website > Grant Application from sidebar > Apply for new Grant Application.
+
+
+
+
+
+
+
+
+
+To Generate Grant Application go to:
+
+> Non Profit > Grant Application > New.
+
+
+
+
+
+**Email:** Email is a mandatory field.
+
+**Organization:** Organization is data field contain organizaion name set as name field in erpnext.
+
+
+**Address and Contact Section:** This Section linked to address and contact doctypes.
+
+**Grant Application Details Section:** This section contains information about grant description.
+
+**Amount:** Amount field describe requested amount by an applicant.
+
+**Route:** Route field leave blank it will automatically create route path grant-application/organization_name
+
+**Assessment Result Section:** In This section when status field selected as received, send Grant Review Email button appear on the top right corner which sends grant URL to Assessment Manager.
+
+After reviewing grant. Grant Assessment Manager scale application at 0 - 9 point and left a note about a grant.
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Grant Application/index.md b/foundation/www/docs/user/manual/en/non_profit/Grant Application/index.md
new file mode 100644
index 00000000..adb41a38
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Grant Application/index.md
@@ -0,0 +1,17 @@
+
+# Grant Application
+
+Grant Application is designed to be used by organisations that distribute funds to others, for example grant seeker, etc.
+
+Grants are non-repayable funds or products disbursed or gifted by one party (grantmakers), often a government department, corporation, foundation or trust, to a recipient, often (but not always) a nonprofit entity, educational institution, business or an individual. In order to receive a grant, some form of "Grant Writing" often referred to as either a proposal or an application is required.
+
+Most grants are made to fund a specific project and require some level of compliance and reporting.
+
+The grant writing process involves an applicant submitting a proposal (or submission) to a potential funder, either on the applicant's own initiative or in response to a Request for Proposal from the funder. Other grants can be given to individuals, such as victims of natural disasters or individuals who seek to open a small business. Sometimes grant makers require grant seekers to have some form of tax-exempt status, be a registered nonprofit organization or a local government.
+
+Grant Application is grant writing process which can be review by assessment manager and then decided by the organization to disburse grant amount to the applicant or not.
+
+
+### Topics
+
+{index}
diff --git a/foundation/www/docs/user/manual/en/non_profit/Grant Application/index.txt b/foundation/www/docs/user/manual/en/non_profit/Grant Application/index.txt
new file mode 100644
index 00000000..5d997e82
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Grant Application/index.txt
@@ -0,0 +1 @@
+grant_application
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/__init__.py b/foundation/www/docs/user/manual/en/non_profit/Membership/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Membership/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Membership/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/index.md b/foundation/www/docs/user/manual/en/non_profit/Membership/index.md
new file mode 100644
index 00000000..90712047
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Membership/index.md
@@ -0,0 +1,10 @@
+
+# Membership
+
+This section contains Member and Membership related documents.
+
+How to set up one or more membership types that you can use to manage your organization's members. It also explains the concept of membership statuses and how your organisation can use them to define a membership life-cycle.
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/index.txt b/foundation/www/docs/user/manual/en/non_profit/Membership/index.txt
new file mode 100644
index 00000000..f1d9bf36
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Membership/index.txt
@@ -0,0 +1,3 @@
+membership_type
+member
+membership
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/member.md b/foundation/www/docs/user/manual/en/non_profit/Membership/member.md
new file mode 100644
index 00000000..df36fe94
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Membership/member.md
@@ -0,0 +1,22 @@
+
+#Member
+
+The Member doctype allows you to record the Member details for a **Membership**.
+
+Members are simply contacts in your ERPNext database with one or more memberships. The contact may be an individual, a household, an organisation, or some other contact sub-type, but it is always a contact to which a membership is applied.
+
+To create new Member go to:
+
+> Non Profit > Member > New
+
+
+
+**Email:** Email field is the id of Member doctype.
+
+**Membership Type:** Membership Type is link field to Membership Type Doctype. Member can select Available Doctype.
+
+**Membership Expiry Date:** This Field fetch membership end date details from membership doctype.
+
+**Address and Contact Section:** This Section linked to address and contact doctypes.
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/membership.md b/foundation/www/docs/user/manual/en/non_profit/Membership/membership.md
new file mode 100644
index 00000000..7fa94a64
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Membership/membership.md
@@ -0,0 +1,24 @@
+
+#Membership
+
+The Membership doctype allows you to record membership details for the **Member**.
+
+Membership is a term which refers to any organization that allows people to subscribe, and often requires them to pay a membership fee or "subscription".
+
+
+To create new Membership go to:
+
+> Non Profit > Membership > New
+
+
+
+**Member:** Member is a link field fetch member details from Member doctype.
+
+**Membership Status:** Membership Status is a select field which contains New, Current, Expired, Pending and Cancelled.
+
+**Membership Date Details section:** This section contain information related to Membership start date, end date and member since date.
+
+**Payment Details:** This section contains payment related details. If the person paid for membership checkbox paid is marked as checked else unmarked.
+Amount fetch based on membership type.
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/membership_type.md b/foundation/www/docs/user/manual/en/non_profit/Membership/membership_type.md
new file mode 100644
index 00000000..d5c80be8
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Membership/membership_type.md
@@ -0,0 +1,19 @@
+
+#Membership Type
+
+Membership Types are a basic building block for membership management. Typically an organization will set up a membership type for each of the different memberships that they offer. For the simplest membership structures, one membership type may be enough. For more complex membership structures, more membership types may be required. For example, an organisation may define three membership types for 'regular', 'student', and 'honorary' members. Or an organization may choose to use membership types as subcriptions to their different publications, either free or paying ones.
+
+In this chapter we will cover the most common set-up for membership types.
+
+To create new Membership Type go to:
+
+> Non Profit > Membership Type > New
+
+
+
+
+**Membership Type:** The Membership Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a membership type name that is appropriate to both audiences. It can be changed at a later date
+
+**Amount:** If your memberships are free you should enter 0 (zero) in this field. Otherwise you should enter the amount that must be paid for this membership type.
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/__init__.py b/foundation/www/docs/user/manual/en/non_profit/Volunteer/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Volunteer/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/index.md b/foundation/www/docs/user/manual/en/non_profit/Volunteer/index.md
new file mode 100644
index 00000000..943b9d65
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/index.md
@@ -0,0 +1,10 @@
+
+# Volunteer
+
+This section contains Volunteer and Volunteer Type related documents.
+
+Volunteer is the practice of people working on behalf of others without being motivated by financial or material gain.
+
+### Topics
+
+{index}
diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/index.txt b/foundation/www/docs/user/manual/en/non_profit/Volunteer/index.txt
new file mode 100644
index 00000000..3d93d069
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/index.txt
@@ -0,0 +1,2 @@
+volunteer_type
+volunteer
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer.md b/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer.md
new file mode 100644
index 00000000..c4dd81dd
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer.md
@@ -0,0 +1,25 @@
+
+#Volunteer
+
+The Volunteer doctype allows you to record the Volunter details.
+
+Volunteer are simply contacts in your ERPNext database with one or more volunteering program. The contact may be an individual, a household, an organisation, or some other contact sub-type
+
+To create new Volunteer go to:
+
+> Non Profit > Volunteer > New
+
+
+
+**Email:** Email field is the id of Member doctype.
+
+**Volunteer Type:** Volunteer Type is link field to Volunteer Type Doctype. Volunteer can select available Doctype.
+
+**Address and Contact Section:** This Section linked to address and contact doctypes.
+
+**Volunteer Availability Section:** This section is child table which contains select field about volunteer availability. a volunteer can select availability such as weekly, morning etc
+
+**Volunteer Skills Section:** This section is child table which contains data field about the volunteer skills. a volunteer can add multiple skill for eg. Desk Job,
+Hospitality, Food management, computer operator etc.
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md b/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md
new file mode 100644
index 00000000..22a56dbf
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md
@@ -0,0 +1,19 @@
+
+#Volunteer Type
+
+Volunteer Types are a basic building block for Volunteering management. Typically an organization will set up a volunteer type for each of the different donation that they offer. For example, an organisation may define three volunteer types for 'regular', 'Student', and 'Member' donor.
+
+In this chapter we will cover the most common set-up for volunteer types.
+
+To create new volunteer Type go to:
+
+> Non Profit > Volunteer Type > New
+
+
+
+
+**Volunteer Type:** The Volunteer Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a membership type name that is appropriate to both audiences. It can be changed at a later date
+
+**Amount:** If your Volunteering are free you should enter 0 (zero) in this field. Otherwise you should enter the amount that must be paid to the volunteer.
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/__init__.py b/foundation/www/docs/user/manual/en/non_profit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/non_profit/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/index.md b/foundation/www/docs/user/manual/en/non_profit/index.md
new file mode 100644
index 00000000..589e422b
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/index.md
@@ -0,0 +1,24 @@
+
+# Non Profit
+
+
+The Non Profit Modules in ERPNext is designed to meet requirements of NGO and Non Profit Organization. This is a centralized system, which maintains and updates all the activities related to an Organization.
+
+This will track all activity related to Memberships, Chapters, Volunteer Management,
+Donor Management, Event and Grant etc
+
+
+### Desk Page
+
+ 
+
+{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/non_profit/index.txt b/foundation/www/docs/user/manual/en/non_profit/index.txt
new file mode 100644
index 00000000..9f5e13a6
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/non_profit/index.txt
@@ -0,0 +1,5 @@
+Membership
+Chapter
+Volunteer
+Donor
+Grant Application
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/projects/activity-cost.md b/foundation/www/docs/user/manual/en/projects/activity-cost.md
index 37a84841..5b16bfd7 100644
--- a/foundation/www/docs/user/manual/en/projects/activity-cost.md
+++ b/foundation/www/docs/user/manual/en/projects/activity-cost.md
@@ -4,4 +4,4 @@
Activity Cost records the per-hour billing rate and costing rate of an Employee against an Activity Type.
This rate is pulled by the system while making Time Logs. It is used for Project Costing.
-
+
#### Time Log
Based on Actual Time spent on the Project-Task, Employee will create a time log.
-
+
On selection of Activity Type in the Time Log, Billing and Costing Rate will fetched for that Employee from respective Activity Cost master.
-
+
Multiplying these rates with total no. of Hours in the Time Log gives Costing Amount and Billing Amount for the specific Time Log.
@@ -31,10 +31,10 @@ Multiplying these rates with total no. of Hours in the Time Log gives Costing Am
Based on total Time Logs created for a specific Task, its costing will be updated in the respective Task master.
-
+
Same way, Project master will have cost updated based on Time Log created against that Projects, and tasks associated with that Project.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/projects/project.md b/foundation/www/docs/user/manual/en/projects/project.md
index bd82fe7e..86e91778 100644
--- a/foundation/www/docs/user/manual/en/projects/project.md
+++ b/foundation/www/docs/user/manual/en/projects/project.md
@@ -3,7 +3,7 @@
Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it.
-
+
Some examples of how the % Completion is calculated based on Tasks.
-
+
-
+
### Managing tasks
Project can be divided into multiple Tasks.
Task can be created via Project document itself or can be created via [Task](/docs/user/manual/en/projects/tasks.html)
-
-
+
+
### Managing time
@@ -49,13 +49,13 @@ The Actual Start and End Time along with the costing shall then be updated based
* To view Time Log made against a Project click on 'Time Logs'
-
+
####Salary Structure for the Employee
@@ -17,17 +17,17 @@ In the Salary Structure of the Employee, check field "Salary Slip Based on Times
Amount directly for other Salary Components (eg: House Rent Allowance, Phone Allowance) can be define directly. When creating Salary Slip, Amount for these Salary Component will be fetched as it is.
-
+
####Create Salary Slip from Timesheet
To create Salary Slip against Timesheet, open Timesheet and click on "Salary Slip".
-
+
In the Salary Slip, Timesheet ID will be updated. You can select more Timesheet to be paid via this Salary Slip. Based on the Timesheets selected, Total Working Hours will be calculated.
-
+
Hour Rate will be fetched from the Salary Structure of an Employee. Based on Total Working Hours and Hour Rate, Amount will be calculated for the Salary Component is to be calculated based on actual hours worked.
@@ -35,7 +35,7 @@ Hour Rate will be fetched from the Salary Structure of an Employee. Based on Tot
On Submission of Salary Slip, Timesheet's status will be updated to "Payslip".
-
+
+
#### Step 3:Activity Type
@@ -23,7 +23,7 @@ Employee will have to select an Activity Type (like planning, site visit, repair
To learn more on how to setup Activity Type and Activity Cost, click [here](/docs/user/manual/en/projects/articles/project-costing).
-
+
#### Step 4: Enter Actual Time
@@ -31,7 +31,7 @@ In the Timesheet Details table, enter actual hours an Employee has worked for. O
To be able to create Sales Invoice from the Time Sheet, ensure 'Is Billable' field is checked.
-
+
Based on the actual hours worked and Activity Cost of an Employee, Total Billing Amount will be calculated for Timesheet.
@@ -47,7 +47,7 @@ After submitting Timesheet, you will find buttons to create Sales Invoice and Sa
In the Timesheet, if "Is Billable" is checked, you will find option to create Sales Invoice against it.
-
+
@@ -55,7 +55,7 @@ In the Timesheet, if "Is Billable" is checked, you will find option to create Sa
Sales Invoice has dedicated table for the Timesheet table where Timesheet details will be updated. You can select more Timesheets in this table.
-
+
####Select Customer and Item
@@ -68,4 +68,4 @@ After enter all required details in the Sales Invoice, Save and Submit it.
On submitting Sales Invoice, status of the Timesheets linked to the Sales Invoice will be updated as Billed.
-
+
diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md
index 9ac61121..6ba2edf1 100644
--- a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md
+++ b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md
@@ -5,7 +5,7 @@ Creating Timesheet for Production Order helps in capacity planning for the Works
When a Production Order is submitted, based on the Planned Start Date and the availability of the Workstations, system schedules all operations by creating Timesheet.
-
+
Let's assume we are manufacturing a mobile phone. As per the Bill of Material, time required for the assembly of components could be one hour. However the actual time taken for it's completion could be more than planned. The actual time tracking provides actual operation cost, hence helps in determining accurate valuation of the manufacturing item.
@@ -13,28 +13,28 @@ Let's assume we are manufacturing a mobile phone. As per the Bill of Material, t
As per the Bill of Materials of manufacturing item, following are the Operations and Workstation through which raw-material items are processed.
-
+
On submission on Production Order, Timesheet will be created automatically.
-
+
####Time Sheet created from Production Order
In the Timesheet, unique row will be added for each Operation - Workstation. This allows operator/supervisor at the workstation to enter actual From Time and To Time taken for each Operation.
-
+
After enter From Time and To Time for all the Operations, Total Hours will be calculated.
-
+
With updating actual time, you can also enter "Completed Qty". If all the items are not processed in the same Timesheet, you can create another Timesheet from the Production Order.
-
+
####Save and Submit Timesheet
On the submission of Timesheet, Total Hours is calculated. Also, in the Production Order, for each Operation, actual Start and End Time is updated.
-
+
diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
index 150803b4..87ec4c70 100644
--- a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
+++ b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
@@ -3,7 +3,7 @@
Timesheets can be tracked against Project and Tasks so that you can get reports on how much time was spent on each Task or Project.
-
+
####Billable Timesheet
diff --git a/foundation/www/docs/user/manual/en/regional/france/__init__.py b/foundation/www/docs/user/manual/en/regional/france/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/regional/france/_sidebar.json b/foundation/www/docs/user/manual/en/regional/france/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/regional/france/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/regional/france/fichier_des_ecritures_comptables.md b/foundation/www/docs/user/manual/en/regional/france/fichier_des_ecritures_comptables.md
new file mode 100644
index 00000000..efd3585c
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/regional/france/fichier_des_ecritures_comptables.md
@@ -0,0 +1,25 @@
+
+# Le Fichier des Écritures Comptables [FEC]
+
+Since 2014, a legal requirement makes it mandatory for companies operating in France to provide a file of their general accounting postings by fiscal year corresponding to an electronic accounting journal.
+
+For ERPNext users this file can be generated using a report available if you system's country is France.
+
+
+### Requirements
+
+To generate the report correctly, your Chart of Account needs to be setup according to the french accounting rules.
+
+All accounts need to have a number in line with the General Chart of Account (PCG) and a name.
+
+The SIREN number of your company can be added in the "Company" doctype.
+
+
+### CSV generation
+
+You can generate the required CSV file by clicking on "Export" in the top right corner of the report.
+
+
+### Testing Instructions
+
+To test the validity of your file, the tax administration provides a testing tool at the following address: [Outil de test des fichiers des écritures comptables (FEC)](http://www.economie.gouv.fr/dgfip/outil-test-des-fichiers-des-ecritures-comptables-fec)
diff --git a/foundation/www/docs/user/manual/en/regional/france/index.txt b/foundation/www/docs/user/manual/en/regional/france/index.txt
new file mode 100644
index 00000000..84fcb9e3
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/regional/france/index.txt
@@ -0,0 +1,2 @@
+fichier_des_ecritures_comptables
+local_overrides
diff --git a/foundation/www/docs/user/manual/en/regional/france/local_overrides.md b/foundation/www/docs/user/manual/en/regional/france/local_overrides.md
new file mode 100644
index 00000000..b6a9cbde
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/regional/france/local_overrides.md
@@ -0,0 +1,8 @@
+
+# Sales and Payment Transactions
+
+In order to be compliant with the latest finance law applicable to POS software, ERPNext automatically registers all sales and payment transactions in a chained log.
+
+If your country is set to "France", the deletion of sales and payment transactions will also not be permitted, even if the appropriate permissions are given to the user.
+
+Please note that ERPNext is not yet fully compliant with the 2016 Finance Law.
diff --git a/foundation/www/docs/user/manual/en/regional/index.txt b/foundation/www/docs/user/manual/en/regional/index.txt
new file mode 100644
index 00000000..1a6cf1b7
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/regional/index.txt
@@ -0,0 +1,3 @@
+france
+india
+united_arab_emirates
diff --git a/foundation/www/docs/user/manual/en/regional/india/gst-remimders.md b/foundation/www/docs/user/manual/en/regional/india/gst-remimders.md
index bffadd49..6c106a5c 100644
--- a/foundation/www/docs/user/manual/en/regional/india/gst-remimders.md
+++ b/foundation/www/docs/user/manual/en/regional/india/gst-remimders.md
@@ -5,7 +5,7 @@ You can send email reminders to your Customers and Suppliers so that they can di
To send GSTIN Reminders, you can either open the Customer / Supplier record or **GST Settings**
-
+
Here you can click on the "Send GSTIN Update Reminders" button to send email reminders to all your customers
@@ -13,10 +13,10 @@ Here you can click on the "Send GSTIN Update Reminders" button to send email rem
Your customers will receive an email asking them to update their GSTIN and that email will link them to a portal page:
-
+
Here they can update their GSTIN and it will automatically be added to your customer GSTIN record.
#### Sample GSTIN Reminder Email
-
+
diff --git a/foundation/www/docs/user/manual/en/regional/india/gst-setup.md b/foundation/www/docs/user/manual/en/regional/india/gst-setup.md
index d3d2bcf1..f46f5336 100644
--- a/foundation/www/docs/user/manual/en/regional/india/gst-setup.md
+++ b/foundation/www/docs/user/manual/en/regional/india/gst-setup.md
@@ -5,7 +5,7 @@
GST Law requires that you maintain the GSTIN number for all your suppliers and vendors. In ERPNext, GSTIN is linked to the **Address**
-
+
**GST for your Company Address**
@@ -13,20 +13,20 @@ You also need to set the Address for your own Company and your Company's GST Num
Go to the Company master and add the GSTIN to your default address.
-
+
**Include GSTIN number in the Address Template**
Open Address Template record for India, add GSTIN number and State Code there if not exists.
-
+
### 2. Setting up HSN Codes
According to the GST Law, your itemised invoices must contain the HSN Code related to that Item. ERPNext comes pre-installed with all 12,000+ HSN Codes so that you can easily select the relevant HSN Code in your Item
-
+
### 3. Making Tax Masters
@@ -36,7 +36,7 @@ Go to your **Chart of Accounts**, under the Duties and Taxes head of your accoun
**Note:** Usually the rate in CGST and SGST is half of IGST. For example if most of your items are billed at 18%, then create IGST at 18%, CGST and SGST at 9% each.
-
+
### 4. Make Tax Templates
@@ -44,7 +44,7 @@ You will have have to make two tax templates for both your sales and purchase, o
In your **In State GST** template, select 2 accounts, SGST and CGST
-
+
In your **Out of State GST** template, select IGST
@@ -60,22 +60,22 @@ For **Sales Invoice**,
4. Select the the **In State GST** or **Out of State GST** template that you have created based on the type of transaction
5. Save and Submit the Invoice
-
+
### 6. Print GST Tax Invoice
To print Tax Invoice as per GSTN guidelines, please select **GST Tax Invoice** print format. This print format includes company address, GSTIN numbers, HSN/SAC Code and item-wise tax breakup. And while printing select correct value of Invoice Copy field, to mention whether it is for the Customer, Supplier or Transporter.
-
+
### Reports
ERPNext comes with most of your reports you need to prepare your GST Returns. Go to Accounts > GST India head for the list.
-
+
You can check the impact of your invoice in the **GST Sales Register** and **GST Itemised Sales Register**
-
+
diff --git a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/__init__.py b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/_sidebar.json b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/index.txt b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/index.txt
new file mode 100644
index 00000000..cf167db3
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/index.txt
@@ -0,0 +1 @@
+uae-vat-setup
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md
new file mode 100644
index 00000000..e0e0793e
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md
@@ -0,0 +1,46 @@
+
+# VAT/EXCISE Tax Implementation for UAE/KSA
+
+### 1. Setting up Tax Registration No for customer, supplier and company
+
+Set tax registation number in the field tax id for the customer, supplier and company
+
+1. For Customer
+
+
+2. For Company
+
+
+### 2. Setting up TAX Code for Products
+Setup tax code in the item master, system will fetch same code in the sales/purchase invoice on selection of an item.
+
+
+### 3. Default Tax Templates
+
+ERPNext provides you default tax template for vat(5%, zero, exempted) and excise(50%, 100%). You can create your own [tax template](/docs/user/manual/en/setting-up/setting-up-taxes.html).
+
+
+
+### 3. Making VAT Ready Invoices
+
+If you have setup the TRN of your Customers and Suppliers, and your tax template, you are ready to go for making VAT Ready Invoices!
+
+For **Sales Invoice**,
+
+1. Select the correct Customer and Item and the address where the transaction will happen.
+2. Check if the TRN of your Company and Supplier have been correctly set.
+3. Check if the TAX Code has been set in the Item
+4. Select the template that you have created based on the type of transaction
+5. Save and Submit the Invoice
+
+
+
+### 4. Print Tax Invoice
+
+ERPNext provides 2 default print foramt
+
+1. Simplified Tax Invoice
+
+
+2. Detailed Tax Invoice
+
diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md
deleted file mode 100644
index fba3109f..00000000
--- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#Assessment Criteria
-
-Assessment Criteria is the parameter based on which you assess the Student.
-
-
-
-After assessment is conducted for a Course, marks earned are entered based on the Assessment Criteria. For example, if assessment was conducted for science subject, then you can evaluate Student in Science on various criteria like Writing, Practicals, Presentation etc.
-
-Assessment Criteria is be used when scheduling Assessment Plan for Student Group and Course.
-
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md
deleted file mode 100644
index 79ed5dcb..00000000
--- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#Assessment Group
-
-Assessment Group tree is a master where you can define the hierarchy for examination conducted in your education institute.
-
-For example, if you conduct two assessment in a academic year, then setup Assessment Group as following.
-
-
-
-On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute.
-
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md
deleted file mode 100644
index 0d15f631..00000000
--- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#Assessment Plan
-
-To schedule an assessment/examination for a Student Group, for specific Course, create Assessment Plan. In the Assessment Plan, you can also capture details like:
-
-1. Grading Scale based on which grades will be assigned to students.
-
-2. Schedule Date of Assessment
-
-3. Room where assessment will be conducted
-
-4. Examiner and Supervisor
-
-
-
-5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned.
-
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md
deleted file mode 100644
index 55182267..00000000
--- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#Assessment Result Tool
-
-Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student.
-
-
-
-As you go on entering marks for a Student, and switch to next student, in the backend, Student Result record will be auto-created for that Student.
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md b/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md
deleted file mode 100644
index 0874cf14..00000000
--- a/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#Grading Scale
-
-In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned.
-
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/index.txt b/foundation/www/docs/user/manual/en/schools/Attendance/index.txt
deleted file mode 100644
index 8cd02627..00000000
--- a/foundation/www/docs/user/manual/en/schools/Attendance/index.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-student-attendance
-student-leave-application
-student-attendance-tool
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance-tool.md b/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance-tool.md
deleted file mode 100644
index 987b407e..00000000
--- a/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance-tool.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# Student Attendance Tool
-
-The Student Attendance tool allow you to bulk update the attendance for students based on **Student Group and Course Schedule**.
-
-To mark the **Attedance* based on Student Group select the group based on
-
-**1. Batch
- 2. Course
- 3. Activity **
-
-Student detials will be autofetched and you can mark the attendance of the given date.
-
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/student-leave-application.md b/foundation/www/docs/user/manual/en/schools/Attendance/student-leave-application.md
deleted file mode 100644
index a32f75fb..00000000
--- a/foundation/www/docs/user/manual/en/schools/Attendance/student-leave-application.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#Student Leave Application
-
-ERPNext allows you to record the leave application for a student.
-
-To create a Student Leave application record, enter the Student and the date for the leave is applied and save.
-
-
-
-Incase the student is not attending the school in order to participate or represent school in any event, he/she can be mark as present from the Leave Application itself.
-
-Once a Leave Application is recorded for a student it will not be recorded in the absent student report as he has applied for a leave.
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment-tool.md b/foundation/www/docs/user/manual/en/schools/admission/program-enrollment-tool.md
deleted file mode 100644
index bf729b5a..00000000
--- a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment-tool.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# Program Enrollment Tool
-
-The Program Enrollment tool allows the bulk enrollment of the **Student Applicants** in a Program.
-
-
-You can create the the Program Enrollment for :
-
-1. **Student Applicants** >> List of Student Applicants will be fetched for the selected **Program** and **Academic year**.
-
-
-
-2. **Program Enrollment** >> You can bulk update the **Program** for the students from one academic year to another in the same **Program** or a new **Program**.
-
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md b/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md
deleted file mode 100644
index e003ab9c..00000000
--- a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# Program Enrollment
-
-Program Enrollment describes an educational model where students must complete a defined set of courses towards their academic objective in a specified sequence. Enrollment is a program driven process in which the student select the Program to enrol for in a Academic Year.
-
-Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student.
-
-
-
-- A student can be enrolled in multiple Course for a program in a given academeic year.
-- Based on the Fee structure selected at the time of enrollment Fee detials are created of the student.
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/schools/admission/student_admission.md b/foundation/www/docs/user/manual/en/schools/admission/student_admission.md
deleted file mode 100644
index da5e4603..00000000
--- a/foundation/www/docs/user/manual/en/schools/admission/student_admission.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Student Admission
-
-The admission process begins with filling the admission form. The Student Admission record enables to intitate your admission process for a given **Academic year**. ERPNext admission module allow you to create an admission record which can be then published on the ERPNext generate website.
-
-To create a Student Admission record go to :
-
-**Schools** >> **Admissions** >> **Student Admission** >>
-
-
-
-
-
-Once a admission record is created it can be published on the website and the student can apply from the web portal itself.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/fees/fee-category.md b/foundation/www/docs/user/manual/en/schools/fees/fee-category.md
deleted file mode 100644
index 7994a317..00000000
--- a/foundation/www/docs/user/manual/en/schools/fees/fee-category.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# Fee Category
-
-List of all different type of fees collected.
-
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/fees/fee-structure.md b/foundation/www/docs/user/manual/en/schools/fees/fee-structure.md
deleted file mode 100644
index 2b0d6789..00000000
--- a/foundation/www/docs/user/manual/en/schools/fees/fee-structure.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# Fee Structure
-
-A Fee Structure is a template that can be used while making fee records.
-
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/fees/fees.md b/foundation/www/docs/user/manual/en/schools/fees/fees.md
deleted file mode 100644
index 53b39edc..00000000
--- a/foundation/www/docs/user/manual/en/schools/fees/fees.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Fees
-
-Maintain a record of fees collected from students.
-The [Fee Structure](/docs/user/manual/en/schools/fees/fee-structure.html) is fetched based on the selected Program and Academic Term.
-
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/fees/index.md b/foundation/www/docs/user/manual/en/schools/fees/index.md
deleted file mode 100644
index ec90139c..00000000
--- a/foundation/www/docs/user/manual/en/schools/fees/index.md
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# Fees
-
-This section contains 'Fee' related documents.
-
-
-
-### Topics
-
-{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/index.md b/foundation/www/docs/user/manual/en/schools/index.md
deleted file mode 100644
index 4e17d224..00000000
--- a/foundation/www/docs/user/manual/en/schools/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Schools
-
-
-The School Modules in ERPNext is designed to meet requirements of Schools, Colleges & Educational Institutes. This is a centralized system, which maintains and updates all the activities related to an Institution. This will ease the process of each and every aspect of a School, be it Students, Admission, Examination and Fee.
-
-
-
-{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/schedule/course-schedule.md b/foundation/www/docs/user/manual/en/schools/schedule/course-schedule.md
deleted file mode 100644
index a3af2a51..00000000
--- a/foundation/www/docs/user/manual/en/schools/schedule/course-schedule.md
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Course Schedule
-
-Course Schedule is the schedule of a session conducted by an Instructor for a particular Course.
-You can see the overall course schedule in the Calendar view.
-
-
-
-### Marking Attendance
-
-You can mark attendance for a Student Group against a Course Schedule.
-
-
-
-- To make attendance, expand the attendance section.
-- Check the students who were present for that session.
-- Click on 'Mark Attendance'. The system will create the Attendance records.
-
-###View Attendance
-
-Once you have marked Attendance against a Course Schedule the Attendance section in the Course Schedule shall be hidden.
-A View Attendance button shall appear. Click on that button to view all attendance records created against that Course Schedule.
-
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/schedule/index.md b/foundation/www/docs/user/manual/en/schools/schedule/index.md
deleted file mode 100644
index e8176587..00000000
--- a/foundation/www/docs/user/manual/en/schools/schedule/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# Schedule
-
-
-
-### Topics
-
-{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/academic-year.md b/foundation/www/docs/user/manual/en/schools/setup/academic-year.md
deleted file mode 100644
index 5025dd46..00000000
--- a/foundation/www/docs/user/manual/en/schools/setup/academic-year.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# Academic Year
-
-An academic year is a period of time which schools, colleges and universities use to measure a quantity of study.
-
-The **Academic year** form have the Start and End date for the Academic year.
-
-
-
-**Student group** link is given to view or add the respective groups to the Academic year.
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/index.md b/foundation/www/docs/user/manual/en/schools/setup/index.md
deleted file mode 100644
index bc6a4cf2..00000000
--- a/foundation/www/docs/user/manual/en/schools/setup/index.md
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# Setup
-
-The Setup section of Schools module provides facility to make some basic configuration. Below are doctypes for basic configuration.
-
-
-
-### Topics
-
-{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/instructor.md b/foundation/www/docs/user/manual/en/schools/setup/instructor.md
deleted file mode 100644
index 969c5c8f..00000000
--- a/foundation/www/docs/user/manual/en/schools/setup/instructor.md
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# Instructor
-
-An instructoe is a teacher, or professor, of a specialised subject that involves skill.
-
-You can create an Instructor and link it to the Employee master and a Departmemt.
-
-
-
-An **Instructor** is further linked to a **Course Schedule**, where you can define the schedule for a **Course** for a give date and **Room no**.
-
-
-It is also linked to **Student group** where an **Instructor** is assigned to the Student group.
-
-
-
-An **Instructor** is also linked to an **Assesment Plan** for a Student group. The Instructor can be an Examiner or the supervisor for the assesment.
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/program.md b/foundation/www/docs/user/manual/en/schools/setup/program.md
deleted file mode 100644
index b319d431..00000000
--- a/foundation/www/docs/user/manual/en/schools/setup/program.md
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# Program
-
-An educational program is a program written by the institutions which determines the learning progress of each subject in all the stages of formal education.
-
-To create a Program go to :
-
-###Schools >> Setup >> Program >> New Program
-
-Enter a unique code for every **Program**. You can also link the **Program** to the department under which it is conducted.
-
-
-
-Add the relevant Course and the Fee details for a program.
-
-
-
-The Program Doctype is further linked to the **Student applicant**, **Program enrollment, Student group, Fee structre and Fee**. The links allow to view or create the related document for a Program.
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/school-settings.md b/foundation/www/docs/user/manual/en/schools/setup/school-settings.md
deleted file mode 100644
index 08b5b60b..00000000
--- a/foundation/www/docs/user/manual/en/schools/setup/school-settings.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#School Settings
-
-The Schools settings page allow you to setup basic settings like **Academic Year and Term** for the Schools setup.
-
-
-
-The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group**
-
-
-
-You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group**
-
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md b/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md
deleted file mode 100644
index 7bb259b6..00000000
--- a/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# Student Group Creation Tool
-
-The Student group creation tool allows you to create student groups in bulk.
-
-To create Student group using this tool go to
-
-##Schools >>Student >> Student Group creation tool
-
-Select the **Academic Term** and the **Program** for which a student group is to be created.
-
-
-
-By default the student group is created based on the **Course** only. The check box for "Separate course based Group for every Batch" allows you to create batchwise Student groups for a course.
-
-You can leave it unchecked if you don't want to consider batch while making course based groups.
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/student/student.md b/foundation/www/docs/user/manual/en/schools/student/student.md
deleted file mode 100644
index 3f49bc43..00000000
--- a/foundation/www/docs/user/manual/en/schools/student/student.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# Student
-
-A Student is a person who has enrolled at your institute and you have accepted their application.
-The Student doctype maintains detials like personal information, date of birth, address etc. It also records the **Guardian** and sibling details.
-
-
-The student is enrolled in a **Program** when the application is approved. Once the enrollement is done the **Student Applicant** status is update to Admitted.
-
-You can view every doctype created for a particular student. Eg : Fees, Student Group, etc
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md b/foundation/www/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
index f5df998e..087f32a5 100644
--- a/foundation/www/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
+++ b/foundation/www/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
@@ -8,7 +8,7 @@ For example an Item Pen is stocked in Nos, but sold in Box. Hence we will make S
###Step 1: In the Item master, under Unit of Measure section, you can list all the possible UoM of an item, with its UoM Conversion Factor. Update UoM Conversion Factors
In one Box, if you get 10 Nos. of Pen, UoM Conversion Factor would be 10.
-
+
###Setp 2: In the Sale Order, you will find two UoM fields
@@ -18,7 +18,7 @@ In one Box, if you get 10 Nos. of Pen, UoM Conversion Factor would be 10.
In both the fields, default UoM of an item will be fetched by default. You should edit UoM field, and select Sale UoM (Box in this case). Updating Sales UoM is mainly for the reference of the Customer. In the print format, you will see item quantity in the Sales UoM.
-
+
Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you sell just one Box, then Qty as per stock UoM will be set as 10.
@@ -27,4 +27,4 @@ Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM
Irrespective of the Sales UoM selected in the Sale Order, stock ledger posting will be done in the Default UoM of an item. Hence you should ensure that conversion factor is entered correctly while selling item in different UoM.
-
+
diff --git a/foundation/www/docs/user/manual/en/selling/articles/adding-margin.md b/foundation/www/docs/user/manual/en/selling/articles/adding-margin.md
index 071da4ec..e864e567 100644
--- a/foundation/www/docs/user/manual/en/selling/articles/adding-margin.md
+++ b/foundation/www/docs/user/manual/en/selling/articles/adding-margin.md
@@ -10,7 +10,7 @@ To setup Pricing Rule, go to:
####Adding Margin in Pricing Rule
-
+
Total Margin is calculated as follows:
`Rate = Price List Rate + Margin Rate`
@@ -23,7 +23,7 @@ To add Price List, go to:
####Adding Item Price
-
+
2) Apply margin direct on Item: If user wants to apply the margin without pricing rule, they can use this option. In Quotation Item and Sales Order Item, user can select the margin type and rate or amount. The system will calculate the margin and apply it on price list rate to calculate the rate of the product.
@@ -35,4 +35,4 @@ add item and scroll down to section where you can find the Margin Type
####Adding Margin in Quotation
-
+
diff --git a/foundation/www/docs/user/manual/en/selling/articles/applying-discount.md b/foundation/www/docs/user/manual/en/selling/articles/applying-discount.md
index d3dc325c..64dac956 100644
--- a/foundation/www/docs/user/manual/en/selling/articles/applying-discount.md
+++ b/foundation/www/docs/user/manual/en/selling/articles/applying-discount.md
@@ -7,7 +7,7 @@ There are several ways Discount can be applied on an item in the sales transacti
You can find the Discount (%) field in the Item table. Discount (%) is applied on the Price List Rate to get the selling Rate of the Item.
-
+
The feature of Discount (%) is available in all sales and purchase transactions.
@@ -17,18 +17,18 @@ You can use Pricing Rule for auto-application of Discount (%). [Click here to le
In the "Additional Discount" section, you can apply discount as amount or as percentage.
-
+
##### Discount on Net Total
If Discount Amount is applied on **Net Total**, then item's Net Rate and Net Amount is calculated as per the Discount Amount. Net Rate and Amount field will be visible only if Discount is applied using this feature.
-
+
##### Discount on Grand Total
If Discount Amount is applied based on the **Grand Total**, then with item's Net Rate, Net Amount as well as taxes are also re-calculated as per Discount Amount.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md b/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md
index bc4be7a6..5d86e5fa 100644
--- a/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md
+++ b/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md
@@ -3,7 +3,7 @@
In the submitted Sales Orders, you will find **Stop** option. Stopping Sales Order will restrict user from creating Delivery Note and Sales Invoice against it.
-
+
####Scenario
@@ -11,7 +11,7 @@ An order is received for ten Wind Turbines. Sales Order is also created for ten
In this case, create Delivery Note and Sales Invoice will be created only for the seven units. And the Sales Order should be set as stopped.
-
+
Once Sales Order is set as stopped, you will not have pending quantities (three in this case) reflecting in Pending to Deliver and Pending to Invoice reports. To make further transactions against Stopped Sales Order, you should first Unstop it.
diff --git a/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md b/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md
index bf823234..f379e991 100644
--- a/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md
+++ b/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md
@@ -11,19 +11,19 @@ In ERPNext, you can create a Drop Shipping by creating Purchase Order against Sa
Set **_Delivered by Supplier (Drop Ship)_** and **_Default Supplier_** in Item Master.
-
+
#### Setup on Sales Order
If Drop Shipping has set on Item master, it will automatically set **Supplier delivers to Customer** and **Supplier** on Sales Order Item.
You can setup Drop Shipping, on Sales Order Item. Under **Drop Ship** section, set **Supplier delivers to Customer** and select **Supplier** agaist which Purchase Order will get created.
-
+
#### Create Purchase Order
After submitting a Sales Order, create Puchase Order.
-
+
From Sales Order, all items, having **Supplier delivers to Customer** checked or **Supplier**(matching with supplier selected on For Supplier popup) mentioned, will get mapped onto Purchase Order.
@@ -31,16 +31,16 @@ It will automatically set Customer, Customer Address and Contact Person.
After submitting Purchase Order, to update delivery status, use **Mark as Delivered** button on Purchase Order. It will update delivery percetage and delivered quantity on Sales Order.
-
+
+
###Drop Shipping Print Format
You can notify, Suppliers by sending a email after submitting Purchase Order by attaching Drop Shipping print format.
-
+
###Video Help on Drop Ship
diff --git a/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md b/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
index 3540e673..4e39d416 100644
--- a/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
+++ b/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
@@ -15,7 +15,7 @@ The setup for a Service company differs primarily for Items. They don't maintain
To create a Service (non-stock) Item, in the item master, uncheck "Maintain Stock" field.
-
+
When creating Sales Order for the services, select Order Type as **Maintenance**. Sales Order of Maintenance Type needs lesser details compared to stock item's order like Delivery Note, item warehouse etc.
diff --git a/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md b/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
index fb87b011..2f8ba8bf 100644
--- a/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
+++ b/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
@@ -5,13 +5,13 @@ In ERPNext, Sales Person master is maintained in [tree structure](/docs/user/man
Sales Persons can be updated in the Customer master as well. On selection of Customer in the transactions, Sales Persons as updated in the Customer will fetch into sales transaction.
-
+
####Sales Person Contribution
If more than one sales persons are working together on an order, then contribution (%) should be set for each Sales Person.
-
+
On saving transaction, based on the Net Total and Contriution (%), `Contribution to Net Total` will be calculated for each Sales Person.
@@ -25,7 +25,7 @@ Check Sales Person's Transaction report from:
This report can be generated based on Sales Order, Delivery Note and Sales Invoice. It will give you total amount of sale made by an employe.
-
+
####Sales Person wise Commission
diff --git a/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md b/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md
index 06a23cf4..c7ea46fe 100644
--- a/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md
+++ b/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md
@@ -11,7 +11,7 @@ To setup Shipping Rule, go to:
####Shipping Rule Conditions
-
+
Referring above, you will notice that shipping charges are reducing as valye is increasing. This shipping charge will only be applied if transaction total falls under one of the above range.
@@ -19,16 +19,16 @@ Referring above, you will notice that shipping charges are reducing as valye is
You can set Shipping Charges valid for all the countries, or specify specific Country. If specific countries mentioned, then Shipping Charges will be applied only if Customer's country matches Country mentioned in the Shipping Rule.
-
+
####Shipping Account
If shipping charges are applied based on Shipping Rule, then more values like Shipping Account, Cost Center will be needed as well to add row in the Taxes and Other Charges table of transaction. Hence these details are tracked as well in the Shipping Rule.
-
+
####Shipping Rule Application
Following is an example of how shipping charges is auto-applied on Sales Order based on Shipping Rule.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/selling/quotation.md b/foundation/www/docs/user/manual/en/selling/quotation.md
index 4ca10d57..4f0263fd 100644
--- a/foundation/www/docs/user/manual/en/selling/quotation.md
+++ b/foundation/www/docs/user/manual/en/selling/quotation.md
@@ -8,7 +8,7 @@ Invoice”or a **Quotation**.
A typical Selling flow looks like:
-
+
To create a new Quotation navigate to:
@@ -18,7 +18,7 @@ To create a new Quotation navigate to:
You can also create a Quotation from an Opportunity.
-
+
To understand taxes in detail visit [Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html).
diff --git a/foundation/www/docs/user/manual/en/selling/sales-order.md b/foundation/www/docs/user/manual/en/selling/sales-order.md
index 1fc023c2..ea9da6b0 100644
--- a/foundation/www/docs/user/manual/en/selling/sales-order.md
+++ b/foundation/www/docs/user/manual/en/selling/sales-order.md
@@ -12,7 +12,7 @@ a Sales Order.
### Sales Order Flow-Chart
-
++
On selection of Price List, its currency and for selling or buying property will be fetched as well.
@@ -27,13 +27,13 @@ Step 2: Select Item
Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
-+
++
Step 3: Enter Rate
Enter selling/buying rate of an item in Price List currency.
-+
++
Step 4: Save Item Price
diff --git a/foundation/www/docs/user/manual/en/selling/setup/product-bundle.md b/foundation/www/docs/user/manual/en/selling/setup/product-bundle.md
index 4711b830..035aadfe 100644
--- a/foundation/www/docs/user/manual/en/selling/setup/product-bundle.md
+++ b/foundation/www/docs/user/manual/en/selling/setup/product-bundle.md
@@ -12,7 +12,7 @@ To create new Product Bundle, Go to:
Selling > Setup > Product Bundle > New
-
+
In this table, you should select Item Group, Fiscal Year, Target Qty and Amount.
@@ -37,7 +37,7 @@ To check this report, go to:
This report will provide you variance between target and actual performance of Sales Person. This report is based on Sales Order report.
-
+
As per the report, allocated target to Sales Person for the month of December was 5 qty. However, Sales Order was made for this employee and Item Group for only 3 qty. Hence, variance of 2 qty is shown in the report.
@@ -53,7 +53,7 @@ To allocate target to Sales Person based on Territory, you can should select spe
In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master.
-
+
####2.2 Allocating Target
@@ -67,7 +67,7 @@ Using this Monthly Distribution document, you can divide target Qty or Amount ac
This report will provide you variance between target and actual performance of Sales in particular territory. This report is based on Sales Order report. Though Sales Person is defined in the Territory master, its details are not pulled in the report.
-
+
---
@@ -79,7 +79,7 @@ To create new Monthly Distriibution, go to:
`Accounts > Monthly Distributon`
-
+
You can link Monthly Distribution while allocating targets in Sales Person as well as in Territory master.
diff --git a/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md b/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md
index 365069d7..5c818898 100644
--- a/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md
+++ b/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md
@@ -4,7 +4,7 @@
Selling Setting is where you can define propertiese which will be applied in your selling transactions.
Let's check into each property one by one.
-
+
####Step 2: Set New Password
-
+
Enter the new password and save the form to save changes.
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md b/foundation/www/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
index e30d976d..39f53297 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
@@ -13,7 +13,7 @@ In Company master, click on the **Delete Company Transactions** button right at
This action will wipe out all the data related to that company like Quotation, Invoices, Purchase Orders etc. So be careful
-
+
**Note:** If you want to delete the company record itself, use the normal "Delete" button from Menu options. It will also delete Chart of Accounts, Chart of Cost Centers and Warehouse records for that company.
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md b/foundation/www/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md
index d42a8de4..48c8b6c4 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md
@@ -17,4 +17,4 @@ How to check if Role is for System User or Website User?
In the Role master, if field "Desk Access" is checked, that Role is for System User. If Desk Access field is unchecked, then that Role is for Website User.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md b/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
index 3e6d90af..aa90d36d 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
@@ -7,19 +7,19 @@ To edit submitted document, you need to cancel it first. Followings are steps to
You will find Cancel button on upper right corner of submitted document.
-
+
####Step 2: Amend the document
On cancellation of submitted document, Amend button will be became visible.
-
+
####Step 3: Save and Submit the document
On clicking Amend button, same document will become editable again. After Making required changes, save and submit the document.
-
+
+
This indicates that using login credentials and other email gateway details provided in the Email Account, ERPNext is not able to connect to your email server. Please ensure that you have entered valid email credentials for your Email Gateway. Once you have configured Email Account successfully, you should be able to send and receive emails from your ERPNext account fine.
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md b/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
index b84e449d..3ced7927 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
@@ -17,7 +17,7 @@ Following are the steps to add new Company.
Company will be saved with Company Name provided.
-
+
Also, you can define other properties for new company like:
@@ -29,12 +29,12 @@ Also, you can define other properties for new company like:
Value will be auto-filled in most of these field to define company-wise defaults. You can edit/customize it as per your requirement.
-
+
####Chart of Account for New Company
A separate Chart of Account master will be set for each company in the ERPNext. This allows you managing Accounts/Ledger master separately for each company. Also it allows you avail financial statement and reports like Balance Sheet and Profit and Loss Statement separately for each company.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/managing-perm-level.md b/foundation/www/docs/user/manual/en/setting-up/articles/managing-perm-level.md
index 552ea718..38c1c805 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/managing-perm-level.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/managing-perm-level.md
@@ -5,7 +5,7 @@ In each document, you can group fields by "levels". Each group of field is denot
Perm Level for a field can be defined in the [Customize Form](/docs/user/manual/en/customize-erpnext/customize-form.html).
-
+
If you need to assign different permission of particular field to different users, you can achieve it via Perm Level. Let's consider an example for better understanding.
@@ -15,11 +15,11 @@ For the amount related fields, you should set Perm Level as (say) 2.
For Stock Manager, they will have permission on fields on Delivery Note as Perm Level 2 whereas a Stock User will not have any permission on Perm Level 2 for Delivery Note.
-
+
Considering the same scenario, if you want a Stock User to access a field at Perm Level 2, but not edit it, the Stock User will be assigned permission on Perm Level 2, but only for read, and not for write/edit.
-
+
Perm Level (1, 2, 3) not need be in order. Perm Level is primarily for grouping number of fields together, and then assigning permission to Roles for that group. Hence, you can set any perm level for an item, and then do permission setting for it.
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md b/foundation/www/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
index 0547cd1f..83611e14 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
@@ -25,7 +25,7 @@ Following are the steps to manage and create record in the tree structured maste
####Step 2 : Parent Territory
-
+
When click on Parent territory, you will see option to add child territory under it. All default Territory groups will be listed under Parent group called "All Territories". You can add further Parent or child Territory Groups under it.
@@ -43,11 +43,11 @@ If Group Node selected as Yes, then this Territory will be created as Parent, wh
+
Following is how Child Territories will be listed under a Parent Territory.
-
+
Following this steps, you can manage other tree masters as well in ERPNext.
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/naming-series-current-value.md b/foundation/www/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
index 715a86db..598d819f 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
@@ -15,19 +15,19 @@ For example, you have 322 Sales Orders created in your old system with SO00322 a
#### Update Series Section
-
+
#### Select Prefix
Considering our scenario, prefix for Sales Order will be "SO".
-
+
#### Current Value
If you have currently 12 Sales Orders created in your account, then current value updated will be 12. You can edit Current Value to 322, and then click on Update Series Number.
-
+
With this setting, you will have numbering for the New Sales Orders starting with #323.
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md b/foundation/www/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md
index 56b3e4b4..4223da8c 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md
@@ -3,7 +3,7 @@
In the ERPNext, you can customize incoming and Outgoing Email Gateway. On saving an Email Account, ERPNext tries establishing a connection with your email gateway. If your ERPNext account is able to connect fine, then Email Account master is saved. If not, then you might receive an error as indicated below.
-
+
This indicates that using login credentials and other email gateway details provided, ERPNext is not able to connect to your email server. Please ensure that you have entered valid email credentials for your Email Gateway. Once you have configured Email Account successfully, you should be able to send and receive emails from your ERPNext account fine.
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md b/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md
index 391d37f9..25c00186 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md
@@ -15,7 +15,7 @@ Template Used for overwriting data will be same as one used for importing new it
Since items to be over-written will be already available in the system, while downloading template, click on "Download with data" to get all the existing items in the template.
-
+
####Step 2: Prepare Data
@@ -23,7 +23,7 @@ In the template, we can only keep rows of the items to be overwritten and delete
Enter new value in the Item Group column for an item. Since Item Group is a master in itself, ensure Item Group entered in the spreadsheet file is already added in the Item Group master.
-
+
Since we are overwriting only Item Group, only following columns will be mandatory.
@@ -37,13 +37,13 @@ Columns of other field which won't have any impact can be removed, even if they
After updating Item Groups in spreadheet, come back to Data Import Tool in ERPNext. Browse and select the File/template which has data to be overwritten.
-
+
####Step 4: Upload
On clicking Import, Item Group will be over-written.
-
+
If validation of values fails, then it will indicate row no. of spreadsheet for which validation failed and needs correction. In that case, you should corrected value in that row of spreadsheet, and then import same file again. If validation fails even for one row, none of the records are imported/overwritten.
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/print-format-sections.md b/foundation/www/docs/user/manual/en/setting-up/articles/print-format-sections.md
index e9a78833..e6b09442 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/print-format-sections.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/print-format-sections.md
@@ -3,10 +3,10 @@
**Question:** In the Print Format, I am getting link breaks for each section. How can I disable it?
-
+
**Answer:** To disable line breaks for the section breaks, you should uncheck field "Show Line Breaks after Sections" in its Print Format.
Print Format Builder > Select Print Format > Edit Settings > Uncheck field "Show Line Breaks after Sections"
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md b/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md
index fc83df5e..74e02d00 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md
@@ -15,13 +15,13 @@ Open User to be renamed.
From Menu, select Rename.
-
+
#### Step 3: Update
Enter valid Email Address and click on Rename.
-
+
After successful renaming, User will be able login using updated user id.
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/report-permission-error.md b/foundation/www/docs/user/manual/en/setting-up/articles/report-permission-error.md
index 7a9dbe00..437644b1 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/report-permission-error.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/report-permission-error.md
@@ -1,7 +1,7 @@
**Question:** User has roles like Account User and Account Manager assigned. Still, when accessing Account Receivable report, User is getting an error message of no permission the territory master.
-
+
**Answer:**
@@ -13,6 +13,6 @@ As per the permission system in ERPNext, for the User to be able to access a for
3. To resolve this issue, I have assigned Account User permission to Read Territory master.
- 
+ 
As per this permission update, User should be able to access Account Receivable report fine.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md b/foundation/www/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md
index d2940d60..e15fd974 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md
@@ -13,30 +13,30 @@ Specify the following in System Settings
* The expiry time for the QR Code on the server if OTP App is specified
* The OTP Issuer Name.
-
+
On activation of 2FA from setup, it is also activated for the Role "All". In this way, all users including the Administrator have to perform a 2nd level authentication with a token. By unchecking the "Two Factor Authentication" checkbox in the "All" role and enabling it in other roles, the need to login with a token can be limited to specific roles. 2FA does not apply to login by Web Users and API login
-
+
If using SMS authentication, please make sure that your SMS settings are updated
-
+
If using Email, make sure that your outgoing Email account settings are updated
-
+
When the new user tries to log in for the first time in a system that has two-factor authentication enabled and which has the authentication option as OTP App, an email is sent containing a link to the QR Code.
-
-
+
+
Scanning the QR Code with an authentication app like Google Authenticator registers the access for the user and automatically starts to generate tokens that can be used to login
-
+
If either of Email/SMS is used as the authentication method, you get notifications also
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md b/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md
index 8d50856e..5fa1a776 100644
--- a/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md
+++ b/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md
@@ -37,7 +37,7 @@ Select approvers Role. It will be Sales Manager role which if assigned to user,
Set Above Value. Given the exmaple, Above Value will be set as 10000.
-
+
### 2\. Fill in the Template
After downloading the template, open it in a spreadsheet application and fill
in the data below the column headings.
-
+
Then export your template or save it as a Excel or Comma Separated Values (CSV)
file. To export the document in Excel tick the checkbox for Download in Excel File Format
-
+
### Download in Excel
-
+
### 3\. Upload the File ethier in .xlsx or .csv
Finally attach the file in the section. Click on the "Upload". Once the upload is successfull click Import"
button.
-
+
#### Notes:
diff --git a/foundation/www/docs/user/manual/en/setting-up/data/download-backup.md b/foundation/www/docs/user/manual/en/setting-up/data/download-backup.md
index b87cf274..55389c63 100644
--- a/foundation/www/docs/user/manual/en/setting-up/data/download-backup.md
+++ b/foundation/www/docs/user/manual/en/setting-up/data/download-backup.md
@@ -7,8 +7,8 @@ In the ERPNext, you can manually download database backup. To get the latest dat
Backup available for the download is updated in every eight hours. Click on the link to download the backups at a given time.
-
+
By default three latest backups will be available for the download. If you want to customize no. of backups, then click on "Set Number of Backups". In the System Settings, you can set Number of Backups available for the download at a time.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-account.md b/foundation/www/docs/user/manual/en/setting-up/email/email-account.md
index 5ed19a79..257270c5 100644
--- a/foundation/www/docs/user/manual/en/setting-up/email/email-account.md
+++ b/foundation/www/docs/user/manual/en/setting-up/email/email-account.md
@@ -11,7 +11,7 @@ ERPNext will create templates for a bunch of email accounts by default. Not all
There are 2 types of email accounts, outgoing and incoming. Outgoing email accounts use an SMTP service to send emails and emails are retrived from your inbox using a IMAP or POP service. Most email providers such as GMail, Outlook or Yahoo provide these services.
-
+
### How ERPNext handles replies
@@ -41,6 +41,6 @@ In ERPNext when you send an email to a contact like a customer, the sender will
If you would like ERPNext to notify you if an email is unreplied for a certain amount of time, then you can set **Notify if Unreplied**. Here you can set the number of minutes to wait before notifications are sent and whom the notifications must go to.
-
+
### Setting Conditions
Email alerts allow you to set conditions according to the field data in your documents. For example, if you want to recieve an Email if a Lead has been saved as "Interested" as it's status, you put `doc.status == "Interested"` in the conditions textbox. You can also set more complex conditions by combining them.
-
+
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.
@@ -75,14 +75,14 @@ field.
Then you can use that as a condition in the **Condition** rules to ensure emails are not sent multiple times
-
+
#### Step 2: Create Email Domain
@@ -23,7 +23,7 @@ To add new Email Domain, go to:
`Setup > Emails > Email Domain > New`
-
+
Once you have configured an Email Domain for your Email Service, it will be used for creating Email Accounts for all the Users in your ERPNext account.
@@ -44,11 +44,11 @@ Create an Email Account based on the Email ID of the User. For each User who's e
If you are creating an Email Account for your colleague who's Email Password is unknown to you, then check field "Awaiting Password". As per this setting, a User (for whom Email Account is created) will get a prompt to enter email password when accessing his/her ERPNext Account.
-
+
In the Email Account, select Email Domain only if you are using Email Service other than Email Services listed above. Else, you can just select Email Service, leave Email Domain blank and proceed forward.
-
+
>If you are creating an Email Account for Email Inbox of a User, then leave Append To field as blank.
@@ -58,30 +58,30 @@ For more details on how to setup Email Account, [click here](/docs/user/manual/e
Once an Email Account is created for an User, select that Email Account in the User. This will ensure that emails pulled from the said Email ID will accessible only to this User in your ERPNext account.
-
+
## Email Inbox
If you have correctly configured Email Inbox as instructed above, then on the login of a User, Email Inbox icon will be visible. This will navigate user to Email Inbox view within the ERPNext account. All the Emails received on that email will be fetch and listed in the Email Inbox view. User will be able to open emails and take various actions against it.
-
+
#### Folders
In ERPNext, you can link multiple Email Accounts with the single User. To switch to Inbox of different email account and access other folders like Sent Emails, Spam, Trash, check Email Inbox option in the left bar.
-
+
#### Actions
On the emails in your inbox, you can take various actions like Reply, Forward, Mark as Spam or Trash.
-
+
#### Make Options
The Email Inbox within ERPNext also allow you to quickly create ERPNext transaction based on email received. From an Email itself, you can a Issue, Lead or Opportunity based on the context of the email.
-
+
diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-reports.md b/foundation/www/docs/user/manual/en/setting-up/email/email-reports.md
index b9e63043..268ff65f 100644
--- a/foundation/www/docs/user/manual/en/setting-up/email/email-reports.md
+++ b/foundation/www/docs/user/manual/en/setting-up/email/email-reports.md
@@ -15,7 +15,7 @@ Or just type "Auto Email Report" on the Search bar.
Select the Report, the user for which you want to create this report (permissions will apply for this user), the Email Addresses where you want this report emailed and the frequency of the report.
-
+
#### Step 2
@@ -23,11 +23,11 @@ If your report has filters, you will see a table with the filters
Step 1. Select the Report, the user for which you want to create this report. Permissions will apply for this user
-
+
Click on the table to edit the table
-
+
#### Test
@@ -35,4 +35,4 @@ You can also test the report by clicking on "Download" or "Send Now"
Here is an example of the email you will receive for a report
-
+
diff --git a/foundation/www/docs/user/manual/en/setting-up/email/sending-email.md b/foundation/www/docs/user/manual/en/setting-up/email/sending-email.md
index 8a6a83d1..80db0233 100644
--- a/foundation/www/docs/user/manual/en/setting-up/email/sending-email.md
+++ b/foundation/www/docs/user/manual/en/setting-up/email/sending-email.md
@@ -3,7 +3,7 @@
In ERPNext you can send any document as email (with a PDF attachment) by clicking on `Menu > Email` from any open document.
-
+
Then, user can enter the feedback request details like email id, message and send the
feedback request mail.
-
+
Note. If Feedback Trigger is already configured for the document then system will fetch
Feedback Request details (email id, message)
diff --git a/foundation/www/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md b/foundation/www/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md
index e4fdc5ea..dfc3f7db 100644
--- a/foundation/www/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md
+++ b/foundation/www/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md
@@ -3,15 +3,15 @@
We can also Resend the Feedback Request to the Customer/User.
-
+
To resend the Feedback Request we will need to navigate the Communication by clicking the `Details` link on Timeline Feedback.
-
+
On Resend Button click a dialog with the Feedback Request message will appear user can either send the
Feedback Request with same message or he/she can make the changes in the Feedback Request message.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md b/foundation/www/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md
index 3060b95b..75e9fd23 100644
--- a/foundation/www/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md
+++ b/foundation/www/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md
@@ -20,13 +20,13 @@ To Setup an Feedback:
### Setting a Subject
You can retrieve the data for a particular field by using `doc.[field_name]`. To use it in your subject/message, you have to surround it with `{% raw %}{{ }}{% endraw %}`. These are called [Jinja](http://jinja.pocoo.org/) tags. So, for example, to get the name of a document, you use `{% raw %}{{ doc.name }}{% endraw %}`. The below example sends an feedback request whenever Issue is Closed with the Subject, "ISS-##### Issue is Resolved"
-
+
### Setting Conditions
Feedback Trigger allows you to set conditions according to the field data in your documents. The feedback request email will be sent on document save only if the all conditions are true For example if you want to trigger the feedback request mail to a customer if an Issue is has been saved as "Closed" as it's status, you put `doc.status == "Closed"` in the conditions textbox. You can also set more complex conditions by combining them.
-
+
### Setting a Message
@@ -46,9 +46,9 @@ You can use both Jinja Tags (`{% raw %}{{ doc.[field_name] }}{% endraw %}`) and
### Example
1. Setting up Feedback Trigger
- 
+ 
1. Setting the Recipients and Message
- 
+ 
{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/feedback/submit-feedback.md b/foundation/www/docs/user/manual/en/setting-up/feedback/submit-feedback.md
index 3794aea7..083fa0ca 100644
--- a/foundation/www/docs/user/manual/en/setting-up/feedback/submit-feedback.md
+++ b/foundation/www/docs/user/manual/en/setting-up/feedback/submit-feedback.md
@@ -4,17 +4,17 @@
Once feedback request mail is sent the user/customer. He/She can visit the URL to submit the feedback
as well as rating for the document.
-
+
Once Feedback is submitted the feedback details message and ratings will be recorded and will be shown on Document sidebar and timeline. Also once the Feedback is successfully submitted by the user the link shared to the user will be expired and can not be used to submit the Feedback again.
On Document sidebar the latest feedback ratings will displayed.
-
+
Also, The Feedback details such as Feedback message and ratings will be shown in the Document's Timeline along
with Comment, Email.
-
+
####Step 2: Allow Dropbox Access
@@ -22,40 +26,53 @@ After setting frequency and updating other details, click on `Allow Dropbox acce
Login to your Dropbox account by entering login credentials.
-
+
####Step 4: Allow
On successful login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account.
-
+
With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it.
-##Open Source Users
-####Step 1: Go to
+##Open Source Version Instructions
+
+####Step 1: Login to Dropbox Developer area
+
-####Step 3: Fill in details for the app
+####Step 3: Fill in the details for your new app
-
+
-
-
+
-####Step 4: Setup Redirect URL in app
+####Step 4: Insert your custom domain Redirect URI
-
+`https://{yourwebsite.com}/api/method/frappe.integrations.doctype.dropbox_settings.dropbox_settings.dropbox_auth_finish`
-####Step 5: Settings in Site Config
+
-After the app is created, note the app key and app secret on Dropbox Settings page or enter in `sites/{sitename}/site_config.json` as follows,
+####Step 5: In a new window, open the Dropbox Settings page in your ERPnext installation
+
+####Step 6: Set backup frequency and email
+
+Set the frequency to download your site backups to your Dropbox account.
+
+
+
After setting up LDAP parameters, on login screen, the system enables **Login Via LDAP** option.
-
+
diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/paypal-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/paypal-integration.md
index 9e78752a..d3d58d4c 100644
--- a/foundation/www/docs/user/manual/en/setting-up/integrations/paypal-integration.md
+++ b/foundation/www/docs/user/manual/en/setting-up/integrations/paypal-integration.md
@@ -12,17 +12,17 @@ To setup PayPal ,
To enable PayPal payment service, you need to configure parameters like API Username, API Password and Signature.
-
+
You also can set test payment environment, by settings `Use Sandbox`
On enabling service, the system will create Payment Gateway record and Account head in chart of accounts having account type as Bank.
-
+
Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
-
+
After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
@@ -34,20 +34,20 @@ AUD, BRL, CAD, CZK, DKK, EUR, HKD, HUF, ILS, JPY, MYR, MXN, TWD, NZD, NOK, PHP,
#### Paypal Sanbox API Signature
- Login to paypal developer account, 
+
- From this account profile you will get your sandbox api credentials
-
+
---
#### PayPal Account API Signature
- Login to PayPal Account and go to profile
-
+
- From **My Selling Tools** go to **api Access**
-
+
- On API Access Page, choose option 2 to generate API credentials
-
+
diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md
index 564410ae..72245f0a 100644
--- a/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md
+++ b/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md
@@ -9,21 +9,21 @@ To setup RazorPay,
`Explore > Integrations > RazorPay Settings`
-
+
#### Setup RazorPay
To enable RazorPay payment service, you need to configure parameters like API Key, API Secret
-
+
On enabling service, the system will create Payment Gateway record and Account head in the Chart of Account with account type as Bank.
-
+
Also, it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
-
+
After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/stripe-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/stripe-integration.md
index 6bd00e20..4665b84c 100644
--- a/foundation/www/docs/user/manual/en/setting-up/integrations/stripe-integration.md
+++ b/foundation/www/docs/user/manual/en/setting-up/integrations/stripe-integration.md
@@ -7,15 +7,15 @@ To setup Stripe,
#### Setup Stripe
To enable Stripe payment service, you need to configure parameters like Publishable Key, Secret Key
-
+
On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank.
-
+
Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
-
+
After configuring Payment Gateway Account your system is able to accept online payments.
diff --git a/foundation/www/docs/user/manual/en/setting-up/pos-setting.md b/foundation/www/docs/user/manual/en/setting-up/pos-setting.md
index 74f3450b..d83dbbdc 100644
--- a/foundation/www/docs/user/manual/en/setting-up/pos-setting.md
+++ b/foundation/www/docs/user/manual/en/setting-up/pos-setting.md
@@ -15,13 +15,13 @@ from:
Set default values as defined.
-
+
To set the default mode of payment, enabled the option default in the mode of payments table
-
+
User can sale the particular products to the particular customers from the POS by adding item groups, customer groups in the POS Profile.
-
+
> Important : If you specify a particular User, the POS setting will be
applied only to that User. If the User option is left blank, the setting will
diff --git a/foundation/www/docs/user/manual/en/setting-up/price-lists.md b/foundation/www/docs/user/manual/en/setting-up/price-lists.md
index 66f06b46..ba4672f7 100644
--- a/foundation/www/docs/user/manual/en/setting-up/price-lists.md
+++ b/foundation/www/docs/user/manual/en/setting-up/price-lists.md
@@ -11,7 +11,7 @@ You can create new Price List
> Selling/Buying/Stock > Setup > Price List >> New
-
+
Using the Cheque Print Template you can generate a new Print Format based. It will be created based the cheque format provided by your bank.
@@ -15,13 +15,13 @@ To create a new Print Format based on the specific cheque’s format, go to:
In the Cheque Print Template, for each value (say Payee, Date), exact co-ordinates are provided based on where that value should be printed on a cheque. Co-ordinates are provided in centi-meter.
-
+
####New Format via Scanning
To speed up creation of a new cheque printing format, you can upload scanned image of the cheque. Considering the scanned image for the cheque, system automatically updates co-ordinates for each value like party name, amount, date, amount in words etc.
-
+
####New format by manual entry
You can manually provide the co-ordinate for each value based on where you want to to be printed on the cheque.
@@ -29,18 +29,18 @@ You can manually provide the co-ordinate for each value based on where you want
####Preview
Based on co-ordinates provided for all the values, a preview be shown as to how the values will be printed on the cheque.
-
+
####New Print Format
If the preview looks promising, click on the button to create a new Print Format for printing cheque. Based on the values provided in the Cheque Print Template, the system will auto-generate an HTML script for the cheque’s Print Format.
-
+
####Printing Cheque
New print format generated for the cheque will be visible in the Payment Entry form. After creating the payment entry, you will be able to print transaction details on the cheque.
-
+
diff --git a/foundation/www/docs/user/manual/en/setting-up/print/custom-translations.md b/foundation/www/docs/user/manual/en/setting-up/print/custom-translations.md
index 3d73bbe7..c2edc3ad 100644
--- a/foundation/www/docs/user/manual/en/setting-up/print/custom-translations.md
+++ b/foundation/www/docs/user/manual/en/setting-up/print/custom-translations.md
@@ -7,11 +7,11 @@ User can print the customer's and supplier's document in their local language. F
In the Customer master, select default Language. Say default language for the Customer is deutsch.
-
+
Same way, you can also set default language in the Supplier master.
-
+
####Print Preview in the Party's Language
@@ -19,17 +19,17 @@ In the Print Preview of a transaction, values will be translated into party's la
Customer Quotation print preview in customer's default language.
-
+
Supplier Quotation print preview in supplier's default language.
-
+
####What to do if want to print with another language?
User can have option to select alternate language on print view.
-
+
####Custom Translation
@@ -37,11 +37,11 @@ User can set their custom translations using translation form. For example user
`Setup > Settings > Translation List > New`
-
+
The translation is applied when user select language as Italiano on supplier quotation's print preview.
-
+
diff --git a/foundation/www/docs/user/manual/en/setting-up/print/letter-head.md b/foundation/www/docs/user/manual/en/setting-up/print/letter-head.md
index 8ee6c7b5..92aa65f9 100644
--- a/foundation/www/docs/user/manual/en/setting-up/print/letter-head.md
+++ b/foundation/www/docs/user/manual/en/setting-up/print/letter-head.md
@@ -20,7 +20,7 @@ Following is how you can enter details in the Letter Head.
* Logo Image: You can insert the image in your Letter Head record by clicking on image icon. Once image is inserted, HTML for it will be generated automatically.
* Other information (like Address, tax ID etc.) that you want to put on your letter head.
-
+
{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/print/terms-and-conditions.md b/foundation/www/docs/user/manual/en/setting-up/print/terms-and-conditions.md
index 6ae9f2b3..34a9f3c5 100644
--- a/foundation/www/docs/user/manual/en/setting-up/print/terms-and-conditions.md
+++ b/foundation/www/docs/user/manual/en/setting-up/print/terms-and-conditions.md
@@ -9,13 +9,13 @@ To setup Terms and Condition master, go to:
`Selling > Terms and Condition > New`
-
+
You can set the **Sales Target** field to track progress to track progress with respect to it.
-
+
The target progress is also shown in notifications:
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setting-up-taxes.md b/foundation/www/docs/user/manual/en/setting-up/setting-up-taxes.md
index c163a507..d9d51462 100644
--- a/foundation/www/docs/user/manual/en/setting-up/setting-up-taxes.md
+++ b/foundation/www/docs/user/manual/en/setting-up/setting-up-taxes.md
@@ -25,11 +25,11 @@ sales or purchase tax rate specified by you as default rates.
Item Tax table can be found as a section within the Item Master document.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/__init__.py b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.md
index 7e08678a..fcd35b95 100644
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.md
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.md
@@ -1,7 +1,7 @@
# Setup Wizard
-The Setup Wizard helps you quickly setup ERPnext as per your locale and sets up your organisation.
+The Setup Wizard helps you quickly setup ERPnext as per your locale and sets up your organization.
Here is a quick overview of the steps:
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.txt b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.txt
index b2f680a3..91c3afc6 100644
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.txt
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.txt
@@ -1,5 +1,12 @@
-step-1-language
-step-2-currency-and-timezone
-step-3-user-details
-step-4-two-factor-authentication
-step-5-company-details
+step-01-language
+step-02-currency-and-timezone
+step-03-user-details
+step-04-select-domain
+step-05-the-brand
+step-06-your-organization
+step-07-setup-company-complete
+step-08-set-sales-target
+step-09-customers
+step-10-letterhead
+step-11-suppliers
+step-12-users
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md
similarity index 74%
rename from foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
rename to foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md
index e1dd3e29..04950aed 100644
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md
@@ -3,7 +3,7 @@
Select your language. ERPNext is available in more than 20 languages.
-
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md
new file mode 100644
index 00000000..e979bb78
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md
@@ -0,0 +1,12 @@
+
+# Step 4: Select Domain
+
+Select the domain(s) that will be enabled after setup.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md
new file mode 100644
index 00000000..7cdbf2f1
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md
@@ -0,0 +1,18 @@
+
+# Step 5: The Brand
+
+Enter Company Name, Abbreviation and add a logo.
+
+
+
+### Company Abbreviation
+
+These will be appended to your **Account** Heads, for example if your abbreviation is **WPL**, then your Sales account will be **Sales - WPL**
+
+For Example: East Wind will be abbreviated as EW. Shades of Green will be abbreviated as SOG. In case you wish to give your own abbreviation, you can do so. The text field allows any type of text.
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md
new file mode 100644
index 00000000..8cf37fb1
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md
@@ -0,0 +1,24 @@
+
+# Step 6: Your Organization
+
+Enter in a short sentence of what your company does. This is often a mission statement or vision statement.
+
+Add the name of the organization's primary financial institution. This information will populate **Accounts**.
+
+
+
+### Chart of Accounts
+
+Select whether the organization will use a standard chart of accounts without number or a standard chart of accounts with numbers. The out of box chart of accounts is the same either way.
+
+### Financial Year
+
+Any annual period at the end of which a firm's accounts are made up is called a Financial Year. Some countries have their account year starting from 1st January and some 1st April.
+
+The end date will be set automatically
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md
new file mode 100644
index 00000000..f54bb4db
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md
@@ -0,0 +1,16 @@
+
+# Step 7: Initial Setup Complete
+
+The initial setup wizard will create all the settings needed including the first system manager user.
+
+
+
+When complete, the Setup Wizard will go to the Desk and begin a secondary set of steps. This screen shows that the initial setup wizard is complete and begins the secondary setup wizard.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md
new file mode 100644
index 00000000..f285dd1e
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md
@@ -0,0 +1,16 @@
+
+# Step 8: Set Sales Target
+
+Set a monthly sales target for the organization in the currency selected during Step 2.
+
+
+
+If a sales target is not known, then clicking **Mark as Done** will complete the step.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md
new file mode 100644
index 00000000..bf332107
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md
@@ -0,0 +1,16 @@
+
+# Step 9: Add Customers
+
+Add known customers to the system.
+
+
+
+If customers are not known, then clicking **Mark as Done** will complete the step.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md
new file mode 100644
index 00000000..0dd54e55
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md
@@ -0,0 +1,16 @@
+
+# Step 10: Company Letter Head
+
+Add a company logo to be used as a standard letter head on all printed invoices and other document types. Ideally the logo is 900px by 100px.
+
+
+
+If a letter head logo file is not available, the clicking **Mark as Done** will complete the step.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md
new file mode 100644
index 00000000..e084c1a5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md
@@ -0,0 +1,21 @@
+
+# Step 11: Add Suppliers
+
+Add known suppliers to the system.
+
+
+
+If suppliers are not known, then clicking **Mark as Done** will complete the step.
+
+
+
+
+## Step 11a: Other Domain Specific Steps
+
+Depending on the domain(s) selected in Step 4, there will be more screens to fill in for the secondary setup wizard.
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md
new file mode 100644
index 00000000..a4618e0d
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md
@@ -0,0 +1,16 @@
+
+# Step 12: Add Users
+
+The last step in the secondary setup wizard will prompt to add more users to the system. These users will be regular non-privileged users.
+
+
+
+If users are not known, then clicking **Mark as Done** will complete the step.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md
deleted file mode 100644
index 40906e38..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Step 2: Currency and Timezone
-
-Set your country name, currency and timezone.
-
-
-
----
-
-Note: Add your own photograph, not your company's
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md
deleted file mode 100644
index f6e758c0..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Step 4: Two Factor Authentication
-
-Enable Two Factor Athentication
-
-
-
----
-###Authentication Method
-Whenevever each user logs in, based on the role set for that user,
-they will be asked for a **One Time Password** after they input
-their login details.
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md
deleted file mode 100644
index 63246bff..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# Step 5: Company Details
-
-Enter Company Details like Name, Abbreviation and Financial Year Details.
-
-
-
----
-
-### Company Abbreviation
-
-These will be appened to your **Account** Heads, for example if your abbreviation is **WP**, then your Sales account will be **Sales - WPL**
-
-For Example: East Wind will be abbreviated as EW. Shades of Green will be abbreviated as SOG. In case you wish to give your own abbreviation, you can do so. The text field allows any type of text.
-
-### Financial Year
-
-Any annual period at the end of which a firm's accounts are made up is called a Financial Year. Some countries have their account year starting from 1st January and some 1st April.
-
-The end date will be set automatically
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/sms-setting.md b/foundation/www/docs/user/manual/en/setting-up/sms-setting.md
index 5940346e..444f6c96 100644
--- a/foundation/www/docs/user/manual/en/setting-up/sms-setting.md
+++ b/foundation/www/docs/user/manual/en/setting-up/sms-setting.md
@@ -18,7 +18,7 @@ Example URL:
http://instant.smses.com/web2sms.php?username=
+
**How Stock Reconciliation Works**
diff --git a/foundation/www/docs/user/manual/en/setting-up/territory.md b/foundation/www/docs/user/manual/en/setting-up/territory.md
index 35c19aaa..5878bf2a 100644
--- a/foundation/www/docs/user/manual/en/setting-up/territory.md
+++ b/foundation/www/docs/user/manual/en/setting-up/territory.md
@@ -8,6 +8,6 @@ each Item Group and get reports that will show your actual performance in the
territory v/s what you had planned.
You can also set different pricing for the same product sold across different territories.
-
-
+
+
After adding these details, save the user.
@@ -33,19 +33,19 @@ After adding these details, save the user.
After saving, you will see a list of roles and a checkbox next to it. Just check the roles you want the user to have and save the document. To click on what permissions translate into roles, click on the role
name.
-
+
+
4. **HR User should be able to delegate Leave Applications to his/her subordinates**
HR User is given the right to Set User Permissions. A User with HR User role would be able to defined User Permissions on Leave Application for other users.
-
+
### For Report
-
+
## Tool for custom roles assignment
@@ -17,10 +17,10 @@ If developer mode is disabled, then user can assign the roles to the page and re
To access, goto Setup > Permissions > Role Permission for Page and Report
-
+
### Reset to defaults
Using "Reset to Default" button, user can remove the custom permissions applied on a page or report. Then default permissions will be applicable on that page or report.
-
+
diff --git a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/sharing.md b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
index 602bd244..298060d9 100644
--- a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
+++ b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
@@ -5,6 +5,6 @@ In addition to user and role permissions, you can also Share a document with ano
To share a document, open the document, click on the "+" icon under sharing and select the user
-
+
If you want to apply the permissions to all Roles for that user, keep the "Apply Permissions for all Roles of this User" checked. If you check this, it will automatically setup the rules for Roles to check for User Permissions.
@@ -26,11 +26,11 @@ You can also manually edit the the roles for which you want the user permissions
Note that the "Apply User Permissions" is already checked for this role. Then click on "Select Document Types"
-
+
Here you will see that Company has already been checked. If you want user permissions not be applied for that particular rule, you can un check it.
-
+
### Ignoring User Permissions on Certain Fields
@@ -38,9 +38,11 @@ Another way of allowing documents to be seen that have been restricited by User
For example you don't want Assets to be restricited for any user, then select **Asset** in **Customize Form** and in the Company field, check on "Ignore User Permissions"
-
-### Strict Permisssions
+
+
+
+### Strict Permissions
Since User Permissions are applied via Roles, there may be many users belonging to a particular Role. Suppose you have three users belonging to Role "Accounts User" and you have applied **User Permissions** to only one user, then the permissions will only be restricted to that user.
@@ -50,4 +52,4 @@ You can change this setting incase you want the user permissions to be assigned
Finally once you have created your air-tight permission model, and you want to check how it applies to various users, you can see it via the **Permitted Documents for User** report. Using this report, you can select the **User** and document type and check how user permissions get applied.
-
+
diff --git a/foundation/www/docs/user/manual/en/setting-up/workflows.md b/foundation/www/docs/user/manual/en/setting-up/workflows.md
index d887b08f..a574ec45 100644
--- a/foundation/www/docs/user/manual/en/setting-up/workflows.md
+++ b/foundation/www/docs/user/manual/en/setting-up/workflows.md
@@ -14,7 +14,7 @@ will get an indication that the HR department has Accepted or Rejected. The
Manager, who is the approving authority, will either Approve or Reject this
request. Accordingly,the user will get his Approved or Rejected status.
-
+ 
* Create Stock Entry (Material Transfer) to transfer available stock from existing warehouse to new warehouse. As stock will be available in the new warehouse, you should select the new warehouse for all the future transactions.
diff --git a/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md b/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
index 769b5850..072882d7 100644
--- a/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -13,7 +13,7 @@ On receipt of items in a particular warehouse, the balance in the Warehouse Acco
> Setup > Company > Stock Settings > "Enable Perpetual Inventory"
-
+
Item's and Rate is also validated when creating Sales Invoice from Sales Order. Also when creating Purchase Receipt and Purchaes Invoice from Purchase Order. Updating "Allow over delivery or receipt upto this percent" will be affective in all sales and purchase transactions.
@@ -17,7 +17,7 @@ Update global value for "Allow over delivery or receipt upto this percent" from
3. Save Stock Settings.
-
+
diff --git a/foundation/www/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md b/foundation/www/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
index 1bd7f159..c6a705ef 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
+++ b/foundation/www/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
@@ -5,17 +5,17 @@ To prevent stockouts, you can track item's reorder level. When stock level goes
In ERPNext, you can update item's Reorder Level and Reorder Qty in the Item master. If same item has different reorder level, you can also update warehouse-wise reorder level and reorder qty.
-
+
With reorder level, you can also define what should be the next action. Either new purchase or transfer from another warehouse. Based on setting in Item master, purpose will be updated in the Material Request as well.
-
+
When item's stock reaches reorder level, Material Request is auto-created automatically. You can enable this feature from:
`Stock > Setup > Stock Settings`
-
+
A separate Material Request will be created for each item. User with Purchase Manager's role will receive email alert about these Material Requests.
diff --git a/foundation/www/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md b/foundation/www/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md
index e9ee86d6..f18163eb 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md
+++ b/foundation/www/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md
@@ -14,7 +14,7 @@ In the Attachment file, fill in the appropriate columns;
- **Qty (Quantity)** Leave this column blank.
- **Valuation Rate** will be item's value after depreciation.
-
+
After updating Valuation Rate for an item, come back to Stock Reconciliation and upload save .csv file.
@@ -22,7 +22,7 @@ After updating Valuation Rate for an item, come back to Stock Reconciliation and
Select Expense account for depreciation in **Difference Account**. Value booked in the depreciation account will be the difference of old and next valuation rate of the fixed asset item, which will be actually the depreciation amount.
-
+
####Stock Reconciliation Help Video
diff --git a/foundation/www/docs/user/manual/en/stock/articles/item-valuation-transactions.md b/foundation/www/docs/user/manual/en/stock/articles/item-valuation-transactions.md
index 7c1703e7..87f0ae3a 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/item-valuation-transactions.md
+++ b/foundation/www/docs/user/manual/en/stock/articles/item-valuation-transactions.md
@@ -9,10 +9,10 @@ In ERPNext, Item's stock valuation is updated on the creation of one of the foll
You can select valuation method based on which item's value will be calculated. Valuation Method can be set globally for all the items from the Stock Settings.
-
+
You can also set Valuation Method in the item master, especially when a valuation method for an item is different from the default Method.
-
+
[Click here to learn about the valuation methods available in the ERPNext, and how it works.](https://frappe.io/blog/erpnext-features/inventory-valuation-method-fifo-vs-moving-average)
diff --git a/foundation/www/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md b/foundation/www/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
index 47b71eaf..84615a66 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
+++ b/foundation/www/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
@@ -7,7 +7,7 @@ In the item master, you might witness values in the following fields to be froze
1. Has Batch No.
1. Has Serial No.
-
+
For an item, once stock ledger entry is created, values in these fields will be froze. This is to prevent user from changing value which can lead to mis-match of actual stock, and stock level in the system of an item.
diff --git a/foundation/www/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md b/foundation/www/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
index 912aa6eb..dfc3b24f 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
+++ b/foundation/www/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
@@ -5,7 +5,7 @@ Set of items which has same properties and attributes can be group in a single B
To maintain batches against an Item you need to mention 'Has Batch No' as yes in the Item Master.
-
+
You can create a new Batch from:
@@ -19,13 +19,13 @@ For the Batch item, updating Batch No. in the stock transactions (Purchase Recei
When creating Purchase Receipt, you should create new Batch, or select one of the existing Batch master. One Batch can be associated with one Batch Item.
-
+
#### Delivery Note
Define Batch in Delivery Note Item table. If Batch item is added under Product Bundle, you can update it's Batch No. in the Packing List table sa well.
-
+
#### Batch-wise Stock Balance Report
@@ -33,4 +33,4 @@ To check batch-wise stock balance report, go to:
Stock > Standard Reports > Batch-wise Balance History
-
+
diff --git a/foundation/www/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md b/foundation/www/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
index a98c75a7..8e4e3aae 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
+++ b/foundation/www/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
@@ -19,7 +19,7 @@ From the list of UoM, select UoM for which value in decimal place is to be restr
In the UoM master, you will find a field called "Must be whole number". Check this field to restrict user from enter value in decimal places in quantity field, for item having this UoM.
-
+
####Validation
@@ -27,7 +27,7 @@ While creating transaction, if you enter value in fraction for item whos UoM has
`Quantity cannot be a fraction at row #`
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
index f229af31..2ac67dfb 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
+++ b/foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
@@ -51,7 +51,7 @@ Update valuation rate, which will be per unit value of item. If different units
As per perpetual inventory valuation system, accounting entry is created for every stock transaction. Double entry accounting system requires Total Debit matching with Total Credit in an entry. On the submission of Stock Entry, system debits Warehouse account by total value of items. To balance the same, we use Temporary Opening account as a Difference Account.
-
+
#### Step 9: Save and Submit Stock Entry
diff --git a/foundation/www/docs/user/manual/en/stock/articles/repack-entry.md b/foundation/www/docs/user/manual/en/stock/articles/repack-entry.md
index 50620b2a..702cffa6 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/repack-entry.md
+++ b/foundation/www/docs/user/manual/en/stock/articles/repack-entry.md
@@ -23,7 +23,7 @@ For raw-material/input item, only Source Warehouse will be provided.
For repacked/output items, only Target Warehouse will be provided. You will have to provide valuation for the repack items.
-
+
Update Qty for all the items selected.
@@ -31,6 +31,6 @@ Update Qty for all the items selected.
On submitting Stock Entry, stock of input item will be reduced from Source Warehouse, and stock of repack/output item will be added in the Target Warehouse.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/articles/return-rejected-item.md b/foundation/www/docs/user/manual/en/stock/articles/return-rejected-item.md
index 54bbedf7..d06addb6 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/return-rejected-item.md
+++ b/foundation/www/docs/user/manual/en/stock/articles/return-rejected-item.md
@@ -11,4 +11,4 @@ If you are creating Purchase Return for the items received in the Rejected Wareh
For detailed steps on how to create Purchase Return Entry for the Rejected Item, refer to the below example.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md b/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md
index c8a2b2d9..ba25579a 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md
+++ b/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md
@@ -15,11 +15,11 @@ If received items already has its Serial No. barcoded, you can simply scan that
On submission of Purchase Receipt or Stock entry for the serialized item, Serial Nos. will be auto-generated.
-
+
Generated Serial numbers will be updated for each item.
-
+
###2. Serializing Manufacturing Item
@@ -29,12 +29,12 @@ To Serialize Manufacturing Item, you can define Series for Serial No. Generation
When Item is set as serialized, it will allow you to mentioned Series for it.
-
+
####2.2 Production Entry for Serialized Item
On submission of production entry for manufacturing item, system will automatically generate Serial Nos. following Series as specified in the Item master.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md b/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md
index 11c12abe..c330b3ba 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md
+++ b/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md
@@ -9,7 +9,7 @@ Material Issue entry create to issue item(s) from a warehouse. On submission of
Material Issue is generally made for the low value consumable items like office stationary, product consumables etc. Also you can create Material Issue to reconcile serialized and batched item's stock.
-
+
#### 2.Purpose: Material Receipt
@@ -17,25 +17,25 @@ Material Receipt entry is created to inward stock of item(s) in a warehouse. Thi
For the stock valuation purpose, provided Item Valuation becomes a mandatory field in the Material Receipt entry.
-
+
#### 3.Purpose: Material Transfer
Material Transfer entry is created for the inter-warehouse Material Transfer.
-
+
#### 4.Purpose: Material Transfer for Manufacture
In the manufacturing process, raw-materials are issued from the stores to the production department (generally WIP warehouse). This Material Transfer entry is created from Production Order. Items in this entry are fetched from the BOM of production Item, as selected in Production Order.
-
+
#### 4.Purpose: Manufacture
Manufacture is created from Production Order. In this entry, both raw-material item as well as production item are fetched from the BOM, selected in the Production Order. For the raw-material items, only Source Warehouse (generally WIP warehouse) is mentioned. For the production item, only target warehouse as mentioned in the Production Order is updated. On submission, stock of raw-material items are deducted from Source Warehouse, which indicates that raw-material items were consumed in the manufacturing process. Production Item is added to the Target Warehouse marking the completion of production cycle.
-
+
#### 5.Purpose: Repack
@@ -45,6 +45,6 @@ Repack Entry is created when items purchases in bulk is repacked under smaller p
Subcontracting transaction involves company transfer raw-material items to the sub-contractors warehouse. This requires adding a warehouse for the sub-contractor as well. Sub-contract entry transfers stock from the companies warehouse to the sub-contractors warehouse..
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md
index 893ae7bb..a88a6a41 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md
+++ b/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md
@@ -7,10 +7,10 @@ A barcode is a value decoded into vertical spaced lines. Barcode scanners are th
To set the barcode of a particular item, you will have to open the Item record. You can also enter barcode while creating a new item.
-
+
Once barcode field is updated in item master, items can be fetched using barcode. This feature will be availble in Delivery Note, Sales Invoice and Purchase Receipt transactions only.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/batch.md b/foundation/www/docs/user/manual/en/stock/batch.md
index b390e7f1..7bb04a62 100644
--- a/foundation/www/docs/user/manual/en/stock/batch.md
+++ b/foundation/www/docs/user/manual/en/stock/batch.md
@@ -12,7 +12,7 @@ To set item as a batch item, "Has Batch No" field should be checked in the Item
If you want automatic batch creation at the time of Purchase Receipt, you must check "Create New Batches Automatically"
-
+
### Creating Batches
@@ -26,7 +26,7 @@ To create new Batch No. master for an item, go to:
When you open a batch, you will see all the quantities relating this that batch on the page.
-
+
To move the batch from one warehouse to another, you can click on the move button.
diff --git a/foundation/www/docs/user/manual/en/stock/delivery-note.md b/foundation/www/docs/user/manual/en/stock/delivery-note.md
index 394672ae..b7a66bb4 100644
--- a/foundation/www/docs/user/manual/en/stock/delivery-note.md
+++ b/foundation/www/docs/user/manual/en/stock/delivery-note.md
@@ -16,7 +16,7 @@ create a new Delivery Note from:
or from a “Submitted” Sales Order (that is not already shipped) by clicking on
“Make Delivery Note”.
-
+
+Delivery Stops
+
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/index.txt b/foundation/www/docs/user/manual/en/stock/index.txt
index b89abe10..f807e736 100644
--- a/foundation/www/docs/user/manual/en/stock/index.txt
+++ b/foundation/www/docs/user/manual/en/stock/index.txt
@@ -16,3 +16,4 @@ purchase-return
articles
opening-stock
stock-how-to
+retain-sample-stock
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/installation-note.md b/foundation/www/docs/user/manual/en/stock/installation-note.md
index 815849e2..9a5e11c6 100644
--- a/foundation/www/docs/user/manual/en/stock/installation-note.md
+++ b/foundation/www/docs/user/manual/en/stock/installation-note.md
@@ -3,6 +3,6 @@
You can use installation note to record the instalation of a product having a serial number.
-
+
{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/item/index.md b/foundation/www/docs/user/manual/en/stock/item/index.md
index ca768485..a231e7f0 100644
--- a/foundation/www/docs/user/manual/en/stock/item/index.md
+++ b/foundation/www/docs/user/manual/en/stock/item/index.md
@@ -32,7 +32,7 @@ In ERPNext, you can select different type of Warehouses to stock your different
These numbers help to track individual units or batches of Items which you sell. It also tracks warranty and returns. In case any individual Item is recalled by the supplier the number system helps to track individual Item. The numbering system also manages expiry dates. Please note that if you sell your items in thousands, and if the items are very small like pens or erasers, you need not serialize them. In ERPNext, you will have to mention the serial number in some accounting entries. To create serial numbers you will have to manually create all the numbers in your entries. If your product is not a big consumer durable Item, if it has no warranty and has no chances of being recalled, avoid giving serial numbers.
> Tip: While entering an item code in an items table, if the table requires inventory details, then depending on whether the entered item is batched or serialized, you can enter serial or batch numbers right away in a pop-up dialog.
-
+
> Important: Once you mark an item as serialized or batched or neither, you cannot change it after you have made any stock entry.
@@ -58,9 +58,9 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi
### Purchase Details
-
+
-
+
* **Default Supplier:** Supplier from whom you generally purchase this item.
@@ -80,23 +80,23 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi
### Sales Details
-
+
* **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item.
-)
+)
-
+
Visit [Manufacturing](/docs/user/manual/en/manufacturing.html) and [Website ](/docs/user/manual/en/website.html)to understand these topics in detail.
diff --git a/foundation/www/docs/user/manual/en/stock/item/index.txt b/foundation/www/docs/user/manual/en/stock/item/index.txt
index 4e668757..db5fa0ad 100644
--- a/foundation/www/docs/user/manual/en/stock/item/index.txt
+++ b/foundation/www/docs/user/manual/en/stock/item/index.txt
@@ -4,3 +4,4 @@ item-variants
purchase-details
reorder
item-valuation-fifo-and-moving-average
+item-settings
diff --git a/foundation/www/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md b/foundation/www/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
index 30974ada..fa9ff234 100644
--- a/foundation/www/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
+++ b/foundation/www/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
@@ -22,7 +22,7 @@ There are two major ways in which ERPNext values your items.
* **FIFO (First In First Out):** In this system, ERPNext assumes that you will consume / sell those Items first which you bought first. For example, if you buy an Item at price X and then after a few days at price Y, whenever you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y.
-
+
* **Moving Average:** In this method, ERPNext assumes that the value of the item at any point is the average price of the units of that Item in stock. For example, if the value of an Item is X in a Warehouse with quantity Y and another quantity Y1 is added to the Warehouse at cost X1, the new value X2 would be:
diff --git a/foundation/www/docs/user/manual/en/stock/item/item-variants.md b/foundation/www/docs/user/manual/en/stock/item/item-variants.md
index 79fcfd0b..0e857b50 100644
--- a/foundation/www/docs/user/manual/en/stock/item/item-variants.md
+++ b/foundation/www/docs/user/manual/en/stock/item/item-variants.md
@@ -20,20 +20,20 @@ To use Item Variants in ERPNext, create an Item and check 'Has Variants'.
* The Item shall then be referred to as a so called 'Template'. Such a Template is not identical to a regular 'Item' any longer. For example it (the Template) can not be used directly in any Transactions (Sales Order, Delivery Note, Purchase Invoice) itself. Only the Variants of an Item (_blue_ t-shirt in size _small)_ can be practically used in such. Therefore it would be ideal to decide whether an item 'Has Variants' or not directly when creating it.
-
+
On selecting 'Has Variants' a table shall appear. Specify the variant attributes for the Item in the table.
In case the attribute has Numeric Values, you can specify the range and increment values here.
-
+
> Note: You cannot make Transactions against a 'Template'
To create 'Item Variants' against a 'Template' select 'Make Variants'
-
+
-
+
To learn more about setting Attributes Master check [Item Attributes](/docs/user/manual/en/stock/setup/item-attribute.html)
@@ -42,12 +42,12 @@ To learn more about setting Attributes Master check [Item Attributes](/docs/user
To setup variants based on Manufactueres, in your Item template, set "Variants Based On" as "Manufacturers"
+ src='{{docs_base_url}}/assets/img/stock/select-mfg-for-variant.png'>
When you make a new Variant, the system will prompt you to select a Manufacturer. You can also optionally put in a Manufacturer Part Number
+ src='{{docs_base_url}}/assets/img/stock/set-variant-by-mfg.png'>
The naming of the variant will be the name (ID) of the template Item with a number suffix. e.g. "ITEM000" will have variant "ITEM000-1"
@@ -56,4 +56,4 @@ To update the value in the variants items from the template item, select the res
To set the fields Goto Stock > Item Variant Settings
+ src='{{docs_base_url}}/assets/img/stock/item_variants_settings.png'>
diff --git a/foundation/www/docs/user/manual/en/stock/item/purchase-details.md b/foundation/www/docs/user/manual/en/stock/item/purchase-details.md
index a1479faf..5d2d8fa3 100644
--- a/foundation/www/docs/user/manual/en/stock/item/purchase-details.md
+++ b/foundation/www/docs/user/manual/en/stock/item/purchase-details.md
@@ -5,4 +5,4 @@ To track a warranty period, it is necessary that the Item is a serialized Item.
A warranty means a guarantee or a promise which provides assurance by one party to the other party which allows for a legal remedy if that promise is not true or followed. A warranty period is a time period in which a purchased product may be returned or exchanged.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/item/reorder.md b/foundation/www/docs/user/manual/en/stock/item/reorder.md
index f50add88..3f393f46 100644
--- a/foundation/www/docs/user/manual/en/stock/item/reorder.md
+++ b/foundation/www/docs/user/manual/en/stock/item/reorder.md
@@ -11,4 +11,4 @@ For example, you can set your reorder level of Motherboard at 10. When there are
For example, If reorder level is 100 items, your reorder quantity may not necessarily be 100 items. The Reorder quantity can be greater than or equal to reorder level. It may depend upon lead time, discount, transportation and average daily consumption.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/material-request.md b/foundation/www/docs/user/manual/en/stock/material-request.md
index 65e991a3..a980c398 100644
--- a/foundation/www/docs/user/manual/en/stock/material-request.md
+++ b/foundation/www/docs/user/manual/en/stock/material-request.md
@@ -4,7 +4,7 @@
A Material Request is a simple document identifying a requirement of a set of
Items (products or services) for a particular reason.
-
+
To generate a Material Request manually go to:
@@ -12,7 +12,7 @@ To generate a Material Request manually go to:
#### Creating Material Request
-
+
> Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty -
diff --git a/foundation/www/docs/user/manual/en/stock/purchase-receipt.md b/foundation/www/docs/user/manual/en/stock/purchase-receipt.md
index aa527e55..1542b262 100644
--- a/foundation/www/docs/user/manual/en/stock/purchase-receipt.md
+++ b/foundation/www/docs/user/manual/en/stock/purchase-receipt.md
@@ -13,7 +13,7 @@ You can make a Purchase Receipt directly from:
or from a “Submitted” Purchase Order, by clicking on “Make Purchase Receipt”.
-
+
+### Enable Retain Sample in Item master
+
+Check Retain Sample and Maximum allowed samples in Item Master for a batch. Please note that Retain Sample is based
+on Batch hence Has Batch No should be enabled as well.
+
+
+
+### Stock Entry
+
+Whenever a Stock Entry is created with the purpose as Material Receipt, for items which have Retain Sample enabled, the Sample Quantity can be set during that Stock Entry. Sample quantity cannot be more than the Maximum sample quantity set in Item Master.
+
+
+
+On submission of this Stock Entry, button 'Make Retention Stock Entry' will be available to make another Stock Entry for the transfer of sample items from the mentioned batch to the retention warehouse set in Stock Settings. On clicking this button it will direct you to new Stock Entry with all the information, verify the information and click Submit.
+
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/sales-return.md b/foundation/www/docs/user/manual/en/stock/sales-return.md
index a8aff584..820a73d1 100644
--- a/foundation/www/docs/user/manual/en/stock/sales-return.md
+++ b/foundation/www/docs/user/manual/en/stock/sales-return.md
@@ -9,22 +9,22 @@ In ERPNext, you can create a Sales Return by simply making a Delivery Note / Sal
First open the original Delivery Note / Sales Invoice, against which customer returned the items.
-
-
-#### Scenario
-
-Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Invoice for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Invoice on the subscription form. Recurring proforma invoice is created automatically just before customer's account is about to expire, and requires renewal. This recurring Proforma Invoice is also emailed automatically to the customer.
-
-To set the subscription for the sales invoice
-Goto Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save
-
-
-
-**From Date and To Date**: This defines contract period with the customer.
-
-**Repeat on Day**: If frequency is set as Monthly, then it will be day of the month on which recurring invoice will be generated.
-
-**Notify By Email**: If you want to notify the user about auto recurring invoice.
-
-**Print Format**: Select a print format to define document view which should be emailed to customer.
-
-**Disabled**: It will stop to make auto recurring documents against the subscription
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/support/issue.md b/foundation/www/docs/user/manual/en/support/issue.md
index d41c2a92..5dbc672e 100644
--- a/foundation/www/docs/user/manual/en/support/issue.md
+++ b/foundation/www/docs/user/manual/en/support/issue.md
@@ -14,7 +14,7 @@ Frappé system.
> Support > Issue > New Issue
-
+
diff --git a/foundation/www/docs/user/manual/en/support/warranty-claim.md b/foundation/www/docs/user/manual/en/support/warranty-claim.md
index e2f1d4a7..dc8aae89 100644
--- a/foundation/www/docs/user/manual/en/support/warranty-claim.md
+++ b/foundation/www/docs/user/manual/en/support/warranty-claim.md
@@ -18,7 +18,7 @@ To create a new **Warranty Claim**:
> Support > Warranty Claim > New Warranty Claim
-
+
If a Customer visit is required to address the issue, you can create a new
Maintenance Visit record from this.
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/Global-search.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/Global-search.md
index ef3d8d9c..c0ab4926 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/Global-search.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/Global-search.md
@@ -11,9 +11,9 @@ Global Search helps users find information quickly. It’s located in the upper
### Using Awesome bar for Global Search.
-
+
### Enable Global Search for fields in a Doctype.
-
+
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
index a45080f9..93152ae3 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
@@ -5,6 +5,6 @@ ERPNext has in-built file manager. Click [here](/docs/user/videos/learn/file-man
If you have file attached to the document (say Purchase Order), and same file needs to be emailed as attachment, following is how you can achieve it.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
index 034ab449..169181e4 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
@@ -9,11 +9,11 @@ There are several ways to attach file to the document.
####From Browser
-
+
####By drag and drop
-
+
Click on Attach to browse and select the file.
@@ -21,7 +21,7 @@ Click on Attach to browse and select the file.
If you use separate server for files, or use online service like Dropbox, you can attach file by providing link of a particular file.
-
+
`For hosted users, limit of 5 MB is applied on file size.`
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/bulk-rename.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
index de46aee2..609da8b8 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
@@ -11,7 +11,7 @@ You can rename ids of upto 500 records at a time. Following are step to bulk ren
In a spreadsheet file, enter old Item IDs in the first column, and new Item Ids in the second column. Save spreadsheet file in a CSV format.
-
+
#### Step 2: Upload Data File
@@ -21,7 +21,7 @@ To upload data file go to,
Select DocType which you want to rename. Here DocType will be Item. Then Browse and Upload data file.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
index a5e4e361..b242a363 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
@@ -3,7 +3,7 @@
Links option shows one document is linked to which other documents. Check Menu for the Links options.
-
+
####Scenario
@@ -19,6 +19,6 @@ If I check Links in the Purchase Receipt, will it list Purchase Order from which
Links only shows forward linkages. For the backward links, you should check current document itself. In the Purchase Receipt Item table table, you can check which Purchase Order it is linked to.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
index 648dcf19..ae52b886 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
@@ -13,18 +13,18 @@ Following are step to delete submitted documents.
You will find option to Cancel in the submitted document. If document is at draft stage, it can delete directly. Also if document is not submittable, but only save, it can be deleted directly.
-
+
####Step 2: Delete Document
After cancellation, go to Menu and click on Delete.
-
+
####Step 3: Deleting from List
For bulk deletion, you can select multiple Cancelled records and delete at once from the List View.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
index b20e894a..5bc89ea3 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
@@ -11,6 +11,6 @@ You will find Copy option under:
`Menu > Copy`
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md
index be9197e3..258900cb 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md
@@ -5,11 +5,11 @@ In the reports, Letter Head is fetched from the Company master. To have company'
`Explore > Accounts > Company`
-
+
In a Company master, if no Letter Head is set as default, then in the reports, Letter Head having Default field checked will be fetched.
-
+
If you are managing multiple companies in a single ERPNext account, then ensure that for each Company, default Letter Head is set in the Company master.
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/merging-documents.md
index 7a7e95c7..807954c5 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/merging-documents.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/merging-documents.md
@@ -13,7 +13,7 @@ Following are step to merge documents. Let's assume we are merging two Accounts.
For an Account to be merged, click on the "Rename" option.
-
+
#### Step 3: Merge Account
@@ -21,7 +21,7 @@ In the New Name field, enter another account name with which this account will b
Following is how the merged account will appear in the Chart of Accounts master.
-
+
###Effect of Merging
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md
index 74391b2f..162bf2d6 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md
@@ -5,7 +5,7 @@ POS (point of sale) view renders form in a different layout, optimized for the q
Using POS View, you can only create Sales Invoice, without switching to standard form view. For other transactions, like Sales Order, Delivery Note, Purchase Order, Purchase Receipt etc., POS View is only used for Item selection. For entering other values in the transaction, you should switch to form view.
-
+
For creating POS Invoice, check following help video.
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/renaming-documents.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
index d83692ca..9e5e1327 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
@@ -9,7 +9,7 @@ Using Renaming feature, you can change ID of a master documents like Item, Wareh
#### 2. Rename
-
+
###Effect of Renaming
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/search-filter.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/search-filter.md
index 18f58279..20bd6bd2 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/search-filter.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/search-filter.md
@@ -9,20 +9,20 @@ Each filter option has three fields.
Select field of the document based on which you wish to filter records.
-
+
#### Based On
With Field, you will provide a value. In the based on field, you can define a criterion that when filter should be applied in record. It will be when value define for the field if filter is:
-
+
#### Value
A value should be entered in this field based on while records will be filtered. After filter is applied, records will be filtered based on it. And filter will shrunk under one field/button.
-
+
You can apply multiple filters at a time. To remove specific filter, just click on cancelled (X) sign ahead of it.
@@ -31,6 +31,6 @@ You can apply multiple filters at a time. To remove specific filter, just click
From the list views, you can also apply filters by clicking on the Status field.
-
+
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
index 5c068f75..29e9e450 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
@@ -13,12 +13,12 @@ Following are the steps to be followed for renaming ID of a master which is main
When click on the Account, you will find Rename option.
-
+
#### Step 2: Rename Account
On clicking Rename, you will get field to enter New Name. After entering new name for the Account, click on the "Rename" button.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/assignment.md b/foundation/www/docs/user/manual/en/using-erpnext/assignment.md
index 77479f31..c7e746be 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/assignment.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/assignment.md
@@ -13,13 +13,13 @@ Following are the steps to assign document to another user.
Assign to option is located at the footer of document. Clicking on Assignment Icon on the tool bar will fast-forward you to footer of same document.
-
+
#### Step 2: Assign to User
In the Assign To section, you will find option to select User to whom this document will be assigned to. You can assign one document to multiple people at a time.
-
+
With assignment, you can also leave a comment for the review of assignee.
@@ -27,13 +27,13 @@ With assignment, you can also leave a comment for the review of assignee.
This transaction will appear in the To-do list of the user in “Todo” section.
-
+
####Removing Assignment
User will be able to remove assignment by clicking on "Assignment Completed" button in the document.
-
+
Once assignment is set as completed, the Status of its ToDo record will be set as Closed.
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/calendar.md b/foundation/www/docs/user/manual/en/using-erpnext/calendar.md
index 908fc110..cf387849 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/calendar.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/calendar.md
@@ -5,7 +5,7 @@ The Calendar is a tool where you can create and share Events and also see auto-g
You can switch calendar view based on Month, Week and Day.
-
+
You can choose to send message to all the users, or to specific user.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/collaborating-around-forms.md b/foundation/www/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
index febf372c..36182f6f 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
@@ -12,13 +12,13 @@ If some document requires an action from User, you can Assign that document to t
Comments are a great way to add information about a transaction that is not a
part of the transactions. Like some background information etc.
-
+
###Share
You can share document with the specific User. If Document is shared with the specific User, he/she will be able to access it, even if that User doesn't have permission to access that document or Document Type.
-
+
### Tags
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md b/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md
index 62fdf459..927d1aa0 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md
@@ -7,16 +7,16 @@ The document versioning feature allows you to track all the changes made in the
Document Versioning can be enabled for one Document Type as a time. Let's assume that we need to enable it from Purchase Order. Then, we will check Customize Form tool for Purchase Order and check field `Track Changes`. With this, document versioning will be enabled for all the Purchase Orders create and edited hence forth.
-
+
####Version Log
Following is link of version in a Purchase Order form. Each time a document is edited, a version's link will be added in that document. To check more details on specific version, click on it's link.
-
+
####Version Details
In the Version document, you will find log of all the fields and values changes in it.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/notes.md b/foundation/www/docs/user/manual/en/using-erpnext/notes.md
index 9c52ef1e..db2d3076 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/notes.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/notes.md
@@ -9,12 +9,12 @@ You can store your long notes under this section. It can contain your partner li
Enter Title and Context.
-
+
####Set Permissions to select Users
To make Note accessible for all, check "Public" under links section. Else you can share it with the specific User by using Share feature.
-
+
If you have deleted an entry by mistake and wish to restore it back into your ERPNext account.
@@ -15,18 +15,18 @@ Steps below to restore a deleted document.
For the list of deleted document, just type Deleted Document in the Search Bar and go to list.
-
+
####Step 2: Open Doc and Restore
Open the document to be restored from the list. Click on Restore button.
-
+
####Step 3: Restored
Once a document is restored, you will be able to use it for creating entries in your ERPNext account.
-
+
> If canceled document is deleted, then it will not be restored.
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/tags.md b/foundation/www/docs/user/manual/en/using-erpnext/tags.md
index c8b14e9b..61be1147 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/tags.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/tags.md
@@ -3,10 +3,10 @@
Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it.
-
+
ERPNext will also show you all the important tags in the document list.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/to-do.md b/foundation/www/docs/user/manual/en/using-erpnext/to-do.md
index 8eadc472..c1aba1ad 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/to-do.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/to-do.md
@@ -3,10 +3,10 @@
To Do is a simple tool where all the activities [assigned](/docs/user/manual/en/using-erpnext/assignments.html) to you and assigned by you are listed. You can also add your own to-do items in the list.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/website/articles/website-home-page.md b/foundation/www/docs/user/manual/en/website/articles/website-home-page.md
index a39f8bcf..c11c626b 100644
--- a/foundation/www/docs/user/manual/en/website/articles/website-home-page.md
+++ b/foundation/www/docs/user/manual/en/website/articles/website-home-page.md
@@ -19,7 +19,7 @@ To Open website settings page go to: `Website > Setup > Website Settings`
Enter the same value you entered for the `route` field in the previous section to the `Home Page` field. ERPNext will set this route to be the same as /index for your page.
-
+
#### **Step 4: Save Website Settings Form.**
diff --git a/foundation/www/docs/user/manual/en/website/articles/website-security.md b/foundation/www/docs/user/manual/en/website/articles/website-security.md
index cfe6071c..4be1c595 100644
--- a/foundation/www/docs/user/manual/en/website/articles/website-security.md
+++ b/foundation/www/docs/user/manual/en/website/articles/website-security.md
@@ -5,8 +5,8 @@ One can easily generate a website using ERPNext. We can list our Products on the
Well at the moment this feature is not available. You cannot limit the access of the website generated by ERPNext to certain people. If you publish the website it will be publicly visible. However while you cannot control who can view the website, you can always choose which items to display on the website. To show or not show an Item on your website go to `Selling > Items and Pricing > Item` and in the Item form check the `show in website` checkbox.
-
+
Once the check box has been checked, then more details will appear that you can fill in for the details of the product as to be shown on the website.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/website/blog-post.md b/foundation/www/docs/user/manual/en/website/blog-post.md
index 05de52d2..17683766 100644
--- a/foundation/www/docs/user/manual/en/website/blog-post.md
+++ b/foundation/www/docs/user/manual/en/website/blog-post.md
@@ -11,13 +11,13 @@ To create a new blog, just create a new Blog from:
> Website > Blog > New Blog
-
+
To make item available on website go to Item master.
@@ -25,11 +25,11 @@ To make item available on website go to Item master.
#### Enable Item for website.
-
+
#### Enter Website Specifications for Item.
-
+
#### Goto Checkout
Click on "Go to Cart" to checkout or on "Cart" which is on upper right side
of the screen.
-
+
#### Checkout
Change quantity, select Shipping and Billing Address and click
on "Place Order" to place the order.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/website/web-form.md b/foundation/www/docs/user/manual/en/website/web-form.md
index fe26f9be..176a9e7f 100644
--- a/foundation/www/docs/user/manual/en/website/web-form.md
+++ b/foundation/www/docs/user/manual/en/website/web-form.md
@@ -18,7 +18,7 @@ To create a new **Web Form** go to:
1. Select if you require the user to login, edit records, manage multiple records etc.
1. Add the fields you want in the record.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/es/schools/admission/student-applicant.md b/foundation/www/docs/user/manual/es/education/admission/student-applicant.md
similarity index 84%
rename from foundation/www/docs/user/manual/es/schools/admission/student-applicant.md
rename to foundation/www/docs/user/manual/es/education/admission/student-applicant.md
index a14feb20..bc7b666d 100644
--- a/foundation/www/docs/user/manual/es/schools/admission/student-applicant.md
+++ b/foundation/www/docs/user/manual/es/education/admission/student-applicant.md
@@ -4,7 +4,7 @@
Un registro de Aplicación de Estudiante necesita ser creado cuando un estudiante aplica para un programa en su institución.
Puedes Aprobar o Rechazar una aplicación de estudiante. Aceptando una aplicación de un estudiante puedes agregarlos al master de estudiantes.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/es/education/setup/__init__.py b/foundation/www/docs/user/manual/es/education/setup/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/es/education/setup/_sidebar.json b/foundation/www/docs/user/manual/es/education/setup/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/education/setup/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/education/setup/academic-term.md b/foundation/www/docs/user/manual/es/education/setup/academic-term.md
new file mode 100644
index 00000000..a9923355
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/education/setup/academic-term.md
@@ -0,0 +1,7 @@
+
+# Término Académico
+
+
+
+### Temas
+
+{index}
diff --git a/foundation/www/docs/user/manual/es/schools/setup/index.txt b/foundation/www/docs/user/manual/es/education/setup/index.txt
similarity index 100%
rename from foundation/www/docs/user/manual/es/schools/setup/index.txt
rename to foundation/www/docs/user/manual/es/education/setup/index.txt
diff --git a/foundation/www/docs/user/manual/es/education/setup/instructor.md b/foundation/www/docs/user/manual/es/education/setup/instructor.md
new file mode 100644
index 00000000..a06e39f9
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/education/setup/instructor.md
@@ -0,0 +1,6 @@
+
+# Instructor
+
+
+
{next}
diff --git a/foundation/www/docs/user/manual/es/schools/student/student-group-creation-tool.md b/foundation/www/docs/user/manual/es/education/student/student-group-creation-tool.md
similarity index 58%
rename from foundation/www/docs/user/manual/es/schools/student/student-group-creation-tool.md
rename to foundation/www/docs/user/manual/es/education/student/student-group-creation-tool.md
index c188640f..1f6d6589 100644
--- a/foundation/www/docs/user/manual/es/schools/student/student-group-creation-tool.md
+++ b/foundation/www/docs/user/manual/es/education/student/student-group-creation-tool.md
@@ -4,6 +4,6 @@
Esta herramienta te permite crear grupos de estudiantes. Puedes especificar multiples parámetros para crearlos.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/es/schools/student/student-group.md b/foundation/www/docs/user/manual/es/education/student/student-group.md
similarity index 73%
rename from foundation/www/docs/user/manual/es/schools/student/student-group.md
rename to foundation/www/docs/user/manual/es/education/student/student-group.md
index 058a60b0..1fa03b7e 100644
--- a/foundation/www/docs/user/manual/es/schools/student/student-group.md
+++ b/foundation/www/docs/user/manual/es/education/student/student-group.md
@@ -4,6 +4,6 @@
Un Grupo de Estudiante es una colección de estudiantes tomando el mismo curso. Puedes crear calendarios para los cursos y examinaciones para un Grupo de Estudiante.
Un Grupo de Estudiante necesita ser creado para cada curso en un año o término académico en particular.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/es/schools/student/student-log.md b/foundation/www/docs/user/manual/es/education/student/student-log.md
similarity index 71%
rename from foundation/www/docs/user/manual/es/schools/student/student-log.md
rename to foundation/www/docs/user/manual/es/education/student/student-log.md
index 69a41942..e765e0ce 100644
--- a/foundation/www/docs/user/manual/es/schools/student/student-log.md
+++ b/foundation/www/docs/user/manual/es/education/student/student-log.md
@@ -4,6 +4,6 @@
Puedes crear una nota de una actividad de un estudiante usando la bitácora de estudiante (log)
Los registros de bitágora pueden ser categorizadas como 'General', 'Academic', 'Medical' or 'Achievement'
-
+ 
+ 
+ 
+ 
+ 
+ 
+{% block content %}
+
+ 
-
+
{{ _("Comments") }}
+ {% include 'templates/includes/comments/comments.html' %} +