diff --git a/erpnext/docs/user/manual/de/CRM/contact.md b/erpnext/docs/user/manual/de/CRM/contact.md index 49b5ffb0db..b937c65d18 100644 --- a/erpnext/docs/user/manual/de/CRM/contact.md +++ b/erpnext/docs/user/manual/de/CRM/contact.md @@ -7,11 +7,11 @@ Um einen neuen Kontakt zu erstellen, gehe Sie zu > CRM > Dokumente > Kontakt > Neu -Kontakt +Kontakt Alternativ können Sie einen Kontakt oder eine Adresse auch direkt aus dem Kundendatensatz erstellen. Klicken Sie hierzu auf "Neuer Kontakt" oder "Neue Adresse". -Kontakt +Kontakt > 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/erpnext/docs/user/manual/de/CRM/customer.md b/erpnext/docs/user/manual/de/CRM/customer.md index c7d6654858..abd229849f 100644 --- a/erpnext/docs/user/manual/de/CRM/customer.md +++ b/erpnext/docs/user/manual/de/CRM/customer.md @@ -7,7 +7,7 @@ Sie können Ihre Kunden entweder direkt erstellen über > CRM > Dokumente > Kunde > Neu -Kunde +Kunde oder einen Upload über ein Datenimportwerkzeug durchführen. diff --git a/erpnext/docs/user/manual/de/CRM/lead.md b/erpnext/docs/user/manual/de/CRM/lead.md index 47a4492633..8bb9ce4f16 100644 --- a/erpnext/docs/user/manual/de/CRM/lead.md +++ b/erpnext/docs/user/manual/de/CRM/lead.md @@ -16,6 +16,6 @@ Um einen Lead zu generieren, gehen Sie zu: > CRM > Dokumente > Lead > Neu -Lead +Lead {next} diff --git a/erpnext/docs/user/manual/de/CRM/newsletter.md b/erpnext/docs/user/manual/de/CRM/newsletter.md index bc7e989421..8a18e6425f 100644 --- a/erpnext/docs/user/manual/de/CRM/newsletter.md +++ b/erpnext/docs/user/manual/de/CRM/newsletter.md @@ -7,8 +7,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. -Newsletter - Neu +Newsletter - Neu -Newsletter - Test +Newsletter - Test {next} diff --git a/erpnext/docs/user/manual/de/CRM/opportunity.md b/erpnext/docs/user/manual/de/CRM/opportunity.md index 181348f115..c9122f3d85 100644 --- a/erpnext/docs/user/manual/de/CRM/opportunity.md +++ b/erpnext/docs/user/manual/de/CRM/opportunity.md @@ -11,11 +11,11 @@ Alternativ können Sie einen offenen Lead öffnen und auf die Schaltfläche "Opp ### Abbildung 1: Opportunity erstellen -Opportunity +Opportunity ### Abbildung 2: Opportunity aus einem offenen Lead heraus erstellen -Opportunity +Opportunity 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/erpnext/docs/user/manual/de/CRM/setup/campaign.md b/erpnext/docs/user/manual/de/CRM/setup/campaign.md index 700bb325c3..2b5781d36d 100644 --- a/erpnext/docs/user/manual/de/CRM/setup/campaign.md +++ b/erpnext/docs/user/manual/de/CRM/setup/campaign.md @@ -3,7 +3,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. -Kampagne +Kampagne 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. @@ -11,11 +11,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. -Kampange - Leads ansehen +Kampange - Leads ansehen * 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. -Kampagne - Neuer Lead +Kampagne - Neuer Lead {next} diff --git a/erpnext/docs/user/manual/de/CRM/setup/customer-group.md b/erpnext/docs/user/manual/de/CRM/setup/customer-group.md index c7ec3e226d..4cdeb22fd7 100644 --- a/erpnext/docs/user/manual/de/CRM/setup/customer-group.md +++ b/erpnext/docs/user/manual/de/CRM/setup/customer-group.md @@ -3,10 +3,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). -Baumstruktur der Kundengruppen +Baumstruktur der Kundengruppen > 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. -Vertriebsanalyse +Vertriebsanalyse {next} diff --git a/erpnext/docs/user/manual/de/CRM/setup/sales-person.md b/erpnext/docs/user/manual/de/CRM/setup/sales-person.md index f615da4b44..77d6ea0c48 100644 --- a/erpnext/docs/user/manual/de/CRM/setup/sales-person.md +++ b/erpnext/docs/user/manual/de/CRM/setup/sales-person.md @@ -3,7 +3,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. -Baumstruktur der Vertriebsmitarbeiter +Baumstruktur der Vertriebsmitarbeiter ### Vertriebspersonen in Transaktionen diff --git a/erpnext/docs/user/manual/de/accounts/accounting-reports.md b/erpnext/docs/user/manual/de/accounts/accounting-reports.md index deab83b2ad..b9f0fca267 100644 --- a/erpnext/docs/user/manual/de/accounts/accounting-reports.md +++ b/erpnext/docs/user/manual/de/accounts/accounting-reports.md @@ -8,7 +8,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. Hauptbuch + src="{{docs_base_url}}/assets/img/accounts/general-ledger.png"> ### Probebilanz @@ -19,7 +19,7 @@ Eine Probebilanz ist eine Liste von Kontoständen aller Konten (Bücher und Grup * Summe Haben * Schlußstand -Probebilanz +Probebilanz Die Summe aller Schlußstände in einer Probebilanz muss 0 sein. @@ -27,12 +27,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. -Forderungskonten +Forderungskonten ### 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. -Übersicht Verkäufe +Übersicht Verkäufe {next} diff --git a/erpnext/docs/user/manual/de/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/de/accounts/advance-payment-entry.md index 54633b2182..288b35ed57 100644 --- a/erpnext/docs/user/manual/de/accounts/advance-payment-entry.md +++ b/erpnext/docs/user/manual/de/accounts/advance-payment-entry.md @@ -15,7 +15,7 @@ Da der Kunde 5.000 Euro bar angezahlt hat, wird dieser Betrag als Habenbuchung z #### Abbildung 1: Journalbuchung bei Vorkasse -Anzahlung +Anzahlung ### Doppelte Buchführung @@ -23,7 +23,7 @@ Bei der doppelten Buchführung hat jede Transaktion einen positiven oder negativ #### Abbildung 2: Transaktion und Ausgleichsbuchung -Anzahlung +Anzahlung Speichern und übertragen Sie den Buchungssatz. Wenn das Dokument nicht gespeichert wird, dann wird es in anderen Buchungsdokumenten nicht übernommen. @@ -33,7 +33,7 @@ Um die Ausgangsrechnung mit einem Buchungssatz zu verknüpfen, der die Buchung z #### Abbildung 3: Anzahlung erhalten -Anzahlung +Anzahlung Speichern und übertragen Sie die Ausgangsrechnung diff --git a/erpnext/docs/user/manual/de/accounts/budgeting.md b/erpnext/docs/user/manual/de/accounts/budgeting.md index 7495e3c91e..88ef179802 100644 --- a/erpnext/docs/user/manual/de/accounts/budgeting.md +++ b/erpnext/docs/user/manual/de/accounts/budgeting.md @@ -11,29 +11,29 @@ Um ein Budget zuzuweisen, gehen Sie zu Rechnungswesen > Einstellungen > Übersic #### Schritt 1: Klicken Sie auf "Öffnen -Budget +Budget #### Schritt 2: Monatliche Verteilung eingeben -Budget +Budget 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 -Budget +Budget ### Anlegen einer neuen Verteilungs-ID ERPNext erlaubt es Ihnen einige Aktionen für Budgets einzustellen. Das legt fest, ob bei Überschreiten des Budgets gestoppt, gewarnte oder ignoriert werden soll. -Monthly Distribution +Monthly Distribution Das kann über die Firmenstammdaten eingestellt werden. -Budget Variance Report +Budget Variance Report 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/erpnext/docs/user/manual/de/accounts/chart-of-accounts.md b/erpnext/docs/user/manual/de/accounts/chart-of-accounts.md index b9e93e0f2e..551367e66e 100644 --- a/erpnext/docs/user/manual/de/accounts/chart-of-accounts.md +++ b/erpnext/docs/user/manual/de/accounts/chart-of-accounts.md @@ -17,7 +17,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. -Finanzanalyse Bilanz +Finanzanalyse Bilanz Um Ihren Kontenplan in ERPNext zu bearbeiten gehen Sie zu: @@ -27,7 +27,7 @@ Im Kontenplan erhalten Sie eine Baumstruktur der Konten(bezeichnungen) und Konte Lassen Sie uns die Hauptgruppen des Kontenplans besser verstehen lernen. -Kontenplan +Kontenplan ### Bilanzkonten @@ -47,7 +47,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: -Finanzanalyse GuV +Finanzanalyse GuV (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.) @@ -61,7 +61,7 @@ Buchungstransaktionen können nur zu Kontobüchern erstellt werden (nicht zu Gru > Anmerkung: Ein Kontenbuch wird manchmal auch als Kontokopf bezeichnet. -Kontenplan +Kontenplan ### Andere Kontentypen @@ -71,7 +71,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. -Kontenplan +Kontenplan Die Option zum Erstellen erscheint nur dann, wenn Sie auf ein Konto vom Typ Gruppe (Ordner) klicken. diff --git a/erpnext/docs/user/manual/de/accounts/credit-limit.md b/erpnext/docs/user/manual/de/accounts/credit-limit.md index b769817f91..dc13819b67 100644 --- a/erpnext/docs/user/manual/de/accounts/credit-limit.md +++ b/erpnext/docs/user/manual/de/accounts/credit-limit.md @@ -9,7 +9,7 @@ Um das Kreditlimit einzustellen, gehen Sie zur Kundenvorlage ### Abbildung 1: Kreditlinie -Kreditlimit +Kreditlimit Gehen Sie zum Abschnitt "Kreditlimit" und geben Sie den Betrag in das Feld "Kreditlimit" ein. @@ -21,7 +21,7 @@ Im Feld Kredit-Controller wählen Sie die Rolle aus, die dazu autorisiert sein s ### Abbildung 2: Kredit-Controller -Kreditlimit +Kreditlimit Speichern Sie die Änderungen diff --git a/erpnext/docs/user/manual/de/accounts/journal-entry.md b/erpnext/docs/user/manual/de/accounts/journal-entry.md index 3ccc0490ef..08851308ce 100644 --- a/erpnext/docs/user/manual/de/accounts/journal-entry.md +++ b/erpnext/docs/user/manual/de/accounts/journal-entry.md @@ -7,7 +7,7 @@ Um einen neuen Buchungssatz zu erstellen, gehen Sie zu: > Rechnungswesen > Dokumente > Journalbuchung > Neu -Buchungssatz +Buchungssatz In einem Buchungssatz müssen Sie folgendes tun: diff --git a/erpnext/docs/user/manual/de/accounts/making-payments.md b/erpnext/docs/user/manual/de/accounts/making-payments.md index 00c8d106bd..0c2e041c50 100644 --- a/erpnext/docs/user/manual/de/accounts/making-payments.md +++ b/erpnext/docs/user/manual/de/accounts/making-payments.md @@ -8,7 +8,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 durchführen +Zahlungen durchführen Zahlungen können auch unabhängig von Rechnungen erstellt werden, indem Sie einen neuen Journalbeleg erstellen und die Zahlungsart auswählen. @@ -30,7 +30,7 @@ Für Zahlungen an Lieferanten gilt: ### Beispiel eines Buchungssatzes für eine Zahlung -Zahlungen durchführen +Zahlungen durchführen --- diff --git a/erpnext/docs/user/manual/de/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/de/accounts/multi-currency-accounting.md index 0b0adaa39e..ad9eaaf337 100644 --- a/erpnext/docs/user/manual/de/accounts/multi-currency-accounting.md +++ b/erpnext/docs/user/manual/de/accounts/multi-currency-accounting.md @@ -7,15 +7,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. -Währung über den Kontenplan einstellen +Währung über den Kontenplan einstellen Sie können die Währung auch zuordnen oder bearbeiten, indem Sie den jeweiligen Datensatz für bereits angelegte Konten öffnen. -Kontenwährung anpassen +Kontenwährung anpassen 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. -Währung des Kundenkontos +Währung des Kundenkontos 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. @@ -33,7 +33,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. -Offene Ausgangsrechnung +Offene Ausgangsrechnung #### Eingangsrechnung @@ -43,13 +43,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. -Wechselkurs im Buchungssatz +Wechselkurs im Buchungssatz 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. -Buchungssatz mit verschiedenen Währungen +Buchungssatz mit verschiedenen Währungen #### Beispiel 1: Zahlungsbuchung eines Kunden in alternativer Währung @@ -57,7 +57,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. -Zahlungsbuchung +Zahlungsbuchung #### Beispiel 2: Überweisung zwischen Banken (US-Dollar -> Indische Rupien) @@ -100,7 +100,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: -Übertrag zwischen den Banken +Übertrag zwischen den Banken ### Berichte @@ -108,12 +108,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. -Bericht zum Hauptbuch +Bericht zum Hauptbuch #### 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. -Bericht zu den Forderungen +Bericht zu den Forderungen {next} diff --git a/erpnext/docs/user/manual/de/accounts/opening-accounts.md b/erpnext/docs/user/manual/de/accounts/opening-accounts.md index 3edcadcdab..f264fc80ea 100644 --- a/erpnext/docs/user/manual/de/accounts/opening-accounts.md +++ b/erpnext/docs/user/manual/de/accounts/opening-accounts.md @@ -20,7 +20,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. -Eröffnungskonto +Eröffnungskonto 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. @@ -38,13 +38,13 @@ Hinweis: Stellen Sie sicher, dass im Abschnitt "Weitere Informationen" "Ist Erö Vervollständigen Sie die Buchungssätze auf der Soll- und Haben-Seite. -Opening Account +Opening Account 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: -Opening Account +Opening Account 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. @@ -59,7 +59,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: -Probebilanz +Probebilanz ### Offene Rechnungen diff --git a/erpnext/docs/user/manual/de/accounts/purchase-invoice.md b/erpnext/docs/user/manual/de/accounts/purchase-invoice.md index 6aec9b5de6..b3952ef683 100644 --- a/erpnext/docs/user/manual/de/accounts/purchase-invoice.md +++ b/erpnext/docs/user/manual/de/accounts/purchase-invoice.md @@ -9,7 +9,7 @@ Um eine neue Eingangsrechnung zu erstellen, gehen Sie zu: oder klicken Sie in einem Lieferantenauftrag oder einem Kaufbeleg auf "Eingangsrechnung erstellen". -Eingangsrechnung +Eingangsrechnung 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/erpnext/docs/user/manual/de/accounts/sales-invoice.md b/erpnext/docs/user/manual/de/accounts/sales-invoice.md index 7ce30bb637..79673323e9 100644 --- a/erpnext/docs/user/manual/de/accounts/sales-invoice.md +++ b/erpnext/docs/user/manual/de/accounts/sales-invoice.md @@ -9,7 +9,7 @@ Sie können eine Ausgangsrechnung direkt erstellen über: oder indem Sie in der rechten Ecke des Lieferscheins auf "Rechnung erstellen" klicken. -Ausgangsrechnung +Ausgangsrechnung ### Auswirkung auf die Buchhaltung diff --git a/erpnext/docs/user/manual/de/accounts/setup/account-settings.md b/erpnext/docs/user/manual/de/accounts/setup/account-settings.md index 44aafa4398..d0d9beff82 100644 --- a/erpnext/docs/user/manual/de/accounts/setup/account-settings.md +++ b/erpnext/docs/user/manual/de/accounts/setup/account-settings.md @@ -1,7 +1,7 @@ # Konteneinstellungen Beigetragen von CWT Connector & Wire Technology GmbH -Konteneinstellungen +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/erpnext/docs/user/manual/de/accounts/setup/cost-center.md b/erpnext/docs/user/manual/de/accounts/setup/cost-center.md index a7ed877555..282daeec41 100644 --- a/erpnext/docs/user/manual/de/accounts/setup/cost-center.md +++ b/erpnext/docs/user/manual/de/accounts/setup/cost-center.md @@ -22,7 +22,7 @@ Um Ihren Kostenstellenplan einzurichten, gehen Sie zu: >Rechnungswesen > Einstellungen > Kostenstellenplan -Kostenstellenplan +Kostenstellenplan Kostenstellen helfen Ihnen bei der Erstellung von Budgets für Geschäftstätigkeiten. diff --git a/erpnext/docs/user/manual/de/accounts/setup/fiscal-year.md b/erpnext/docs/user/manual/de/accounts/setup/fiscal-year.md index 817c55748b..ce4c750d82 100644 --- a/erpnext/docs/user/manual/de/accounts/setup/fiscal-year.md +++ b/erpnext/docs/user/manual/de/accounts/setup/fiscal-year.md @@ -5,6 +5,6 @@ Ein Geschäftsjahr wird auch als Finanzjahr oder Budgetjahr bezeichnet. Es wird Ein Geschäftsjahr startet normalerweise zu Beginn eines Quartals, wie zum Beispiel am 1. April, 1. Juli oder 1. Oktober. Jedoch geht bei den meisten Firmen das Geschäftsjahr mit dem Kalenderjahr einher und startet am 1. Januar. In den meisten Fällen ist es der einfachere und leichtere Weg. Für einige Organisationen ist es vorteilhaft das Geschäftsjahr zu einem anderen Zeitpunkt zu starten. So können beispielsweise Geschäfte, die saisonal arbeiten zum 1. Juli oder 1. Oktober starten. Ein Geschäft, welches im Herbst den größten Gewinn erwirtschaftet und die größten Ausgaben im Frühling hat, könnte sich auch für den 1. Okober entscheiden. Auf diese Weise weis es wie hoch der Gewinn für das Jahr sein wird und kann seine Ausgaben so anpassen, dass das Gewinnziel erreicht wird. -Geschäftsjahr +Geschäftsjahr {next} diff --git a/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md b/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md index 52fd1d755f..dea8f92bef 100644 --- a/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md +++ b/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md @@ -3,7 +3,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. -Steuerregel +Steuerregel 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. @@ -11,9 +11,9 @@ Betrachten wir ein Szenario um Steuerregeln besser zu verstehen. Angenommen wird haben zwei Steuerregeln wie unten abgebildet erstellt. -Steuerregel +Steuerregel -Steuerregel +Steuerregel In unserem Beispiel gilt Regel 1 für Indien und Regel 2 für Großbritannien. diff --git a/erpnext/docs/user/manual/de/accounts/tools/bank-reconciliation.md b/erpnext/docs/user/manual/de/accounts/tools/bank-reconciliation.md index 47a0dfefb0..c47831dbe0 100644 --- a/erpnext/docs/user/manual/de/accounts/tools/bank-reconciliation.md +++ b/erpnext/docs/user/manual/de/accounts/tools/bank-reconciliation.md @@ -33,7 +33,7 @@ Jetzt werden alle Buchungen im angegebenen Zeitraum in der Tabelle darunter ange #### Abbildung 2: Werkzeug zum Kontenabgleich -Kontenabgleich +Kontenabgleich **Schritt 5:** Klicken Sie auf die Schaltfläche "Abwicklungsdatum aktualisieren" diff --git a/erpnext/docs/user/manual/de/accounts/tools/payment-reconciliation.md b/erpnext/docs/user/manual/de/accounts/tools/payment-reconciliation.md index 22e15d4d23..59b73e8fcc 100644 --- a/erpnext/docs/user/manual/de/accounts/tools/payment-reconciliation.md +++ b/erpnext/docs/user/manual/de/accounts/tools/payment-reconciliation.md @@ -7,7 +7,7 @@ Um das Werkzeug zum Zahlungsabgleich zu verwenden, gehen Sie zu: > Rechnungswesen > Werkzeuge > Zahlungsabgleich -Zahlungsabgleich +Zahlungsabgleich **Schritt 1:** Wählen Sie das Konto aus, zu dem die Zahlungen abgeglichen werden sollen. diff --git a/erpnext/docs/user/manual/de/accounts/tools/payment-tool.md b/erpnext/docs/user/manual/de/accounts/tools/payment-tool.md index b76945c9b7..97795aa6a7 100644 --- a/erpnext/docs/user/manual/de/accounts/tools/payment-tool.md +++ b/erpnext/docs/user/manual/de/accounts/tools/payment-tool.md @@ -23,14 +23,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. -Zahlungswerkzeug +Zahlungswerkzeug 7\. Sobald die Daten angezogen wurden, klicken Sie auf die detaillierte Buchung und geben Sie den Zahlungsbetrag zur Rechnung/Bestellung/zum Beleg ein. -Zahlungswerkzeug +Zahlungswerkzeug 8\. Klicken Sie auf "Buchungssatz erstellen" um einen neuen Buchungssatz mit den entsprechenden Einzelheiten zu erstellen. -Zahlungswerkzeug +Zahlungswerkzeug {next} diff --git a/erpnext/docs/user/manual/de/accounts/tools/period-closing-voucher.md b/erpnext/docs/user/manual/de/accounts/tools/period-closing-voucher.md index 0f9407356f..539e7f97be 100644 --- a/erpnext/docs/user/manual/de/accounts/tools/period-closing-voucher.md +++ b/erpnext/docs/user/manual/de/accounts/tools/period-closing-voucher.md @@ -22,7 +22,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. -Periodenabschlussbeleg +Periodenabschlussbeleg 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/erpnext/docs/user/manual/de/buying/purchase-order.md b/erpnext/docs/user/manual/de/buying/purchase-order.md index a161d64265..7c72d1e108 100644 --- a/erpnext/docs/user/manual/de/buying/purchase-order.md +++ b/erpnext/docs/user/manual/de/buying/purchase-order.md @@ -7,7 +7,7 @@ Ein Lieferantenauftrag kann automatisch aus einer Materialanfrage oder einem Lie ### Flußdiagramm der Lieferantenbestellung -Lieferantenauftrag +Lieferantenauftrag In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über: @@ -15,7 +15,7 @@ In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über: ### Einen Lieferantenauftrag erstellen -Lieferantenauftrag +Lieferantenauftrag Einen Lieferantenauftrag einzugeben ist sehr ähnlich zu einer Lieferantenanfrage. Zusätzlich müssen Sie Folgendes eingeben: @@ -50,7 +50,7 @@ Beispiel: Wenn Sie Ihr Rohmaterial in großen Mengen in Großverpackungen eingek ### Abbildung 3: Umrechung von Einkaufsmaßeinheit in Lagermaßeinheit -Lieferantenauftrag - Maßeinheit +Lieferantenauftrag - Maß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/erpnext/docs/user/manual/de/buying/setup/buying-settings.md b/erpnext/docs/user/manual/de/buying/setup/buying-settings.md index e5ee4a4c82..28d6403eb3 100644 --- a/erpnext/docs/user/manual/de/buying/setup/buying-settings.md +++ b/erpnext/docs/user/manual/de/buying/setup/buying-settings.md @@ -3,7 +3,7 @@ Hier können Sie Werte einstellen, die in den Transaktionen des Moduls Einkauf zugrunde gelegt werden. -![Einkaufseinstellungen](/docs/assets/img/buying/buying-settings.png) +![Einkaufseinstellungen]({{docs_base_url}}/assets/img/buying/buying-settings.png) Lassen Sie uns die verschiedenen Optionen durckgehen. diff --git a/erpnext/docs/user/manual/de/buying/setup/supplier-type.md b/erpnext/docs/user/manual/de/buying/setup/supplier-type.md index 172aef727c..a379ec8192 100644 --- a/erpnext/docs/user/manual/de/buying/setup/supplier-type.md +++ b/erpnext/docs/user/manual/de/buying/setup/supplier-type.md @@ -9,7 +9,7 @@ Aufbauend darauf, was die Lieferanten anbieten, werden Sie in verschiedene Kateg > Einkauf > Einstellungen > Lieferantentyp > Neuer Lieferantentyp -Lieferantentyp +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/erpnext/docs/user/manual/de/buying/supplier-quotation.md b/erpnext/docs/user/manual/de/buying/supplier-quotation.md index 30487fcf64..93db6a7d6c 100644 --- a/erpnext/docs/user/manual/de/buying/supplier-quotation.md +++ b/erpnext/docs/user/manual/de/buying/supplier-quotation.md @@ -7,7 +7,7 @@ Sie können ein Lieferantenangebot aus einer Materialanfrage heraus erstellen. ### Flußdiagramm zum Lieferantenangebot -Lieferantenangebot +Lieferantenangebot Sie können ein Lieferantenangebot auch direkt erstellen über: @@ -15,7 +15,7 @@ Sie können ein Lieferantenangebot auch direkt erstellen über: ### Ein Lieferantenangebot erstellen -Lieferantenangebot +Lieferantenangebot 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/erpnext/docs/user/manual/de/buying/supplier.md b/erpnext/docs/user/manual/de/buying/supplier.md index 37eb37662d..eadb4ce8fc 100644 --- a/erpnext/docs/user/manual/de/buying/supplier.md +++ b/erpnext/docs/user/manual/de/buying/supplier.md @@ -7,7 +7,7 @@ So können Sie einen neuen Lieferanten erstellen: > Einkauf > Dokumente > Lieferant > Neu -Lieferant +Lieferant ### Kontakte und Adressen diff --git a/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md b/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md index ef40f4534b..c74029b5be 100644 --- a/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md +++ b/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md @@ -4,18 +4,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. -Customer Portal Order 1 +Customer Portal Order 1 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. -Customer Portal Order 1 +Customer Portal Order 1 ### Rechnung mit Status "gezahlt" -Customer Portal Order 1 +Customer Portal Order 1 ### Rechnung mit Status "abgerechnet" -Customer Portal Order 1 +Customer Portal Order 1 {next} diff --git a/erpnext/docs/user/manual/de/customer-portal/issues.md b/erpnext/docs/user/manual/de/customer-portal/issues.md index dee8eb1f61..8f0c7d3b22 100644 --- a/erpnext/docs/user/manual/de/customer-portal/issues.md +++ b/erpnext/docs/user/manual/de/customer-portal/issues.md @@ -5,17 +5,17 @@ Kunden können über das Kundenportal sehr einfach Fälle eröffnen. Eine einfac ### Ticketliste leeren -Ausgabeliste +Ausgabeliste ### Neuer Fall -Neues Problem +Neues Problem ### Fall öffnen -Ausgabe aufgehoben +Ausgabe aufgehoben ### Fall beantworten -Frage beantworten +Frage beantworten {next} diff --git a/erpnext/docs/user/manual/de/customer-portal/portal-login.md b/erpnext/docs/user/manual/de/customer-portal/portal-login.md index 5bff27599b..455dfac1da 100644 --- a/erpnext/docs/user/manual/de/customer-portal/portal-login.md +++ b/erpnext/docs/user/manual/de/customer-portal/portal-login.md @@ -3,6 +3,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. -Website User Signup +Website User Signup {next} diff --git a/erpnext/docs/user/manual/de/customer-portal/sign-up.md b/erpnext/docs/user/manual/de/customer-portal/sign-up.md index 35a660d552..0a91145d58 100644 --- a/erpnext/docs/user/manual/de/customer-portal/sign-up.md +++ b/erpnext/docs/user/manual/de/customer-portal/sign-up.md @@ -6,11 +6,11 @@ Kunden müssen sich über die Webseite als Kunden registrieren. ### Schritt 1: Klicken Sie auf das Registrieren-Symbol -Website User Signup +Website User Signup ### Schritt 3: Geben Sie Ihren Kundennamen und Ihre ID ein -Website User Signup +Website User Signup Wenn der Registrierungsprozess abgeschlossen ist, wird dem Kunden eine E-Mail mit dem Passwort zugeschickt. diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md index 315e062064..01bfaa7b01 100644 --- a/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md +++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md @@ -17,7 +17,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. -![Grundlagen zum Doctype](/docs/assets/img/setup/customize/doctype-basics.png) +![Grundlagen zum Doctype]({{docs_base_url}}/assets/img/setup/customize/doctype-basics.png) ### Felder @@ -32,7 +32,7 @@ Felder sind viel mehr als Datenbankspalten; sie können sein: 5. Aktionen (Schaltflächen) 6. Anhänge oder Bilder -![Felder im DocType](/docs/assets/img/setup/customize/Doctype-all-fields.png) +![Felder im DocType]({{docs_base_url}}/assets/img/setup/customize/Doctype-all-fields.png) 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. @@ -42,19 +42,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**. -![Bezeichnung von DocTypes](/docs/assets/img/setup/customize/doctype-field-naming.png) +![Bezeichnung von DocTypes]({{docs_base_url}}/assets/img/setup/customize/doctype-field-naming.png) ### Berechtigung In dieser Tabelle können Sie Rollen und Berechtigungs-Rollen für diese für die betreffenden DocTypes auswählen. -![Berechtigungen bei DocTypes](/docs/assets/img/setup/customize/Doctype-permissions.png) +![Berechtigungen bei DocTypes]({{docs_base_url}}/assets/img/setup/customize/Doctype-permissions.png) ### DocTypes abspeichern Wenn Sie einen DocType abspeichern, erscheint ein Popup-Fenster über welches Sie den Namen des DocTypes eingeben können. -![DocTypes speichern](/docs/assets/img/setup/customize/Doctype-save.png) +![DocTypes speichern]({{docs_base_url}}/assets/img/setup/customize/Doctype-save.png) ### Der DocType im System @@ -62,12 +62,12 @@ Um den DocType zu aktivieren, öffnen Sie das Modul, welches Sie für den DocTyp > Personalwesen > Dokumente > Buch -![Übersicht der DocTypes](/docs/assets/img/setup/customize/Doctype-list-view.png) +![Übersicht der DocTypes]({{docs_base_url}}/assets/img/setup/customize/Doctype-list-view.png) ### Buchvorlage Wenn Sie die Felder ausfüllen, schaut das ganze dann so aus. -![Übersicht der DocTypes](/docs/assets/img/setup/customize/Doctype-book-added.png) +![Übersicht der DocTypes]({{docs_base_url}}/assets/img/setup/customize/Doctype-book-added.png) {next} diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md index e890f5ddee..beeec4bf13 100644 --- a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md +++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md @@ -16,7 +16,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. -Formular anpassen - benutzerdefiniertes Feld +Formular anpassen - benutzerdefiniertes Feld Im Folgenden sind die Schritte aufgeführt, wie man ein benutzerdefiniertes Feld in ein bestehendes Formular einfügt. @@ -28,31 +28,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. -Select Document Type +Select Document Type ### 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. -Select Document Type +Select Document Type ### Einstellen, nach welchem Element eingefügt werden soll ("Einfügen nach") Diese Auswahl enthält alle bereits existierenden Felder des ausgewählten Formulars/des DocTypes. Ihr benutzerdefiniertes Feld wird nach dem Feld eingefügt, das Sie unter "Einfügen nach" auswählen. -Select Document Type +Select Document Type ### Feldtyp auswählen Klicken Sie hier um weitere Informationen über Feldtypen, die Sie bei einem benutzerdefinierten Feld auswählen können, zu erhalten. -Select Document Type +Select Document Type ### 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. -Select Document Type +Select Document Type 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. @@ -69,7 +69,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. -Select Document Type +Select Document Type ### Benutzerdefiniertes Feld löschen diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md index 7c62ae5ade..8e2e842c8c 100644 --- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md +++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md @@ -5,7 +5,7 @@ Wenn Sie Formate von ERPNext-Formularen ändern wollen, können Sie das über be > Einstellungen > Anpassen > Benutzerdefiniertes Skript -Custom Script +Custom Script ### Themen diff --git a/erpnext/docs/user/manual/de/customize-erpnext/document-title.md b/erpnext/docs/user/manual/de/customize-erpnext/document-title.md index 5e5766be20..3b13208b8a 100644 --- a/erpnext/docs/user/manual/de/customize-erpnext/document-title.md +++ b/erpnext/docs/user/manual/de/customize-erpnext/document-title.md @@ -24,14 +24,14 @@ Sie können eine Bezeichnung definieren, indem Sie Dokumenteneinstellungen in ge > {customer_name} for {project} Bezeichnung anpassen + 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. Bearbeitbare Bezeichnung + 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/erpnext/docs/user/manual/de/customize-erpnext/print-format.md b/erpnext/docs/user/manual/de/customize-erpnext/print-format.md index b23335d69a..f1caada7e2 100644 --- a/erpnext/docs/user/manual/de/customize-erpnext/print-format.md +++ b/erpnext/docs/user/manual/de/customize-erpnext/print-format.md @@ -14,7 +14,7 @@ Um Ihre eigenen Versionen zu erstellen, öffnen Sie eine bereits vorhandene Vorl > Einstellungen > Druck > Druckformate -![Druckformat](/docs/assets/img/customize/print-settings.png) +![Druckformat]({{docs_base_url}}/assets/img/customize/print-settings.png) 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. @@ -37,7 +37,7 @@ Um Ihre Druck- und PDF-Einstellungen zu bearbeiten/zu aktualisieren, gehen Sie z > Einstellungen > Druck und Branding > Druckeinstellungen -![Druckformat](/docs/assets/img/customize/print-settings.png) +![Druckformat]({{docs_base_url}}/assets/img/customize/print-settings.png) ### Beispiel diff --git a/erpnext/docs/user/manual/de/human-resources/appraisal.md b/erpnext/docs/user/manual/de/human-resources/appraisal.md index 34a9217d33..ccec5b2cdf 100644 --- a/erpnext/docs/user/manual/de/human-resources/appraisal.md +++ b/erpnext/docs/user/manual/de/human-resources/appraisal.md @@ -7,13 +7,13 @@ In ERPNext können Sie Mitarbeiterbeurteilungen verwalten, in dem Sie für jede #### Schritt 1: Wählen Sie eine Bewertungsvorlage aus -Beurteilung +Beurteilung Wenn Sie eine Vorlage ausgewählt haben, erscheint der restliche Teil des Formulars. #### Schritt 2: Geben Sie die Daten des Mitarbeiters ein -Beurteilung +Beurteilung 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/erpnext/docs/user/manual/de/human-resources/attendance.md b/erpnext/docs/user/manual/de/human-resources/attendance.md index 9ec5f953cb..744077dd12 100644 --- a/erpnext/docs/user/manual/de/human-resources/attendance.md +++ b/erpnext/docs/user/manual/de/human-resources/attendance.md @@ -5,7 +5,7 @@ Ein Anwesenheitsdatensatz der wiedergibt, dass ein Mitarbeiter zu einem bestimmt > Personalwesen > Dokumente > Anwesenheit > Neu -Anwesenheit +Anwesenheit Sie können einen monatlichen Report über Ihre Anwesenheiten erhalten, indem Sie zum "Monatlichen Anwesenheitsbericht" gehen. diff --git a/erpnext/docs/user/manual/de/human-resources/employee.md b/erpnext/docs/user/manual/de/human-resources/employee.md index e5995695e3..7d39f6a841 100644 --- a/erpnext/docs/user/manual/de/human-resources/employee.md +++ b/erpnext/docs/user/manual/de/human-resources/employee.md @@ -7,6 +7,6 @@ Um einen neuen Mitarbeiter zu erstellen, gehen Sie zu: > Personalwesen > Dokumente > Mitarbeiter > Neu -Mitarbeiter +Mitarbeiter {next} diff --git a/erpnext/docs/user/manual/de/human-resources/expense-claim.md b/erpnext/docs/user/manual/de/human-resources/expense-claim.md index 12e69bfb3b..3fda0494ee 100644 --- a/erpnext/docs/user/manual/de/human-resources/expense-claim.md +++ b/erpnext/docs/user/manual/de/human-resources/expense-claim.md @@ -7,7 +7,7 @@ Um eine neue Aufwandsabrechnung zu erstellen, gehen Sie zu: > Personalwesen > Dokumente > Aufwandsabrechnung > Neu -Aufwandsabrechnung +Aufwandsabrechnung 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. @@ -27,6 +27,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. -Aufwandsabrechnung - Verknüpfung zum Projekt +Aufwandsabrechnung - Verknüpfung zum Projekt {next} diff --git a/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md b/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md index 8cef87d712..bf0e195051 100644 --- a/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md +++ b/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md @@ -5,30 +5,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. -Mitarbeier-Urlaubskonto +Mitarbeier-Urlaubskonto ### Mitarbeiter-Geburtstag Dieser Bericht zeigt die Geburtstage der Mitarbeiter an. -Mitarbeiter-Geburtstag +Mitarbeiter-Geburtstag ### Mitarbeiterinformationen Dieser Bericht wichtige Informationen über Mitarbeiter in den Mitarbeiterdatensätzen. -Mitarbeiterinformation +Mitarbeiterinformation ### Übersicht monatliche Gehälter Dieser Bericht zeigt die Nettozahlungen der Mitarbeiter und deren einzelne Bestandteile im Überblick. -Übersicht monatliche Gehälter +Übersicht monatliche Gehälter ### Monatliche Anwesenheitsliste Dieser Bericht zeit die monatlichen Anwesenheiten ausgewählter Mitarbeiter im Überblick. -Monatliche Anwesenheitsliste +Monatliche Anwesenheitsliste {next} diff --git a/erpnext/docs/user/manual/de/human-resources/job-applicant.md b/erpnext/docs/user/manual/de/human-resources/job-applicant.md index 62de8011a8..3bbe4c19d4 100644 --- a/erpnext/docs/user/manual/de/human-resources/job-applicant.md +++ b/erpnext/docs/user/manual/de/human-resources/job-applicant.md @@ -7,7 +7,7 @@ Um einen neuen Bewerber anzulegen, gehen Sie zu: > Personalwesen > Dokumente > Bewerber > Neu -Bewerber +Bewerber ### Verknüpfung mit einem E-Mail-Konto @@ -20,6 +20,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. -E-Mail-Konto +E-Mail-Konto {next} diff --git a/erpnext/docs/user/manual/de/human-resources/job-opening.md b/erpnext/docs/user/manual/de/human-resources/job-opening.md index 0231df62c4..b14516eb14 100644 --- a/erpnext/docs/user/manual/de/human-resources/job-opening.md +++ b/erpnext/docs/user/manual/de/human-resources/job-opening.md @@ -7,6 +7,6 @@ Um eine neue Offene Stelle anzulegen, gehen Sie zu: > Personalwesen > Dokumente > Offene Stellen > Neu -Offene Stellen +Offene Stellen {next} diff --git a/erpnext/docs/user/manual/de/human-resources/leave-application.md b/erpnext/docs/user/manual/de/human-resources/leave-application.md index faf5b6efea..cf02a1c63f 100644 --- a/erpnext/docs/user/manual/de/human-resources/leave-application.md +++ b/erpnext/docs/user/manual/de/human-resources/leave-application.md @@ -5,14 +5,14 @@ Wenn Ihre Firma ein formales System hat, wo Mitarbeiter einen Antrag für Ihren > Personalwesen > Dokumente > Urlaubsantrag > Neu -Urlaubsantrag +Urlaubsantrag ### 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. -Urlaubsgenehmiger +Urlaubsgenehmiger > 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/erpnext/docs/user/manual/de/human-resources/offer-letter.md b/erpnext/docs/user/manual/de/human-resources/offer-letter.md index e5457748eb..63cf0be869 100644 --- a/erpnext/docs/user/manual/de/human-resources/offer-letter.md +++ b/erpnext/docs/user/manual/de/human-resources/offer-letter.md @@ -7,12 +7,12 @@ Ein ERPNext können Sie einen Datensatz zu den Angebotsschreiben, die Sie an Bew > Personalwesen > Dokumente > Angebotsschreiben > Neu -Angebotsschreiben +Angebotsschreiben > 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. -Angebotsschreiben +Angebotsschreiben {next} diff --git a/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md index f47dda24b2..a8eb33a7fa 100644 --- a/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md +++ b/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md @@ -43,7 +43,7 @@ Um eine neue Gehaltsstruktur zu erstellen, gehen Sie zu: #### Abbildung 1: Gehaltsstruktur -Gehaltsstruktur +Gehaltsstruktur ### In der Gehaltsstruktur @@ -67,7 +67,7 @@ Um eine Gehaltsabrechnung über die Gehaltsstruktur zu erstellen, klicken Sie au #### Abbildung 2: Gehaltsabrechnung -Lohnzettel +Lohnzettel Sie können auch Gehaltsabrechnungen für mehrere verschiedene Mitarbeiter über "Gehaltsabrechnung bearbeiten" anlegen. @@ -75,7 +75,7 @@ Sie können auch Gehaltsabrechnungen für mehrere verschiedene Mitarbeiter über #### Abbildung 3: Gehaltsabrechnung durchführen -Gehaltsabrechnung durchführen +Gehaltsabrechnung durchführen Beim Bearbeiten einer Gehaltsabrechnung diff --git a/erpnext/docs/user/manual/de/human-resources/setup/branch.md b/erpnext/docs/user/manual/de/human-resources/setup/branch.md index 1328d7350c..f6913a7223 100644 --- a/erpnext/docs/user/manual/de/human-resources/setup/branch.md +++ b/erpnext/docs/user/manual/de/human-resources/setup/branch.md @@ -3,6 +3,6 @@ Filialen Ihres Unternehmens -Filiale +Filiale {next} diff --git a/erpnext/docs/user/manual/de/human-resources/setup/deduction-type.md b/erpnext/docs/user/manual/de/human-resources/setup/deduction-type.md index e50b51f5bc..ddd3e9d2d3 100644 --- a/erpnext/docs/user/manual/de/human-resources/setup/deduction-type.md +++ b/erpnext/docs/user/manual/de/human-resources/setup/deduction-type.md @@ -7,6 +7,6 @@ Um eine neue Abzugsart anzulegen, gehen Sie zu: > Personalwesen > Einstellungen > Abzugsart > Neu -Abzugsart +Abzugsart {next} diff --git a/erpnext/docs/user/manual/de/human-resources/setup/department.md b/erpnext/docs/user/manual/de/human-resources/setup/department.md index 532174f7cb..c54928b652 100644 --- a/erpnext/docs/user/manual/de/human-resources/setup/department.md +++ b/erpnext/docs/user/manual/de/human-resources/setup/department.md @@ -3,6 +3,6 @@ Abteilungen Ihres Unternehmens -Abteilung +Abteilung {next} diff --git a/erpnext/docs/user/manual/de/human-resources/setup/designation.md b/erpnext/docs/user/manual/de/human-resources/setup/designation.md index 0d01588e9b..dee66582ef 100644 --- a/erpnext/docs/user/manual/de/human-resources/setup/designation.md +++ b/erpnext/docs/user/manual/de/human-resources/setup/designation.md @@ -3,6 +3,6 @@ Stellenbezeichnungen in Ihrem Unternehmen -Stellenbezeichnung +Stellenbezeichnung {next} diff --git a/erpnext/docs/user/manual/de/human-resources/setup/earning-type.md b/erpnext/docs/user/manual/de/human-resources/setup/earning-type.md index 51eb375cfe..d79e6bbb2f 100644 --- a/erpnext/docs/user/manual/de/human-resources/setup/earning-type.md +++ b/erpnext/docs/user/manual/de/human-resources/setup/earning-type.md @@ -7,6 +7,6 @@ Um eine neue Eikommensart zu erstellen, gehen Sie zu: > Personalwesen > Einstellungen > Einkommensart > Neu -Einkommensart +Einkommensart {next} diff --git a/erpnext/docs/user/manual/de/human-resources/setup/employment-type.md b/erpnext/docs/user/manual/de/human-resources/setup/employment-type.md index c9d6ce2298..9c334cf2a7 100644 --- a/erpnext/docs/user/manual/de/human-resources/setup/employment-type.md +++ b/erpnext/docs/user/manual/de/human-resources/setup/employment-type.md @@ -3,6 +3,6 @@ Verschiedene Beschäftigungsverträge, die Sie mit Ihren Mitarbeitern abgeschlossen haben. -Art der Beschäftigung +Art der Beschäftigung {next} diff --git a/erpnext/docs/user/manual/de/human-resources/setup/holyday-list.md b/erpnext/docs/user/manual/de/human-resources/setup/holyday-list.md index 161a867584..cec5110c93 100644 --- a/erpnext/docs/user/manual/de/human-resources/setup/holyday-list.md +++ b/erpnext/docs/user/manual/de/human-resources/setup/holyday-list.md @@ -3,6 +3,6 @@ Sie können Urlaub für ein bestimmtes Jahr über die Urlaubsübersicht planen. -Urlaubsübersicht +Urlaubsübersicht {next} diff --git a/erpnext/docs/user/manual/de/human-resources/setup/hr-settings.md b/erpnext/docs/user/manual/de/human-resources/setup/hr-settings.md index 8e2e5e2fb5..c4545983e8 100644 --- a/erpnext/docs/user/manual/de/human-resources/setup/hr-settings.md +++ b/erpnext/docs/user/manual/de/human-resources/setup/hr-settings.md @@ -3,6 +3,6 @@ Globale Einstellungen zu Dokumenten des Personalwesens -Einstellungen zum Personalwesen +Einstellungen zum Personalwesen {next} diff --git a/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md b/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md index d49121b266..6f53b8324c 100644 --- a/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md +++ b/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md @@ -3,7 +3,7 @@ Hilft Ihnen Urlaub bestimmten Mitarbeitern zuzuteilen -Urlaubszuordnung +Urlaubszuordnung 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/erpnext/docs/user/manual/de/human-resources/setup/leave-type.md b/erpnext/docs/user/manual/de/human-resources/setup/leave-type.md index 97b5af8589..ece1c58b19 100644 --- a/erpnext/docs/user/manual/de/human-resources/setup/leave-type.md +++ b/erpnext/docs/user/manual/de/human-resources/setup/leave-type.md @@ -3,7 +3,7 @@ Geben Sie den Urlaubstyp an, der Mitarbeitern zugeordnet werden kann. -Urlaubstyp +Urlaubstyp * "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/erpnext/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md b/erpnext/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md index a4a786250e..de109f433b 100644 --- a/erpnext/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md +++ b/erpnext/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md @@ -3,6 +3,6 @@ Das Urlaubszuordnungs-Werkzeug hilft Ihnen dabei eine bestimmte Menge an Urlaub einem Mitarbeiter zuzuteilen. -Urlaubsantrag +Urlaubsantrag {next} diff --git a/erpnext/docs/user/manual/de/human-resources/tools/upload-attendance.md b/erpnext/docs/user/manual/de/human-resources/tools/upload-attendance.md index ba351b52fa..3f94e83875 100644 --- a/erpnext/docs/user/manual/de/human-resources/tools/upload-attendance.md +++ b/erpnext/docs/user/manual/de/human-resources/tools/upload-attendance.md @@ -7,6 +7,6 @@ Um eine Anwesenheit hochzuladen, gehen Sie zu: > Personalwesen > Werkzeuge > Anwesenheit hochladen -Anwesenheit hochladen +Anwesenheit hochladen {next} diff --git a/erpnext/docs/user/manual/de/human-resources/training.md b/erpnext/docs/user/manual/de/human-resources/training.md index 84091d94f9..4e039deabf 100644 --- a/erpnext/docs/user/manual/de/human-resources/training.md +++ b/erpnext/docs/user/manual/de/human-resources/training.md @@ -3,13 +3,13 @@ Erstelle ein Schulungsprogramm und teile die Schulungstermine ein. Auf der Seite des Schulungsprogramms gibt es einen Link zur Ansicht aller Schulungstermine dieses Schulungsprogramms. -Employee +Employee ### 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. -Employee +Employee ### Teilnehmer zum Schulungstermin einladen @@ -17,7 +17,7 @@ Die Teilnehmer können aus der Liste der Mitarbeiter ausgewählt werden. Standardmäßig ist der Status des Mitarbeiters „Offen“. -Employee +Employee 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. @@ -25,7 +25,7 @@ Wenn der Schulungstermin gebucht wird, dann wird eine Benachrichtigung an den Mi Nach der Schulung können die Ergebnisse gespeichert werden basierend auf dem Feedback des Trainers. -Employee +Employee 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. @@ -33,5 +33,5 @@ Wenn das Schulungsergebnis gebucht wird, bekommen die Mitarbeiter eine Benachric Die Mitarbeiter können ihre Rückmeldung durch die Schulungsbeurteilung geben. -Employee +Employee diff --git a/erpnext/docs/user/manual/de/introduction/key-workflows.md b/erpnext/docs/user/manual/de/introduction/key-workflows.md index 18404794de..ac5392c243 100644 --- a/erpnext/docs/user/manual/de/introduction/key-workflows.md +++ b/erpnext/docs/user/manual/de/introduction/key-workflows.md @@ -4,7 +4,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. -Hohe Auflösung +Hohe Auflösung _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/erpnext/docs/user/manual/de/introduction/the-champion.md b/erpnext/docs/user/manual/de/introduction/the-champion.md index b04de656ed..912c25213b 100644 --- a/erpnext/docs/user/manual/de/introduction/the-champion.md +++ b/erpnext/docs/user/manual/de/introduction/the-champion.md @@ -1,7 +1,7 @@ # Der Champion Beigetragen von CWT Connector & Wire Technology GmbH -Champion +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/erpnext/docs/user/manual/de/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/de/manufacturing/bill-of-materials.md index 52ab420d22..55501e6753 100644 --- a/erpnext/docs/user/manual/de/manufacturing/bill-of-materials.md +++ b/erpnext/docs/user/manual/de/manufacturing/bill-of-materials.md @@ -7,11 +7,11 @@ Um passende Einkaufsanfragen zu erstellen, müssen Sie Ihre Stücklisten immer a >Fertigung > Dokumente > Stückliste > Neue Stückliste -Task +Task Um Arbeitsgänge hinzuzufügen, wählen Sie "Mit Arbeitsgängen". Die Übersicht der Arbeitsgänge erscheint. -Task +Task * 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. @@ -23,16 +23,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. -Kostenkalkulation +Kostenkalkulation * Diese Kosten können über die Schaltfläche "Kosten aktualisieren" aktualisiert werden. -Kosten aktualisieren +Kosten aktualisieren ### 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. -Aufgelöste Ansicht +Aufgelöste Ansicht {next} diff --git a/erpnext/docs/user/manual/de/manufacturing/operation.md b/erpnext/docs/user/manual/de/manufacturing/operation.md index cc1637561b..07ca86060d 100644 --- a/erpnext/docs/user/manual/de/manufacturing/operation.md +++ b/erpnext/docs/user/manual/de/manufacturing/operation.md @@ -9,6 +9,6 @@ Sie können einen Arbeitsgang anlegen über: > Fertigung > Dokumente > Arbeitsgang > Neu -Arbeitsgang +Arbeitsgang {next} diff --git a/erpnext/docs/user/manual/de/manufacturing/production-order.md b/erpnext/docs/user/manual/de/manufacturing/production-order.md index d93391abcf..e6ddd7b107 100644 --- a/erpnext/docs/user/manual/de/manufacturing/production-order.md +++ b/erpnext/docs/user/manual/de/manufacturing/production-order.md @@ -7,7 +7,7 @@ Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generi > Fertigung > Dokumente > Fertigungsauftrag > Neu -Fertigungsauftrag +Fertigungsauftrag ### Einen Fertigungsauftrag erstellen @@ -23,11 +23,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. -Fertigungsauftrag - Arbeitsgänge +Fertigungsauftrag - Arbeitsgänge * 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. -Fertigungsauftrag - Arbeitsgänge neu zuordnen +Fertigungsauftrag - Arbeitsgänge neu zuordnen * Wählen Sie den betreffenden Arbeitsgang aus und ändern Sie seinen Arbeitsplatz. * Sie können auch die Dauer des Arbeitsgangs ändern. @@ -42,28 +42,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". -Materialübertrag +Materialübertrag * Geben Sie die Menge des Materials an, das übertragen werden soll. -Materialübertrag - Menge +Materialübertrag - Menge * Übertragen Sie die Lagerbuchung. -Lagerbuchung zum Kundenauftrag +Lagerbuchung zum Kundenauftrag * Das an die Fertigung übertragene Material wird basierend auf der Lagerbuchung im Fertigungsauftrag aktualisiert. -Lagerbuchung zum Fertigungsauftrag +Lagerbuchung zum Fertigungsauftrag ### Zeitprotokoll erstellen -* Der Fortschritt des Fertigungsauftrages kann über ein [Zeitprotokoll]Make TL against PO mitprotokolliert werden. +* Der Fortschritt des Fertigungsauftrages kann über ein [Zeitprotokoll]Make TL against PO 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. -Zeitprotokoll zum Fertigungsauftrag erstellen +Zeitprotokoll zum Fertigungsauftrag erstellen ### Fertige Erzeugnisse aktualisieren @@ -71,11 +71,11 @@ Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generi * Das erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager "Fertige Erzeugnisse" gutschreibt. * Klicken Sie auf "Fertige Erzeugnisse aktualisieren". -Fertigerzeugnisse aktualiseren +Fertigerzeugnisse aktualiseren * Geben Sie die Menge des übertragenen Materials an. -Menge der Fertigerzeugnisse aktualisieren +Menge der Fertigerzeugnisse aktualisieren >Tipp: Sie können einen Fertigungsauftrag auch teilweise fertig stellen, indem Sie über eine Lagerbuchung das Lager Fertige Erzeugnisse aktualisieren. @@ -90,7 +90,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". -Fertigungsauftrag anhalten +Fertigungsauftrag anhalten * Sie können auch einen angehaltenen Fertigungsauftrag wieder weiter laufen lassen. diff --git a/erpnext/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md index fdf60b61cf..8f77716abb 100644 --- a/erpnext/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md +++ b/erpnext/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md @@ -5,7 +5,7 @@ Die Fertigungseinstellungen finden Sie unter > Fertigung > Einstellungen > Fertigungseinstellungen -Fertigungseinstellungen +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/erpnext/docs/user/manual/de/manufacturing/subcontracting.md b/erpnext/docs/user/manual/de/manufacturing/subcontracting.md index 3c0e36f41d..2796610470 100644 --- a/erpnext/docs/user/manual/de/manufacturing/subcontracting.md +++ b/erpnext/docs/user/manual/de/manufacturing/subcontracting.md @@ -11,7 +11,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. -Fremdvergabe +Fremdvergabe **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/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md b/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md index dbe772b94a..922c32ac08 100644 --- a/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md +++ b/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md @@ -34,7 +34,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. -Stücklistenaustauschwerkzeug +Stücklistenaustauschwerkzeug 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/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md index b7ef2d0b97..63e51f8c48 100644 --- a/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md +++ b/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md @@ -12,30 +12,30 @@ Um das Werkzeug zur Fertigungsplanung zu nutzen, gehen Sie zu: > Fertigung > Werkzeuge > Werkzeug zur Fertigungsplanung -Werkzeug zur Fertigungsplanung +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. -Werkzeug zur Fertigungsplanung +Werkzeug zur Fertigungsplanung ### Schritt 2: Artikel aus Kundenaufträgen abrufen Sie können Artikel hinzufügen, entfernen oder die Menge dieser Artikel verändern. -Werkzeug zur Fertigungsplanung +Werkzeug zur Fertigungsplanung ### Schritt 3: Fertigungsaufträge erstellen -Werkzeug zur Fertigungsplanung +Werkzeug zur Fertigungsplanung ### Schritt 4: Materialanfragen erstellen Erstellen Sie für Artikel mit prognostiziertem Engpass Materialanfragen. -Werkzeug zur Fertigungsplanung +Werkzeug zur Fertigungsplanung Das Werkzeug zur Fertigungsplanung wird auf zwei Ebenend verwendet: diff --git a/erpnext/docs/user/manual/de/manufacturing/workstation.md b/erpnext/docs/user/manual/de/manufacturing/workstation.md index 6584ebc221..34e8ac6dcf 100644 --- a/erpnext/docs/user/manual/de/manufacturing/workstation.md +++ b/erpnext/docs/user/manual/de/manufacturing/workstation.md @@ -9,7 +9,7 @@ Sie können einen Arbeitsplatz erstellen über: > Fertigung > Dokumente > Arbeitsplatz > Neu -Arbeitsplatz +Arbeitsplatz 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/erpnext/docs/user/manual/de/projects/activity-cost.md b/erpnext/docs/user/manual/de/projects/activity-cost.md index 25e6452744..705846b607 100644 --- a/erpnext/docs/user/manual/de/projects/activity-cost.md +++ b/erpnext/docs/user/manual/de/projects/activity-cost.md @@ -3,4 +3,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. -Aktivitätskosten +Aktivitätskosten diff --git a/erpnext/docs/user/manual/de/projects/activity-type.md b/erpnext/docs/user/manual/de/projects/activity-type.md index 1e8c534ad2..ff61a76870 100644 --- a/erpnext/docs/user/manual/de/projects/activity-type.md +++ b/erpnext/docs/user/manual/de/projects/activity-type.md @@ -3,7 +3,7 @@ Unter dem Punkt "Aktivitätsart" wird eine Liste verschiedener Typen von Aktivitäten erstellt zu denen Zeitprotokolle erstellt werden können. -Aktivitätsart +Aktivitätsart Standardmäßig sind die folgenden Aktivitätsarten angelegt: diff --git a/erpnext/docs/user/manual/de/projects/project.md b/erpnext/docs/user/manual/de/projects/project.md index e9ce1b874f..a78a91b0e8 100644 --- a/erpnext/docs/user/manual/de/projects/project.md +++ b/erpnext/docs/user/manual/de/projects/project.md @@ -3,24 +3,24 @@ Das Projektmanagement in ERPNext ist aufgabengesteuert. Sie können ein Projekt erstellen und ihm mehrere unterschiedliche Aufgaben zuweisen. -Projekt +Projekt ### 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). -Projekt +Projekt * Um eine Aufgabe, die zu einem Projekt erstellt wurde, anzusehen, klicken Sie auf "Aufgabe", -Projekt - Aufgabe ansehen +Projekt - Aufgabe ansehen -Projekt - List der Aufgaben +Projekt - List der Aufgaben * Sie können Aufgaben auch über das Projektdokument selbst ansehen. -Projekt - Aufgabenmatrix +Projekt - Aufgabenmatrix ### Zeitmanagement @@ -28,13 +28,13 @@ ERPNext verwendet [Zeitprotokolle](/docs/user/manual/de/projects/time-log.html) * Um ein Zeitprotokoll zu einem Projekt anzusehen, klicken Sie auf "Zeitprotokolle" -Projekt - Zeitprotokoll ansehen +Projekt - Zeitprotokoll ansehen -Projekt - Übersicht der Zeitprotokolle +Projekt - Übersicht der Zeitprotokolle * Sie können ein Zeitprotokoll auch direkt erstellen und mit dem Projekt verknüpfen. -Projekt - Zeitprotokoll verknüpfen +Projekt - Zeitprotokoll verknüpfen ### Aufwände verwalten @@ -42,27 +42,27 @@ Sie können [Aufwandsabrechnungen](/docs/user/manual/de/human-resources/expense- * Um die Aufwandsabrechnungen zu einem Projekt anzusehen, klicken Sie auf "Aufwandsabrechnung". -Projekt - Aufwandsabrechnung ansehen +Projekt - Aufwandsabrechnung ansehen * Sie könne Aufwandsabrechnungen auch direkt erstellen und mit einem Projekt verknüpfen. -Projekt - Aufwandsabrechnung verknüpfen +Projekt - Aufwandsabrechnung verknüpfen * Der Gesamtbetrag der mit einem Projekt verbuchten Aufwandsabrechnungen wird unter "Gesammtsumme der Aufwandsabrechnungen" im Abschnitt "Kostenabrechnung" angezeigt. -Projekt - Gesamtsumme Aufwandsabrechnung +Projekt - Gesamtsumme Aufwandsabrechnung ### 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. -Projekt - Kostenstelle +Projekt - Kostenstelle ### Projektkostenabrechnung Der Abschnitt Projektkostenabrechnung hilft Ihnen dabei, die Zeit und die AUfwände die in einem Projekt anfallen, nachzuverfolgen. -Projekt - Kostenabrechnung +Projekt - Kostenabrechnung * 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. @@ -71,7 +71,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. -Projekt - Kundenauftrag +Projekt - Kundenauftrag ### Gantt-Diagramm @@ -79,8 +79,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". -Projekt - Gantt-Diagramm ansehen +Projekt - Gantt-Diagramm ansehen -Projekt - Gantt-Diagramm +Projekt - Gantt-Diagramm [next] diff --git a/erpnext/docs/user/manual/de/projects/tasks.md b/erpnext/docs/user/manual/de/projects/tasks.md index 75fd594ec8..f0358aa0d9 100644 --- a/erpnext/docs/user/manual/de/projects/tasks.md +++ b/erpnext/docs/user/manual/de/projects/tasks.md @@ -3,13 +3,13 @@ Ein Projekt wird in Aufgaben unterteilt. In ERPNext können Sie auch Abhängigkeiten zwischen Aufgaben erstellen. -Aufgabe +Aufgabe ### Status der Aufgabe Ein Aufgabe kann folgende Stati haben: "Offen", "In Arbeit", "Wartet auf Überprüfung", "Geschlossen" und "Abgebrochen". -Aufgabe - Status +Aufgabe - Status * 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. @@ -18,7 +18,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. -Anhängigkeiten +Anhängigkeiten * 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. @@ -29,13 +29,13 @@ ERPNext verwendet [Zeitprotokolle](/docs/user/manual/de/projects/time-log.html) * Um ein zu einer Aufgabe erstelltes Zeitprotokoll anzuschauen, klicken Sie auf "Zeitprotokolle". -Aufgabe - Zeitprotokoll ansehen +Aufgabe - Zeitprotokoll ansehen -Aufgabe - Liste der Zeitprotokolle +Aufgabe - Liste der Zeitprotokolle * Sie können ein Zeitprotokoll auch direkt erstellen und mit einer Aufgabe verknüpfen. -Aufgabe - Zeitprotokoll verknüpfen +Aufgabe - Zeitprotokoll verknüpfen ### Ausgabenmanagement @@ -43,15 +43,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". -Aufgabe - Aufwandsabrechnung ansehen +Aufgabe - Aufwandsabrechnung ansehen * Sie können eine Aufwandsabrechnung auch direkt erstellen und sie mit einer Aufgabe verknüpfen. -Aufgabe - Aufwandsabrechnung verknüpfen +Aufgabe - Aufwandsabrechnung verknüpfen * Der Gesamtbetrag der Aufwandsabrechnungen zu einer Aufgabe wird unter "Gesamtbetrag der Aufwandsabrechnungen" im Abschnitt Kostenabrechnung angezeigt. -Aufgabe - Gesamtsumme Aufwandsabrechnung +Aufgabe - Gesamtsumme Aufwandsabrechnung {next} diff --git a/erpnext/docs/user/manual/de/projects/time-log-batch.md b/erpnext/docs/user/manual/de/projects/time-log-batch.md index 4383e1c819..6aa85cbe73 100644 --- a/erpnext/docs/user/manual/de/projects/time-log-batch.md +++ b/erpnext/docs/user/manual/de/projects/time-log-batch.md @@ -9,17 +9,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. -Zeitprotokoll - Kalender aufziehen +Zeitprotokoll - Kalender aufziehen ### Ausgangsrechnungen erstellen * Sobald Sie einen Zeitprotokollstapel übertragen haben, sollte die Schaltfläche "Rechnung erstellen" erscheinen. -Zeitprotokoll - Kalender aufziehen +Zeitprotokoll - Kalender aufziehen * Klicken Sie auf diese Schaltfläche und erstellen Sie eine Ausgangsrechnung zu einem Zeitprotokollstapel. -Zeitprotokoll - Kalender aufziehen +Zeitprotokoll - Kalender aufziehen * 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/erpnext/docs/user/manual/de/projects/time-log.md b/erpnext/docs/user/manual/de/projects/time-log.md index 072837ee7f..fcfccc6b78 100644 --- a/erpnext/docs/user/manual/de/projects/time-log.md +++ b/erpnext/docs/user/manual/de/projects/time-log.md @@ -9,7 +9,7 @@ * Projekte * Interne Referenzen -Zeitprotokoll +Zeitprotokoll ### Zeitprotokolle erstellen @@ -21,15 +21,15 @@ Um Zeitprotokolle über den Kalender zu erstellen, gehen Sie zu "Zeitprotokoll" und wählen Sie "Kalender" aus. -Zeitprotokoll - Kalender ansehen +Zeitprotokoll - Kalender ansehen * Um ein Zeitprotokoll für mehrere Tage zu erstellen, klicken Sie und ziehen Sie den Mauszeiger über die Tage. -Zeitprotokoll - Kalender aufziehen +Zeitprotokoll - Kalender aufziehen * Sie können Zeitprotokolle auch aus der Wochen- oder Tagesansicht des Kalender heraus erstellen. -Zeitprotokoll - Kalender aufziehen +Zeitprotokoll - Kalender aufziehen * 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". @@ -41,7 +41,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. -Zeitprotokoll - Abrechnung +Zeitprotokoll - Abrechnung * 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/erpnext/docs/user/manual/de/selling/quotation.md b/erpnext/docs/user/manual/de/selling/quotation.md index 94ff78b9a9..6097abd0da 100644 --- a/erpnext/docs/user/manual/de/selling/quotation.md +++ b/erpnext/docs/user/manual/de/selling/quotation.md @@ -11,11 +11,11 @@ Um ein neues Angebot zu erstellen gehen Sie zu: Sie können auch ein Angebot aus einer Opportunity heraus erstellen. -Angebot aus Opportunity erstellen +Angebot aus Opportunity erstellen Oder Sie erstellen ein neues Angebot und übernehmen Details aus der Opportunity. -Angebot aus Opportunity erstellen +Angebot aus Opportunity erstellen Ein Angebot enthält Informationen über: diff --git a/erpnext/docs/user/manual/de/selling/sales-order.md b/erpnext/docs/user/manual/de/selling/sales-order.md index d980518b20..187aeab37e 100644 --- a/erpnext/docs/user/manual/de/selling/sales-order.md +++ b/erpnext/docs/user/manual/de/selling/sales-order.md @@ -9,7 +9,7 @@ Wenn Ihr Kunde das Angebot annimmt, können Sie das Angebot in einen Kundenauftr ### Flußdiagramm des Kundenauftrags -Kundenauftrag aus Angebot erstellen +Kundenauftrag aus Angebot erstellen Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftrag > Neuer Kundenauftrag @@ -17,11 +17,11 @@ Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftr Sie können einen Kundenauftrag auch aus einem übertragenen Angebot heraus erstellen. -Kundenauftrag aus Angebot erstellen +Kundenauftrag aus Angebot erstellen Oder Sie erstellen einen neuen Kundenauftrag und entnehmen die Details aus dem Angebot. -Kundenauftrag aus Angebot erstellen +Kundenauftrag aus Angebot erstellen Die meisten Informationen im Kundenauftrag sind dieselben wie im Angebot. Einige Dinge möchte der Kundenauftrag aber aktualisiert haben. @@ -60,7 +60,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. -Wiederkehrende Kundenaufträge +Wiederkehrende Kundenaufträge ### Die nächsten Schritte diff --git a/erpnext/docs/user/manual/de/selling/setup/product-bundle.md b/erpnext/docs/user/manual/de/selling/setup/product-bundle.md index d97b31d50c..30475eb8ca 100644 --- a/erpnext/docs/user/manual/de/selling/setup/product-bundle.md +++ b/erpnext/docs/user/manual/de/selling/setup/product-bundle.md @@ -11,7 +11,7 @@ Um ein neues Produkt-Bundle zu erstellen, gehen Sie zu: > Vertrieb > Einstellungen > Produkt-Bundle > Neu -Produkt-Bundle +Produkt-Bundle ### Hauptartikel auswählen @@ -27,7 +27,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. -Produkt-Bundle +Produkt-Bundle 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/erpnext/docs/user/manual/de/selling/setup/sales-partner.md b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md index c4d096e80c..66a95a0593 100644 --- a/erpnext/docs/user/manual/de/selling/setup/sales-partner.md +++ b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md @@ -13,7 +13,7 @@ Um einen Vertriebspartner anzulegen, gehen Sie zu: Vertriebspartner werden mit einem vom Benutzer vergebenen Namen abgespeichert. -Vertriebspartner +Vertriebspartner Sie können die Adressen und Kontaktdaten von Vertriebsmitarbeitern erfassen und sie basierend auf Menge und Betrag jeder Artikelgruppe zuweisen. @@ -21,13 +21,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. -Vertriebspartner +Vertriebspartner Um eine Übersicht Ihrer Partner zu erhalten, gehen Sie zu: https://example.erpnext.com/Partners -Auflistung der Vertriebspartner +Auflistung der Vertriebspartner {next} diff --git a/erpnext/docs/user/manual/de/selling/setup/selling-settings.md b/erpnext/docs/user/manual/de/selling/setup/selling-settings.md index 08492a6a2c..0e71d418f5 100644 --- a/erpnext/docs/user/manual/de/selling/setup/selling-settings.md +++ b/erpnext/docs/user/manual/de/selling/setup/selling-settings.md @@ -3,7 +3,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. -Vertriebseinstellungen +Vertriebseinstellungen ### 1\. Benennung der Kunden nach diff --git a/erpnext/docs/user/manual/de/selling/setup/shipping-rule.md b/erpnext/docs/user/manual/de/selling/setup/shipping-rule.md index 8bf609d121..fc59f02daf 100644 --- a/erpnext/docs/user/manual/de/selling/setup/shipping-rule.md +++ b/erpnext/docs/user/manual/de/selling/setup/shipping-rule.md @@ -3,6 +3,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. -Versandregel +Versandregel {next} diff --git a/erpnext/docs/user/manual/de/setting-up/authorization-rule.md b/erpnext/docs/user/manual/de/setting-up/authorization-rule.md index bcc5674fba..7b202f15d5 100644 --- a/erpnext/docs/user/manual/de/setting-up/authorization-rule.md +++ b/erpnext/docs/user/manual/de/setting-up/authorization-rule.md @@ -37,7 +37,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. -Autorisierungsregel +Autorisierungsregel 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/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md index 851424a84a..c793463ae6 100644 --- a/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md +++ b/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md @@ -13,4 +13,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. -Bulk Rename \ No newline at end of file +Bulk Rename \ No newline at end of file diff --git a/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md index 1ea4e48ae7..a3fccc5824 100644 --- a/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md +++ b/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md @@ -5,7 +5,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: -Importvorgang starten +Importvorgang starten Das Werkzeug hat zwei Abschnitte, einen um eine Vorlage herunter zu laden, und einen zweiten um Daten hoch zu laden. @@ -15,7 +15,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. -Vorlage herunterladen +Vorlage herunterladen * Klicken Sie auf die Tabelle, die Sie herunter laden wollen, oder auf "Alle Tabellen". * Für Massenbearbeitung klicken Sie auf "Mit Daten herunterladen". @@ -34,7 +34,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". -Upload +Upload #### Anmerkungen diff --git a/erpnext/docs/user/manual/de/setting-up/email/email-account.md b/erpnext/docs/user/manual/de/setting-up/email/email-account.md index 1a315d2f96..e2923f6127 100644 --- a/erpnext/docs/user/manual/de/setting-up/email/email-account.md +++ b/erpnext/docs/user/manual/de/setting-up/email/email-account.md @@ -11,7 +11,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. -Kriterien definieren +Kriterien definieren ### Konten zu ausgehenden E-Mails @@ -19,13 +19,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. -Ausgehende E-Mails +Ausgehende E-Mails ### 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. -Eingehende E-Mails +Eingehende E-Mails ### Wie ERPNext Antworten handhabt @@ -35,6 +35,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. -Eingehende Email +Eingehende Email {next} diff --git a/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md index c965c9b466..58f6fe33e9 100644 --- a/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md +++ b/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md @@ -32,7 +32,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/erpnext/docs/user/manual/de/setting-up/email/email-digest.md b/erpnext/docs/user/manual/de/setting-up/email/email-digest.md index 9199ee21a4..18117a3ea2 100644 --- a/erpnext/docs/user/manual/de/setting-up/email/email-digest.md +++ b/erpnext/docs/user/manual/de/setting-up/email/email-digest.md @@ -13,6 +13,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. -E-Mail-Bericht +E-Mail-Bericht {next} diff --git a/erpnext/docs/user/manual/de/setting-up/email/sending-email.md b/erpnext/docs/user/manual/de/setting-up/email/sending-email.md index e1f23b9116..970d257bca 100644 --- a/erpnext/docs/user/manual/de/setting-up/email/sending-email.md +++ b/erpnext/docs/user/manual/de/setting-up/email/sending-email.md @@ -3,7 +3,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. -Emails versenden +Emails versenden **Anmerkung:** Es müssen Konten zum [E-Mail-Versand](/docs/user/manual/de/setting-up/email/email-account.html) eingerichtet sein. diff --git a/erpnext/docs/user/manual/de/setting-up/pos-setting.md b/erpnext/docs/user/manual/de/setting-up/pos-setting.md index b75f96c347..1849911e8d 100644 --- a/erpnext/docs/user/manual/de/setting-up/pos-setting.md +++ b/erpnext/docs/user/manual/de/setting-up/pos-setting.md @@ -9,7 +9,7 @@ Wenn Sie im Endkundengeschäft tätig sind, möchten Sie, dass Ihr POS so schnel Setzen Sie die Standardeinstellungen wie definiert. -POS-Einstellungen +POS-Einstellungen > 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/erpnext/docs/user/manual/de/setting-up/price-lists.md b/erpnext/docs/user/manual/de/setting-up/price-lists.md index 6fc5f08c45..b58e191cbc 100644 --- a/erpnext/docs/user/manual/de/setting-up/price-lists.md +++ b/erpnext/docs/user/manual/de/setting-up/price-lists.md @@ -11,7 +11,7 @@ Sie können eine neue Preisliste erstellen über: > Vertrieb/Einkauf/Lagerbestand > Einstellungen > Preisliste > Neu -Preisliste +Preisliste * 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/erpnext/docs/user/manual/de/setting-up/print/address-template.md b/erpnext/docs/user/manual/de/setting-up/print/address-template.md index 0622e0c7d2..b3f37f77a5 100644 --- a/erpnext/docs/user/manual/de/setting-up/print/address-template.md +++ b/erpnext/docs/user/manual/de/setting-up/print/address-template.md @@ -28,6 +28,6 @@ Hier sehen Sie die Standardvorlage: ### Beispiel -Adressvorlage +Adressvorlage {next} diff --git a/erpnext/docs/user/manual/de/setting-up/print/letter-head.md b/erpnext/docs/user/manual/de/setting-up/print/letter-head.md index e08da2893a..cc05b85f3f 100644 --- a/erpnext/docs/user/manual/de/setting-up/print/letter-head.md +++ b/erpnext/docs/user/manual/de/setting-up/print/letter-head.md @@ -15,10 +15,10 @@ Sie können Briefköpfe erstellen/verwalten über: #### Beispiel -Briefkopf +Briefkopf So sieht der Briefkopf eines Ausdruckes aus: -Briefkopf +Briefkopf {next} diff --git a/erpnext/docs/user/manual/de/setting-up/print/print-format-builder.md b/erpnext/docs/user/manual/de/setting-up/print/print-format-builder.md index 14ba20092e..e4236aec38 100644 --- a/erpnext/docs/user/manual/de/setting-up/print/print-format-builder.md +++ b/erpnext/docs/user/manual/de/setting-up/print/print-format-builder.md @@ -11,19 +11,19 @@ Oder Sie öffnen das Dokument, für das Sie ein Druckformat erstellen wollen. Kl ### Schritt 1: Erstellen Sie ein neues Format -E-Mail senden +E-Mail senden ### 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. -E-Mail senden +E-Mail senden ### Schritt 3: Ein Feld entfernen Um ein Feld zu entfernen, legen Sie es einfach zurück in die Seitenleiste. -E-Mail senden +E-Mail senden ### Schritt 4 @@ -31,7 +31,7 @@ Sie können benutzerdefinierten Text als HTML in Ihr Druckformat übernehmen. F Klicken Sie dann auf **HTML bearbeiten** um den Inhalt zu bearbeiten. -E-Mail senden +E-Mail senden Um Ihr Format abzuspeichern klicken Sie einfach auf die Schaltfläche **Speichern**. diff --git a/erpnext/docs/user/manual/de/setting-up/print/print-headings.md b/erpnext/docs/user/manual/de/setting-up/print/print-headings.md index b695a3cfd2..cf6b48a407 100644 --- a/erpnext/docs/user/manual/de/setting-up/print/print-headings.md +++ b/erpnext/docs/user/manual/de/setting-up/print/print-headings.md @@ -9,10 +9,10 @@ Sie können Druckköpfe erstellen über: #### Abbildung 1: Druckköpfe abspeichern -Druckköpfe +Druckköpfe Hier ist ein Beispiel abgebildet, wie man einen Druckkopf auswechselt: -Druckköpfe +Druckköpfe {next} diff --git a/erpnext/docs/user/manual/de/setting-up/print/print-settings.md b/erpnext/docs/user/manual/de/setting-up/print/print-settings.md index 995edd62a6..7dc8067a4e 100644 --- a/erpnext/docs/user/manual/de/setting-up/print/print-settings.md +++ b/erpnext/docs/user/manual/de/setting-up/print/print-settings.md @@ -7,6 +7,6 @@ Um die Druckeinstellungen zu bearbeiten, gehen Sie zu: > Einstellungen > Druck > Druckeinstellungen -Druckeinstellungen +Druckeinstellungen {next} diff --git a/erpnext/docs/user/manual/de/setting-up/print/terms-and-conditions.md b/erpnext/docs/user/manual/de/setting-up/print/terms-and-conditions.md index 071d757d7d..718fcc2546 100644 --- a/erpnext/docs/user/manual/de/setting-up/print/terms-and-conditions.md +++ b/erpnext/docs/user/manual/de/setting-up/print/terms-and-conditions.md @@ -9,13 +9,13 @@ Um die Vorlage für die Allgemeinen Geschäftsbedingungen zu erstellen, gehen Si > Vertrieb > Einstellungen > Vorlage für Allgemeine Geschäftsbedingungen > Neu -Geschäftsbedingungen +Geschäftsbedingungen ### 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. -Geschäfsbedingungen - HTML bearbeiten +Geschäfsbedingungen - HTML bearbeiten 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. @@ -23,6 +23,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. -Geschäfsbedingungen - Im Dokument auswählen +Geschäfsbedingungen - Im Dokument auswählen {next} diff --git a/erpnext/docs/user/manual/de/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/de/setting-up/setting-up-taxes.md index 4f45dfc678..612cf9a6da 100644 --- a/erpnext/docs/user/manual/de/setting-up/setting-up-taxes.md +++ b/erpnext/docs/user/manual/de/setting-up/setting-up-taxes.md @@ -13,11 +13,11 @@ Wenn einige Ihrer Artikel einer anderen Besteuerung unterliegen als andere, gebe Die Tabelle zu den Artikelsteuern ist ein Abschnitt in den Artikelstammdaten. -Artikelsteuer +Artikelsteuer * **Inklusive oder Exklusive Steuer:** ERPNext erlaubt es Ihnen Artikelpreise inklusive Steuer einzugeben. -Steuer inklusive +Steuer inklusive * **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. @@ -34,7 +34,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 -Vorlage für Verkaufssteuern +Vorlage für Verkaufssteuern Wenn Sie eine neue Vorlage erstellen, müssen Sie für jeden Steuertyp eine neue Zeile einfügen. diff --git a/erpnext/docs/user/manual/de/setting-up/settings/global-defaults.md b/erpnext/docs/user/manual/de/setting-up/settings/global-defaults.md index ef9bc2278b..44ec38eb24 100644 --- a/erpnext/docs/user/manual/de/setting-up/settings/global-defaults.md +++ b/erpnext/docs/user/manual/de/setting-up/settings/global-defaults.md @@ -7,6 +7,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. -Globale Voreinstellungen +Globale Voreinstellungen {next} diff --git a/erpnext/docs/user/manual/de/setting-up/settings/module-settings.md b/erpnext/docs/user/manual/de/setting-up/settings/module-settings.md index 8aaf923edd..996f3dce89 100644 --- a/erpnext/docs/user/manual/de/setting-up/settings/module-settings.md +++ b/erpnext/docs/user/manual/de/setting-up/settings/module-settings.md @@ -11,6 +11,6 @@ Beispiel: Wenn Sie im Dienstleistungsbereich arbeiten, möchten Sie evtl. das Fe Markieren oder demarkieren Sie die Elemente die angezeigt / ausgeblendet werden sollen. -Moduleinstellungen +Moduleinstellungen {next} diff --git a/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md index 0c66c5e9d2..1a6f336e0b 100644 --- a/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md +++ b/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md @@ -33,6 +33,6 @@ Sie können auch den Startpunkt eines Nummernkreises auswählen, indem Sie den N Sehen Sie hier, wie der Nummernkreis eingestellt wird. -Nummernkreise +Nummernkreise {next} diff --git a/erpnext/docs/user/manual/de/setting-up/settings/system-settings.md b/erpnext/docs/user/manual/de/setting-up/settings/system-settings.md index d804901230..856d01616f 100644 --- a/erpnext/docs/user/manual/de/setting-up/settings/system-settings.md +++ b/erpnext/docs/user/manual/de/setting-up/settings/system-settings.md @@ -7,6 +7,6 @@ Um die Systemeinstellungen zu öffnen, gehen Sie zu: > Einstellungen > Einstellungen > Systemeinstellungen -Systemeinstellungen +Systemeinstellungen {next} diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md index eb378364bd..0fc2a1f469 100644 --- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md +++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md @@ -3,7 +3,7 @@ Wählen Sie Ihre Sprache. ERPNext gibt es in mehr als 20 Sprachen. -Sprache +Sprache --- diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md index 6116247119..3b6d1ac3a8 100644 --- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md +++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md @@ -4,7 +4,7 @@ In diesem letzten Schritt geben Sie bitte die Bezeichnungen der Artikel ein, die Sie kaufen oder verkaufen. Artikel hinzufügen +src="{{docs_base_url}}/assets/img/setup-wizard/step-10.png"> Bitte stellen Sie auch die Artikelart (Produkt oder Dienstleistung) und die Standardmaßeinheit ein. Machen Sie sich keine Sorgen, Sie können das alles später noch bearbeiten. diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-2-currency-and-timezone.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-2-currency-and-timezone.md index 5387b0a4c9..be327aec34 100644 --- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-2-currency-and-timezone.md +++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-2-currency-and-timezone.md @@ -3,7 +3,7 @@ Stellen Sie den Namen Ihres Landes, die Währung und die Zeitzone ein. -Währung +Währung --- diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md index 97b246d863..2d1789d0d1 100644 --- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md +++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md @@ -4,7 +4,7 @@ Geben Sie Details zum Benutzerprofil, wie Name, Benutzer-ID und das bevorzugte Passwort ein. Benutzer +src="{{docs_base_url}}/assets/img/setup-wizard/step-3.png"> --- diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-4-company-details.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-4-company-details.md index aca7823217..4c131b56b8 100644 --- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-4-company-details.md +++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-4-company-details.md @@ -4,7 +4,7 @@ Geben Sie Details zum Unternehmen wie Name, Kürzel und Geschäftsjahr ein. Unternehmensdetails +src="{{docs_base_url}}/assets/img/setup-wizard/step-4.png"> --- diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md index d8a5c0d939..f74af9f8f3 100644 --- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md +++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md @@ -4,7 +4,7 @@ Fügen Sie einen Firmenbriefkopf und ein Firmenlogo hinzu. Firmenlogo und Briefkopf +src="{{docs_base_url}}/assets/img/setup-wizard/step-5.png"> --- diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-6-add-users.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-6-add-users.md index 07832e1813..692bb20cd5 100644 --- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-6-add-users.md +++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-6-add-users.md @@ -4,6 +4,6 @@ Fügen Sie weitere Benutzer hinzu und teilen Sie ihnen gemäß Ihren Verantwortungsbereichen am Arbeitsplatz Rollen zu. Benutzer +src="{{docs_base_url}}/assets/img/setup-wizard/step-6.png"> {next} diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md index edf6476110..5bd354fc09 100644 --- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md +++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md @@ -4,7 +4,7 @@ Geben Sie bis zu drei Steuerarten an, die Sie regelmäßig in Bezug auf Ihr Gehalt zahlen. Dieser Assistent erstellt eine Steuervorlage, die die Steuren für jede Steuerart berechnet. Steuerdetails +src="{{docs_base_url}}/assets/img/setup-wizard/step-7.png"> Geben Sie einfach den Namen der Steuerart und den Steuersatz ein. diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md index 4525c3438a..50e56fe15a 100644 --- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md +++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md @@ -4,7 +4,7 @@ Geben Sie die Namen Ihrer Kunden und die Kontaktpersonen ein. Customers +src="{{docs_base_url}}/assets/img/setup-wizard/step-8.png"> --- diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md index 2769879ea6..a56c3b2db0 100644 --- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md +++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md @@ -4,7 +4,7 @@ Geben Sie ein paar Namen Ihrer Lieferanten ein. Lieferanten +src="{{docs_base_url}}/assets/img/setup-wizard/step-9.png"> --- diff --git a/erpnext/docs/user/manual/de/setting-up/sms-setting.md b/erpnext/docs/user/manual/de/setting-up/sms-setting.md index 0a1e73b47d..1bcc058ae7 100644 --- a/erpnext/docs/user/manual/de/setting-up/sms-setting.md +++ b/erpnext/docs/user/manual/de/setting-up/sms-setting.md @@ -10,7 +10,7 @@ Beispiel-URL: http://instant.smses.com/web2sms.php?username=&password;=&to;=&sender;=&message;= -SMS-Einstellungen +SMS-Einstellungen > Anmerkung: Die Zeichenfolge bis zum "?" ist die URL des SMS-Gateways. @@ -23,7 +23,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. -SMS-Einstellungen +SMS-Einstellungen {next} diff --git a/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md b/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md index a1c8dbb892..01f2281734 100644 --- a/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md +++ b/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md @@ -23,18 +23,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. -Bestandsabgleich +Bestandsabgleich #### Schritt 2: Geben Sie Daten in die CSV-Datei ein. -Bestandsabgleich +Bestandsabgleich 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. -Bestandsabgleich +Bestandsabgleich ##### Buchungsdatum @@ -52,11 +52,11 @@ Notiz: Wenn Sie die bewerteten Beträge eines Artikels eingeben, können Sie zum #### Schritt 4: Überprüfen Sie die Daten zum Bestandsabgleich -Bestandsabgleich Überprüfung +Bestandsabgleich Überprüfung ### Bericht zum Lagerbuch -Bestandsabgleich +Bestandsabgleich ##### So arbeitet der Bestandsabgleich diff --git a/erpnext/docs/user/manual/de/setting-up/territory.md b/erpnext/docs/user/manual/de/setting-up/territory.md index 24ce34c691..22743d0d9a 100644 --- a/erpnext/docs/user/manual/de/setting-up/territory.md +++ b/erpnext/docs/user/manual/de/setting-up/territory.md @@ -3,6 +3,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. -Baumstruktur Regionen +Baumstruktur Regionen {next} diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md index ac4093bdae..8c4c91425c 100644 --- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md +++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md @@ -11,7 +11,7 @@ Für einen Benutzer können viele Informationen eingegeben werden. Im Sinne der ### 1. Übersicht der Benutzer -Benutzerliste +Benutzerliste Um einen neuen Benutzer hinzuzufügen, klicken Sie auf "Neu". @@ -28,18 +28,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. -Benutzerrollen +Benutzerrollen ### 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. -Geblockte Module für Benutzer +Geblockte Module für Benutzer ### 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. -Sicherheitseinstellungen für Benutzer +Sicherheitseinstellungen für Benutzer {next} diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md index 1d121c8e3d..0e9911e91f 100644 --- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md +++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md @@ -7,7 +7,7 @@ Wenn Sie das tun wollen, gehen Sie zu: > Einstellungen > Berechtigungen > Rollenberechtigungen-Manager -Berechtigungen für Lesen, Schreiben, Erstellen, Übertragen und Abändern mit Hilfe des Rollenberechtigungen-Managers einstellen +Berechtigungen für Lesen, Schreiben, Erstellen, Übertragen und Abändern mit Hilfe des Rollenberechtigungen-Managers einstellen Berechtigungen werden angewandt auf einer Kombination von: @@ -43,23 +43,23 @@ Um Benutzerberechtigungen zu setzen, gehen Sie zu: Der Urlaubsantrag ist ein gutes **Beispiel**, welches alle Bereiche des Berechtigungssystems abdeckt. -Der Urlaubsantrag sollte von einem Mitarbeiter erstellt werden, und von einem Urlaubsgenehmiger oder Mitarbeiter des Personalwesens genehmigt werden. +Der Urlaubsantrag sollte von einem Mitarbeiter erstellt werden, und von einem Urlaubsgenehmiger oder Mitarbeiter des Personalwesens genehmigt werden. 1\. **Er sollte von einem "Mitarbeiter" erstellt werden.** Aus diesem Grund sollte die Rolle "Mitarbeiter" Berechtigungen zum Lesen, Schreiben und Erstellen haben. -Einem Mitarbeiter Lese-, Schreib- und Erstellrechte für einen Urlaubsantrag geben. +Einem Mitarbeiter Lese-, Schreib- und Erstellrechte für einen Urlaubsantrag geben. 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.) -Den Zugriff für einen Benutzer mit der Rolle Mitarbeiter auf Urlaubsanträge über den Benutzerberechtigungen-Manager einschränken. +Den Zugriff für einen Benutzer mit der Rolle Mitarbeiter auf Urlaubsanträge über den Benutzerberechtigungen-Manager einschränken. 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. -Einem Personalmanager Rechte für Übertragen und Stornieren für Urlaubsanträge geben. 'Benutzerberechtigungen anwenden' ist demarkiert um vollen Zugriff zu ermöglichen. +Einem Personalmanager Rechte für Übertragen und Stornieren für Urlaubsanträge geben. 'Benutzerberechtigungen anwenden' ist demarkiert um vollen Zugriff zu ermöglichen. 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.) -Rechte für Schreiben, Lesen und Übertragen an einen Urlaubsgenehmiger zum Genehmigen von Urlauben geben. 'Benutzerberechtigungen anwenden' ist markiert, um den Zugriff basierend auf dem Mitarbeitertyp einzuschränken. +Rechte für Schreiben, Lesen und Übertragen an einen Urlaubsgenehmiger zum Genehmigen von Urlauben geben. 'Benutzerberechtigungen anwenden' ist markiert, um den Zugriff basierend auf dem Mitarbeitertyp einzuschränken. 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. @@ -67,6 +67,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. -Es dem Benutzer der Personalverwaltung ermöglichen, den Zugriff auf Urlaubsanträge zu delegieren, indem er 'Benutzerberechtigungen einstellen' markiert. Dies erlaubt es dem Benutzer der Personalverwaltung auf den Benutzerberechtigungen-Manager für 'Urlaubsanträge' zuzugreifen +Es dem Benutzer der Personalverwaltung ermöglichen, den Zugriff auf Urlaubsanträge zu delegieren, indem er 'Benutzerberechtigungen einstellen' markiert. Dies erlaubt es dem Benutzer der Personalverwaltung auf den Benutzerberechtigungen-Manager für 'Urlaubsanträge' zuzugreifen {next} diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/sharing.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/sharing.md index aea4770641..2436439432 100644 --- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/sharing.md +++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/sharing.md @@ -5,6 +5,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/erpnext/docs/user/manual/de/setting-up/workflows.md b/erpnext/docs/user/manual/de/setting-up/workflows.md index c53a2644c5..7879a0abba 100644 --- a/erpnext/docs/user/manual/de/setting-up/workflows.md +++ b/erpnext/docs/user/manual/de/setting-up/workflows.md @@ -7,7 +7,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. -Workflow +Workflow Um einen Workflow und Übergangsregeln zu erstellen, gehen Sie zu: @@ -15,11 +15,11 @@ Um einen Workflow und Übergangsregeln zu erstellen, gehen Sie zu: #### Schritt 1: Geben Sie die unterschiedlichen Zustände des Prozesses Urlaubsantrag ein. -Workflow +Workflow #### Schritt 2: Geben Sie die Übergangsregeln ein. -Workflow +Workflow Hinweise: @@ -37,14 +37,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". -Workflow +Workflow 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. -Workflow +Workflow Wenn der Urlaubsgenehmiger die Seite mit den Urlaubsanträgen öffnet, kann er den Status von "Genehmigt" auf "Abgelehnt" ändern. -Workflow +Workflow {next} diff --git a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md index 639e140e93..f0e1f7a688 100644 --- a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md +++ b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md @@ -133,11 +133,11 @@ Nehmen wir an, Sie haben 10 Stück des Artikels "RM0001" zu 200€ und 5 Stück

Lagerbuch

-Lagerbuch +Lagerbuch **Hauptbuch:** -Hauptbuch +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. @@ -149,7 +149,7 @@ Wenn eine Rechnung des Lieferanten für den oben angesprochenen Kaufbeleg eintri #### Hauptbuch -Hauptbuch +Hauptbuch Hier wird das Konto "Lagerware erhalten aber noch nicht bewertet" belastet und hebt den Effekt des Kaufbeleges auf. @@ -206,11 +206,11 @@ Nehmen wir an, dass Sie eine Kundenbestellung von "Utah Automation Services" üb **Lagerbuch** -Lagerbuch +Lagerbuch **Hauptbuch** -Hauptbuch +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. @@ -231,11 +231,11 @@ Nehmen wir an, dass Sie zur obigen Bestellung keinen Lieferschein erstellt haben **Lagerbuch** -Lagerbuch +Lagerbuch **Hauptbuch** -Hauptbuch +Hauptbuch Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten "In Verkaufsstellen" und "Selbstkosten" basierend auf der Bewertung beeinflusst. @@ -268,11 +268,11 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten **Lagerbuch** -Lagerbuch +Lagerbuch **Hauptbuch** -Hauptbuch +Hauptbuch * * * @@ -303,11 +303,11 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten **Lagerbuch** -Lagerbuch +Lagerbuch **Hauptbuch** -Hauptbuch +Hauptbuch * * * @@ -340,8 +340,8 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten **Lagerbuch** -Lagerbuch +Lagerbuch **Hauptbuch** -Hauptbuch \ No newline at end of file +Hauptbuch \ No newline at end of file diff --git a/erpnext/docs/user/manual/de/stock/batch.md b/erpnext/docs/user/manual/de/stock/batch.md index 69171e11f8..783e7e32e8 100644 --- a/erpnext/docs/user/manual/de/stock/batch.md +++ b/erpnext/docs/user/manual/de/stock/batch.md @@ -13,7 +13,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. -Charge +Charge > 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/erpnext/docs/user/manual/de/stock/delivery-note.md b/erpnext/docs/user/manual/de/stock/delivery-note.md index 5ee2567325..c9c2682d8b 100644 --- a/erpnext/docs/user/manual/de/stock/delivery-note.md +++ b/erpnext/docs/user/manual/de/stock/delivery-note.md @@ -11,7 +11,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. -Lieferschein +Lieferschein Sie können die Details auch aus einer noch nicht gelieferten Kundenbestellung "herausziehen". diff --git a/erpnext/docs/user/manual/de/stock/material-request.md b/erpnext/docs/user/manual/de/stock/material-request.md index 2a59ecb152..5f77facd05 100644 --- a/erpnext/docs/user/manual/de/stock/material-request.md +++ b/erpnext/docs/user/manual/de/stock/material-request.md @@ -3,7 +3,7 @@ Eine Materialanfrage ist ein einfaches Dokument, welches einen Bedarf an Artikeln (Produkte oder Dienstleistungen) für einen bestimmten Zweck erfasst. -Materialanfrage +Materialanfrage Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu: @@ -11,7 +11,7 @@ Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu: ### Materialanfrage erstellen -Materialanfrage +Materialanfrage Eine Materialanfrage kann auf folgende Arten erstellt werden: diff --git a/erpnext/docs/user/manual/de/stock/projected-quantity.md b/erpnext/docs/user/manual/de/stock/projected-quantity.md index 2f6e001af7..2b3d9e7d19 100644 --- a/erpnext/docs/user/manual/de/stock/projected-quantity.md +++ b/erpnext/docs/user/manual/de/stock/projected-quantity.md @@ -7,7 +7,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. -Bericht zur projizierten Menge +Bericht zur projizierten Menge > Projizierte Menge = Momentan vorhandene Menge + Geplante Menge + Angefragte Menge + Bestellte Menge - Reservierte Menge diff --git a/erpnext/docs/user/manual/de/stock/purchase-receipt.md b/erpnext/docs/user/manual/de/stock/purchase-receipt.md index 5303895092..f78600d293 100644 --- a/erpnext/docs/user/manual/de/stock/purchase-receipt.md +++ b/erpnext/docs/user/manual/de/stock/purchase-receipt.md @@ -11,7 +11,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. -Kaufbeleg +Kaufbeleg ### Ausschuss diff --git a/erpnext/docs/user/manual/de/stock/purchase-return.md b/erpnext/docs/user/manual/de/stock/purchase-return.md index 0805d75fc8..1da0bc4691 100644 --- a/erpnext/docs/user/manual/de/stock/purchase-return.md +++ b/erpnext/docs/user/manual/de/stock/purchase-return.md @@ -7,18 +7,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. -Original-Eingangsrechnung +Original-Eingangsrechnung 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. -Reklamation zum Lieferschein +Reklamation zum Lieferschein 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. -Reklamation und Lagerbuch +Reklamation und Lagerbuch 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. -Reklamation und Lagerbuch +Reklamation und Lagerbuch {next} diff --git a/erpnext/docs/user/manual/de/stock/sales-return.md b/erpnext/docs/user/manual/de/stock/sales-return.md index 0daef5cafb..2b4fbb47d1 100644 --- a/erpnext/docs/user/manual/de/stock/sales-return.md +++ b/erpnext/docs/user/manual/de/stock/sales-return.md @@ -7,22 +7,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. -Original-Lieferschein +Original-Lieferschein 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. -Kundenreklamation zum Lieferschein +Kundenreklamation zum Lieferschein 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. -Kundenreklamation zur Eingangsrechnung +Kundenreklamation zur Eingangsrechnung 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. -Lagerbuch und Reklamation +Lagerbuch und Reklamation -Lagerbuch und Reklamation +Lagerbuch und Reklamation {next} diff --git a/erpnext/docs/user/manual/de/stock/serial-no.md b/erpnext/docs/user/manual/de/stock/serial-no.md index 883a45e3fb..1fb8bd8aca 100644 --- a/erpnext/docs/user/manual/de/stock/serial-no.md +++ b/erpnext/docs/user/manual/de/stock/serial-no.md @@ -13,7 +13,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. -Seriennummer +Seriennummer * Der Status wird aufgrund der Lagerbuchung eingestellt. * Nur Seriennummern mit dem Status "Verfügbar" können geliefert werden. diff --git a/erpnext/docs/user/manual/de/stock/setup/item-attribute.md b/erpnext/docs/user/manual/de/stock/setup/item-attribute.md index d61c6fcfd9..6deabb38ac 100644 --- a/erpnext/docs/user/manual/de/stock/setup/item-attribute.md +++ b/erpnext/docs/user/manual/de/stock/setup/item-attribute.md @@ -3,18 +3,18 @@ Sie können Attribute und Attributwerte für Ihre Artikelvarianten hier auswählen. -Attributvorlage +Attributvorlage ### Nicht-numerische Attribute * Für nicht-numerische Attribute definieren Sie Attributwerte und deren Abkürzungen in der Tabelle Attributwerte. -Attributvorlage +Attributvorlage ### Numerische Attribute * Wenn Ihr Attribut numerisch ist, wählen Sie numerische Werte. * Geben Sie den Bereich an und die Schrittweite. -Attributvorlage +Attributvorlage diff --git a/erpnext/docs/user/manual/de/stock/setup/item-group.md b/erpnext/docs/user/manual/de/stock/setup/item-group.md index c911c6ccbb..8be1a60bff 100644 --- a/erpnext/docs/user/manual/de/stock/setup/item-group.md +++ b/erpnext/docs/user/manual/de/stock/setup/item-group.md @@ -3,19 +3,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. -Baumstruktur Artikelgruppe +Baumstruktur Artikelgruppe ### Eine Artikelgruppe erstellen * Wählen Sie eine Artikelgruppe aus unter der Sie eine Artikelgruppe erstellen wollen. * Klicken Sie auf "Unterpunkt hinzufügen". -Artikelgruppe hinzufügen +Artikelgruppe hinzufügen ### Eine Artikelgruppe löschen * Wählen Sie die zu löschende Artikelgruppe aus. * Klicken Sie auf "Löschen" -Artikelgruppe hinzufügen +Artikelgruppe hinzufügen {next} diff --git a/erpnext/docs/user/manual/de/stock/setup/stock-settings.md b/erpnext/docs/user/manual/de/stock/setup/stock-settings.md index 2eb84ebe34..c7237b0e51 100644 --- a/erpnext/docs/user/manual/de/stock/setup/stock-settings.md +++ b/erpnext/docs/user/manual/de/stock/setup/stock-settings.md @@ -3,6 +3,6 @@ Sie können Standardeinstellungen für Ihre mit dem Lager verbundenen Transaktionen hier voreinstellen. -Lagereinstellungen +Lagereinstellungen {next} diff --git a/erpnext/docs/user/manual/de/stock/stock-entry.md b/erpnext/docs/user/manual/de/stock/stock-entry.md index 442c42d4ad..4b9fe08373 100644 --- a/erpnext/docs/user/manual/de/stock/stock-entry.md +++ b/erpnext/docs/user/manual/de/stock/stock-entry.md @@ -7,7 +7,7 @@ Wenn Sie eine Lagerbuchung erstellen möchten, gehen Sie zu: > Lagerbestand > Dokumente > Lagerbuchung > Neu -Lagerbuchung +Lagerbuchung Lagerbuchungen können aus folgenden Gründen erstellt werden: @@ -27,15 +27,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. -Lagerbuchung Zusatzlkosten +Lagerbuchung Zusatzlkosten 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. -Lagerbuchung Preis für Artikelvarianten +Lagerbuchung Preis für Artikelvarianten Wenn die laufende Inventur aktiviert ist, werden Zusatzkosten auf das Konto "Aufwendungen im Wert beinhaltet" gebucht. -Zusatzkosten Hauptbuch +Zusatzkosten Hauptbuch > Hinweis: Um den Lagerbestand über eine Tabellenkalkulation zu aktualisieren, bitte unter Lagerabgleich nachlesen. {next} diff --git a/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md b/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md index 0cb6ea19e0..340e104384 100644 --- a/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md +++ b/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md @@ -23,7 +23,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. -Einstandskostenbeleg +Einstandskostenbeleg ### Was passiert bei der Ausgabe? diff --git a/erpnext/docs/user/manual/de/stock/tools/packing-slip.md b/erpnext/docs/user/manual/de/stock/tools/packing-slip.md index 474f2d5159..93752be863 100644 --- a/erpnext/docs/user/manual/de/stock/tools/packing-slip.md +++ b/erpnext/docs/user/manual/de/stock/tools/packing-slip.md @@ -3,6 +3,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. -Packzettel +Packzettel {next} diff --git a/erpnext/docs/user/manual/de/stock/tools/quality-inspection.md b/erpnext/docs/user/manual/de/stock/tools/quality-inspection.md index 76ef650930..9c375dfad7 100644 --- a/erpnext/docs/user/manual/de/stock/tools/quality-inspection.md +++ b/erpnext/docs/user/manual/de/stock/tools/quality-inspection.md @@ -5,6 +5,6 @@ In ERPNext können Sie eingehende und ausgehende Produkte für eine Qualitätspr > Lagerbestand > Werkzeuge > Qualitätsprüfung > Neu -Qualitätsprüfung +Qualitätsprüfung {next} diff --git a/erpnext/docs/user/manual/de/stock/warehouse.md b/erpnext/docs/user/manual/de/stock/warehouse.md index 56c5913f62..a2e6c43fac 100644 --- a/erpnext/docs/user/manual/de/stock/warehouse.md +++ b/erpnext/docs/user/manual/de/stock/warehouse.md @@ -7,7 +7,7 @@ Um zum Bereich "Lager" zu gelangen, klicken Sie auf "Lagerbestand" und gehen Sie > Lagerbestand > Einstellungen > Lager > Neu -Lager +Lager 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/erpnext/docs/user/manual/de/support/issue.md b/erpnext/docs/user/manual/de/support/issue.md index 7b8e9113c1..57c3c8f886 100644 --- a/erpnext/docs/user/manual/de/support/issue.md +++ b/erpnext/docs/user/manual/de/support/issue.md @@ -7,7 +7,7 @@ Bei einem Fall handelt es ich um eine eingehende Nachricht vom Kunden, normalerw > Support > Dokumente > Anfrage > Neu -Fall +Fall ### Gesprächsaufzeichnung diff --git a/erpnext/docs/user/manual/de/support/maintenance-schedule.md b/erpnext/docs/user/manual/de/support/maintenance-schedule.md index df08375cdd..dcc88ae4a5 100644 --- a/erpnext/docs/user/manual/de/support/maintenance-schedule.md +++ b/erpnext/docs/user/manual/de/support/maintenance-schedule.md @@ -9,7 +9,7 @@ Um einen neuen Wartungsplan zu erstellen, gehen Sie zu: > Support > Dokumente > Wartungsplan > Neu -Wartungsplan +Wartungsplan Im Wartungsplan gibt es zwei Abschnitte: diff --git a/erpnext/docs/user/manual/de/support/maintenance-visit.md b/erpnext/docs/user/manual/de/support/maintenance-visit.md index 86ed897efc..d215c737fa 100644 --- a/erpnext/docs/user/manual/de/support/maintenance-visit.md +++ b/erpnext/docs/user/manual/de/support/maintenance-visit.md @@ -5,7 +5,7 @@ Ein Wartungsbesuch ist ein Datensatz über einen Besuch eines Technikers bei ein > Support > Dokumente > Wartungsbesuch > Neu -Wartungsbesuch +Wartungsbesuch Der Wartungsbesuch inhält Informationen über: diff --git a/erpnext/docs/user/manual/de/support/warranty-claim.md b/erpnext/docs/user/manual/de/support/warranty-claim.md index a54aac82bb..42ae52d9cc 100644 --- a/erpnext/docs/user/manual/de/support/warranty-claim.md +++ b/erpnext/docs/user/manual/de/support/warranty-claim.md @@ -11,7 +11,7 @@ Um einen neuen **Garantiefall** zu erstellen, gehen Sie zu: > Support > Dokukumente > Garantieantrag > Neu -![Warranty Claim](/docs/assets/img/support/warranty-claim.png) +![Warranty Claim]({{docs_base_url}}/assets/img/support/warranty-claim.png) Wenn für die Lösung des Problems ein Besuch beim Kunden notwendig ist, können Sie einen neuen Wartungsbesuch erstellen. diff --git a/erpnext/docs/user/manual/de/using-erpnext/calendar.md b/erpnext/docs/user/manual/de/using-erpnext/calendar.md index 8be16098b7..42d884b64e 100644 --- a/erpnext/docs/user/manual/de/using-erpnext/calendar.md +++ b/erpnext/docs/user/manual/de/using-erpnext/calendar.md @@ -5,7 +5,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. -Calendar +Calendar ### Ereignisse im Kalender erstellen @@ -15,7 +15,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. -Calendar +Calendar 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. @@ -23,7 +23,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. -Lead Event +Lead Event #### Geburtstag @@ -33,7 +33,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. -Calendar Recurring Event +Calendar Recurring Event ### Erinnerungen an Ereignisse @@ -43,7 +43,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. -Calendar Recurring Event +Calendar Recurring Event #### Einen täglichen E-Mail-Bericht erstellen @@ -53,6 +53,6 @@ Der tägliche E-Mail-Bericht kann eingestellt werden über: > Einstellungen > E-Mail > Täglicher E-Mail-Bericht -Calendar Recurring Event +Calendar Recurring Event {next} diff --git a/erpnext/docs/user/manual/de/website/blog-post.md b/erpnext/docs/user/manual/de/website/blog-post.md index c316577171..1641ea9a1a 100644 --- a/erpnext/docs/user/manual/de/website/blog-post.md +++ b/erpnext/docs/user/manual/de/website/blog-post.md @@ -9,12 +9,12 @@ Um einen neuen Blog zu erstellen, gehen Sie zu: > Webseite > Blog-Eintrag > Neu -Blogeintrag +Blogeintrag 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. -Beispiel für ein Blog +Beispiel für ein Blog {next} diff --git a/erpnext/docs/user/manual/de/website/blogger.md b/erpnext/docs/user/manual/de/website/blogger.md index 6332fb6b2d..8d81b39d0b 100644 --- a/erpnext/docs/user/manual/de/website/blogger.md +++ b/erpnext/docs/user/manual/de/website/blogger.md @@ -3,6 +3,6 @@ Ein Blogger ist ein Benutzer, der Blog-Einträge erstellen kann. Sie können eine Kurzbiografie des Bloggers angeben und dazu einen Avatar. -Blogger +Blogger {next} diff --git a/erpnext/docs/user/manual/de/website/setup/website-settings.md b/erpnext/docs/user/manual/de/website/setup/website-settings.md index 20824559df..a79d091e04 100644 --- a/erpnext/docs/user/manual/de/website/setup/website-settings.md +++ b/erpnext/docs/user/manual/de/website/setup/website-settings.md @@ -3,7 +3,7 @@ Die meisten der Einstellungen, die Ihre Webseite betreffen, können hier eingestellt werden. -Webseiten-Einstellungen +Webseiten-Einstellungen ### Zielseite @@ -15,7 +15,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. -Webseiten-Themen +Webseiten-Themen * Wählen "Neues Webseiten-Thema erstellen" wenn Sie das Standars-Thema der Webseite anpassen wollen. @@ -23,13 +23,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. -Banner +Banner ### Kopfleiste Hier können Sie die Menüeinträge in der Kopfleiste einstellen. -Kopfleiste +Kopfleiste * In ähnlicher Art und Weise können Sie auch die Verknüpfungen auf der Seitenleiste und in der Fußzeile einstellen. @@ -37,7 +37,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. -Einbindungen +Einbindungen * Sie können ein öffentliches Anmelden auf Ihr ERPNext-Konto unterbinden indem Sie auf "Anmelden deaktivieren" klicken. diff --git a/erpnext/docs/user/manual/de/website/web-form.md b/erpnext/docs/user/manual/de/website/web-form.md index e8c98506e8..473f2c73e7 100644 --- a/erpnext/docs/user/manual/de/website/web-form.md +++ b/erpnext/docs/user/manual/de/website/web-form.md @@ -18,7 +18,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. -Webformular +Webformular * * * @@ -26,7 +26,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! -Webformular +Webformular * * * diff --git a/erpnext/docs/user/manual/de/website/web-page.md b/erpnext/docs/user/manual/de/website/web-page.md index 96f917f47a..91bd7d548b 100644 --- a/erpnext/docs/user/manual/de/website/web-page.md +++ b/erpnext/docs/user/manual/de/website/web-page.md @@ -7,7 +7,7 @@ Um eine neue Webseite zu erstellen, gehen Sie zu: > Webseite > Webseite > Neu -Webseit +Webseit ### Bezeichnung diff --git a/erpnext/docs/user/manual/en/CRM/contact.md b/erpnext/docs/user/manual/en/CRM/contact.md index dcc8e17a39..f87f82c40f 100644 --- a/erpnext/docs/user/manual/en/CRM/contact.md +++ b/erpnext/docs/user/manual/en/CRM/contact.md @@ -18,12 +18,12 @@ To create a new Contact go to, > CRM > Contact > New -Contact +Contact Or you can add a Contact or Address directly from the Customer record, click on “New Contact” or “New Address”. -Contact +Contact > Tip: When you select a Customer in any transaction, one Contact and Address gets pre-selected. This is the “Default Contact or Address”. diff --git a/erpnext/docs/user/manual/en/CRM/crm_reports.md b/erpnext/docs/user/manual/en/CRM/crm_reports.md index 4ac90bb171..3680bad0ac 100644 --- a/erpnext/docs/user/manual/en/CRM/crm_reports.md +++ b/erpnext/docs/user/manual/en/CRM/crm_reports.md @@ -5,7 +5,7 @@ CRM module's reports helps users to get the information about the prospects. Usi ###Lead Details It has data about the leads and their contact and address details. Lead Details + 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. @@ -15,28 +15,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. Lead Details + 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. Lead Details + 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. Lead Details + 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. Lead 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. Lead Details + src="{{docs_base_url}}/assets/img/crm/report/inactive_customers.png"> diff --git a/erpnext/docs/user/manual/en/CRM/customer.md b/erpnext/docs/user/manual/en/CRM/customer.md index 5924665d81..780881bd6f 100644 --- a/erpnext/docs/user/manual/en/CRM/customer.md +++ b/erpnext/docs/user/manual/en/CRM/customer.md @@ -11,13 +11,13 @@ You can either directly create your Customers via > Selling > Customer -Create Customer +Create Customer or upload it via the [Data Import Tool](/docs/user/manual/en/setting-up/data/data-import-tool.html). A Customer can avail the features (operations) in the selling process. The general flow can be summarised as: -Customer +Customer > Note: Customers are separate from Contacts and Addresses. A Customer can have multiple Contacts and Addresses. diff --git a/erpnext/docs/user/manual/en/CRM/lead.md b/erpnext/docs/user/manual/en/CRM/lead.md index 2a48166f8b..dbd8dc79eb 100644 --- a/erpnext/docs/user/manual/en/CRM/lead.md +++ b/erpnext/docs/user/manual/en/CRM/lead.md @@ -26,7 +26,7 @@ To create a Lead, go to: > CRM > Lead > New Lead -Lead +Lead ERPNext gives you a lot of options you may want to store about your Leads. For example what is the source, how likely are they to give you business etc. If @@ -51,7 +51,7 @@ dropdown. Once the Customer is created, the Lead becomes “Converted” and any further Opportunities from the same source can be created against this Customer. -Create Customer +Create Customer --- diff --git a/erpnext/docs/user/manual/en/CRM/newsletter.md b/erpnext/docs/user/manual/en/CRM/newsletter.md index 2aac1b2808..e41ba1fc52 100644 --- a/erpnext/docs/user/manual/en/CRM/newsletter.md +++ b/erpnext/docs/user/manual/en/CRM/newsletter.md @@ -14,8 +14,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. -Newsletter - New +Newsletter - New -Newsletter - Test +Newsletter - Test {next} diff --git a/erpnext/docs/user/manual/en/CRM/opportunity.md b/erpnext/docs/user/manual/en/CRM/opportunity.md index 94338f9326..e1ffdbfe1e 100644 --- a/erpnext/docs/user/manual/en/CRM/opportunity.md +++ b/erpnext/docs/user/manual/en/CRM/opportunity.md @@ -9,17 +9,17 @@ You can create an Opportunity from: #### Figure 1: Create Opportunity -Opportunity +Opportunity You can also go to an “Open” Lead and select “Opportunity” from the **Make** dropdown. #### Figure 2: Create Opportunity from an open Lead -Opportunity +Opportunity #### Figure 3: Create Opportunity for Customer to Collect their Requirement -Opportunity +Opportunity An Opportunity can also come from an existing Customer. You can create multiple Opportunities against the same Lead. In Opportunity, apart from the @@ -29,7 +29,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. -Opportunity +Opportunity > 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/erpnext/docs/user/manual/en/CRM/setup/campaign.md b/erpnext/docs/user/manual/en/CRM/setup/campaign.md index 17b06f18fe..2c30d1c1e3 100644 --- a/erpnext/docs/user/manual/en/CRM/setup/campaign.md +++ b/erpnext/docs/user/manual/en/CRM/setup/campaign.md @@ -4,7 +4,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. -Campaign +Campaign You can track [Lead](/docs/user/manual/en/CRM/lead.html), [Opportunity](/docs/user/manual/en/CRM/opportunity.html), [Quotation](/docs/user/manual/en/selling/quotation.html) against a campaign. @@ -12,11 +12,11 @@ You can track [Lead](/docs/user/manual/en/CRM/lead.html), [Opportunity](/docs/us * To track a 'Lead' against a campaign select 'View Leads'. -Campaign - View Leads +Campaign - View Leads * You shall get a filtered list of all leads made against that campaign. * You can also create new leads by clicking 'New' -Campaign - New Lead +Campaign - New Lead {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md index 628057a0dd..8709ca22de 100644 --- a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md +++ b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md @@ -5,12 +5,12 @@ You can also get trend analysis for each group. Typically Customers are grouped by market segment (that is usually based on your domain). -Customer Group Tree +Customer Group Tree > Tip: If you think all this is too much effort, you can leave it at “Default Customer Group”. But all this effort, will pay off when you start getting reports. An example of a sample report is given below: -Customer Group report +Customer Group report {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/CRM/setup/sales-person.md b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md index b96020ed10..6e319f1d7a 100644 --- a/erpnext/docs/user/manual/en/CRM/setup/sales-person.md +++ b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md @@ -5,7 +5,7 @@ chart of Sales Persons where each Sales Person’s target can be set individually. Again as in Territory, the target has to be set against Item Group. -Sales Person Tree +Sales Person Tree ####Sales Person in Transactions diff --git a/erpnext/docs/user/manual/en/accounts/accounting-reports.md b/erpnext/docs/user/manual/en/accounts/accounting-reports.md index 99d7029b59..a71a26c187 100644 --- a/erpnext/docs/user/manual/en/accounts/accounting-reports.md +++ b/erpnext/docs/user/manual/en/accounts/accounting-reports.md @@ -9,7 +9,7 @@ and between a period. This will help you to get a full update for all entries done in that period for that Account. General Ledger + src="{{docs_base_url}}/assets/img/accounts/general-ledger.png"> ### Trial Balance @@ -22,7 +22,7 @@ the: * Credits * Closing -Trial Balance +Trial Balance The sum of all closing balances in a Trial Balance must be zero. @@ -32,7 +32,7 @@ These reports help you to track the outstanding invoices sent to Customer and Suppliers. In this report, you will get your outstanding amounts period wise. i.e. between 0-30 days, 30-60 days and so on. -Accounts Receivable +Accounts Receivable ### Sales and Purchase Register @@ -40,6 +40,6 @@ In this report, each tax Account is transposed in columns. For each Invoice and invoice Item, you will get the amount of individual tax that has been paid, based on the Taxes and Charges table. -Sales Register +Sales Register {next} diff --git a/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md index 9627ff27b0..4ae0a5ce09 100644 --- a/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md +++ b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md @@ -24,7 +24,7 @@ the row "Is Advance" click 'Yes'. #### Figure 1 : Journal Entry -Advance Entry -Advace Payment +Advace Payment ### Double Entry Accounting @@ -41,7 +41,7 @@ will be credited because it has given value. #### Figure 2: Transaction and Difference Entry -Advace Payment +Advace Payment Save and submit the Journal Entry. If this document is not saved it will not be pulled in other accounting documents. @@ -55,7 +55,7 @@ advance in the advances table. The accounting will be adjusted accordingly. #### Figure 3: Receive Advance -Advace Payment +Advace Payment Save and submit the Sales Invoice. diff --git a/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md b/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md index b66c0633a1..d469b2883e 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md +++ b/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md @@ -22,7 +22,7 @@ To create Payment Entry, go to unpaid Sales Invoice and create click on Make Pay Enter Payment Amount as 19,600. -Sales Invoice Payment Amount +Sales Invoice Payment Amount #####Step 2.2: Allocate Against Sales Invoice @@ -32,6 +32,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. -Deduction/Loss Account +Deduction/Loss 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/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md index 3ae76a87ff..e4a33e040f 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md +++ b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md @@ -14,22 +14,22 @@ Click on Account for which Parent Account is to be changed. ####2. Edit Account -Project Default Cost Center +Project Default Cost Center ####3. Change Parent Account Search and select preferred Parent Account and save. -Project Default Cost Center +Project Default Cost Center Refresh system from Help menu to experience the change. -Project Default Cost Center +Project Default Cost Center
Note: Parent cannot be customized for the Root Accounts, like Asset, Liability, Income, Expense, Equity.
#### Quick Help -Project Default Cost Center +Project Default Cost Center \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/accounts/articles/common-receivable-account.md b/erpnext/docs/user/manual/en/accounts/articles/common-receivable-account.md index 6f92232117..56091717e4 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/common-receivable-account.md +++ b/erpnext/docs/user/manual/en/accounts/articles/common-receivable-account.md @@ -2,7 +2,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. -Role Desk Permission +Role Desk Permission If needed, you can also create a new receivable account and update in the Customer master. diff --git a/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md index 6a041df0a7..acac407fa3 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md +++ b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md @@ -2,13 +2,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. -Debit Credit Not Equal +Debit Credit Not Equal 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. -Debit Credit Not Equal +Debit Credit Not Equal 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/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md index 4a1b54b484..ddd367913a 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md +++ b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md @@ -18,13 +18,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. -Debit Credit Not Equal +Debit Credit Not Equal 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` -Debit Credit Not Equal +Debit Credit Not Equal Save Global Default, and Reload your ERPNext account. Then, default Fiscal Year will be auto-updated in your transactions. diff --git a/erpnext/docs/user/manual/en/accounts/articles/freeze-account.md b/erpnext/docs/user/manual/en/accounts/articles/freeze-account.md index 3582c28124..135214a963 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/freeze-account.md +++ b/erpnext/docs/user/manual/en/accounts/articles/freeze-account.md @@ -6,8 +6,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. -Download Backup +Download Backup If User has Role define in the  Account Setting assigned, then he/she will be able to set an Account as Frozen. -Download Backup \ No newline at end of file +Download Backup \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md b/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md index 3ed6b86ebf..9d5f6143d0 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md +++ b/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md @@ -10,12 +10,12 @@ To freeze accounting entries upto a certain date, follow below given steps. Set date in the **Accounts Frozen Upto** field. -Accounts Frozen Date +Accounts Frozen Date 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. -Frozen Date Error +Frozen Date Error 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. -Frozen Date Error +Frozen Date Error diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md index 6b643a935a..80aed6d40e 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md +++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md @@ -12,7 +12,7 @@ To edit an Account, go to Chart of Accounts: `Explore > Accounts > Chart of Accounts` -Freeze Account +Freeze Account Click on Account in which Frozen Date is to be updated. @@ -20,7 +20,7 @@ Click on Account in which Frozen Date is to be updated. In the Account form, you will find a field called **Frozen**. Set value in this field as 'Yes' -Freeze Account +Freeze Account ####Step 3: Save diff --git a/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md index 643636b4d4..a9a9fefb1f 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md +++ b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md @@ -6,7 +6,7 @@ In ERPNext, you can create transactions in the foriegn currency as well. When cr To mange currency difference, create Account **Foreign Exchange Gain/Loss**. This account is generally created on the Expense side of P&L statement. However, you can place it under another group as per your accounting requirement. -Accounts Frozen Date +Accounts Frozen Date #### Book Payment Entry @@ -16,7 +16,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. -Accounts Frozen Date +Accounts Frozen Date 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/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md index 0b919a8c69..d89c199358 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md +++ b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md @@ -16,7 +16,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. -Accounts Frozen Date +Accounts Frozen Date #### Step 4: Update Details @@ -26,7 +26,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. -Accounts Frozen Date +Accounts Frozen Date #### Currency Exchange Masters diff --git a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md index 9dca4e2e09..cd50cc9ec3 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md +++ b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md @@ -14,7 +14,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. -JE Posting Date +JE Posting Date Note: Payment Entry Reference Date should equal to or less than Posting Date. diff --git a/erpnext/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md b/erpnext/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md index e7a0772256..19b01040a4 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md +++ b/erpnext/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md @@ -2,7 +2,7 @@ **Question:** On saving the Purchase Invoice, I am getting a validation message that Credit To Account must be a Balance Sheet account. -Role Desk Permission +Role Desk Permission **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/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md b/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md index 8a5fc35c25..3f1d6eb64a 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md +++ b/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md @@ -15,7 +15,7 @@ To create new Project, go to: `Projects > Project > New` -Project Default Cost Center +Project Default Cost Center #### 1.2 Create Cost Center @@ -31,7 +31,7 @@ To create new Cost Center, go to: Update Cost Center in the Project master. -Project Default Cost Center +Project Default Cost Center In the sales and purchase transactions, if Project is selected, then Cost Center will fetched from the Project master. @@ -43,7 +43,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. -Project Default Cost Center +Project Default Cost Center #### 2.2 Project in the Purchase Transactions @@ -51,7 +51,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. -Project Default Cost Center +Project Default Cost Center ### 3. Accounting Report for a Project @@ -61,11 +61,11 @@ Since Project's Cost Center is updated in both sales and purchase entries, you c **Monthly Project Analysis** -Project Default Cost Center +Project Default Cost Center **Overall Profitability** -Project Default Cost Center +Project Default Cost Center #### 3.2 Projectwise Budgeting diff --git a/erpnext/docs/user/manual/en/accounts/articles/types-in-tax-template.md b/erpnext/docs/user/manual/en/accounts/articles/types-in-tax-template.md index d8618bee56..11d4b3d3a1 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/types-in-tax-template.md +++ b/erpnext/docs/user/manual/en/accounts/articles/types-in-tax-template.md @@ -2,7 +2,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. -Role Desk Permission +Role Desk Permission **Actual:** This allows you to enter expense amount directly. For example, Rs. 500 incurred for Shipping. diff --git a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md index 12ebd0161c..4c6c659cd1 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md +++ b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md @@ -2,7 +2,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. -Update Stock +Update Stock On checking Update Stock, Sales Invoice Item will show relevant fields like Warehouse, Serial No., Batch No., Item valuation etc. diff --git a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md index 2bfe68739d..904a679e20 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md +++ b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md @@ -6,7 +6,7 @@ Consider Tax or Charge field in Purchase Taxes and Charges master has three valu - Valuation - Total and Valuation -Purchase Tax and Charges Categories +Purchase Tax and Charges Categories 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/erpnext/docs/user/manual/en/accounts/bank-guarantee.md b/erpnext/docs/user/manual/en/accounts/bank-guarantee.md index c0c6d7ad3d..9e0e76676d 100644 --- a/erpnext/docs/user/manual/en/accounts/bank-guarantee.md +++ b/erpnext/docs/user/manual/en/accounts/bank-guarantee.md @@ -6,6 +6,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. -Bank Guarantee +Bank Guarantee {next} diff --git a/erpnext/docs/user/manual/en/accounts/budgeting.md b/erpnext/docs/user/manual/en/accounts/budgeting.md index 3e7db196e9..66021106ad 100644 --- a/erpnext/docs/user/manual/en/accounts/budgeting.md +++ b/erpnext/docs/user/manual/en/accounts/budgeting.md @@ -12,7 +12,7 @@ To create new Cost Center, go to: > Accounts > Budget and Cost Center > Chart of Cost Center > Add New Cost Center -Budget +Budget ###Budgeting @@ -30,20 +30,20 @@ In the Budget form, select a Cost Center. Budgets can be defined against any Cos In the Budgets table, select Income / Expense account for which Budget is to be defined. -Budget +Budget ####Step 4: Monthly Distribution If you have seasonal business, you can also define a Monthly Distribution record, to distribute the budget between months. If you don't set the monthly distribution, ERPNext will calculate the budget on yearly basis or in equal proportion for every month. -Monthly Distribution +Monthly Distribution ####Step 5: Alert on Budget While setting budget, you can also define the actions when expenses will exceed the allocated budget for a period. You can set separate action for monthly and annual budgets. There are 3 types of actions: Stop, Warn and Ignore. If Stop, system will not allow to book expenses more than allocated budget. In Case of Warn, it will just warn the user that expenses has been exceeded from the allocated budget. And Ignore will do nothing. -Monthly Distribution +Monthly Distribution ####Budget Variance Report @@ -53,6 +53,6 @@ To check Budget Variance report, go to: Accounts > Budget and Cost Center > Budget Variance Report -Budget Variance Report +Budget Variance Report {next} diff --git a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md index 44a940ace8..79bc1c1ff2 100644 --- a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md +++ b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md @@ -27,13 +27,13 @@ such as Balance Sheet, Profit and Loss statement and Cash flow statement. An Example of various financial statement are given below: #### Cash Flow Report -Cash Flow Report +Cash Flow Report #### Profit and Loss Report -Profit and Loss Report +Profit and Loss Report #### Balance Sheet Report -Balance Sheet Report +Balance Sheet Report To edit your Chart of Accounts in ERPNext go to: @@ -48,7 +48,7 @@ based on statutory (tax, compliance to government regulations) requirements. Let us understand the main groups of the Chart of Accounts. -Chart of Accounts +Chart of Accounts ### Balance Sheet Accounts @@ -86,7 +86,7 @@ beginning and end of your Fiscal Year, they become zero. In ERPNext it is easy to create a Profit and Loss analysis chart. An example of a Profit and Loss analysis chart is given below: -Financial Analytics Profit and Loss Statement +Financial Analytics Profit and Loss Statement (On the first day of the year you have not made any profit or loss, but you still have assets, hence balance sheet accounts never become zero at the @@ -106,7 +106,7 @@ Supplier). > Note: An Account “Ledger” is also sometimes called as Account “Head”. -Chart of Accounts +Chart of Accounts ### Account Number A standard chart of accounts is organized according to a numerical system. Each major category will begin with a certain number, and then the sub-categories within that major category will all begin with the same number. For example, if assets are classified by numbers starting with the digit 1000, then cash accounts might be labeled 1100, bank accounts might be labeled 1200, accounts receivable might be labeled 1300, and so on. A gap between account numbers is generally maintained for adding accounts in the future. @@ -139,7 +139,7 @@ To create new Accounts, explore your Chart of Accounts and click on an Account group under which you want to create the new Account. On the right side, you will see an option to “Open” or “Add Child” a new Account. -Chart of Accounts +Chart of Accounts Option to create will only appear if you click on a Group (folder) type Account. There you need to enter account name, account number and some more diff --git a/erpnext/docs/user/manual/en/accounts/credit-limit.md b/erpnext/docs/user/manual/en/accounts/credit-limit.md index b48ae5689b..476a37437c 100644 --- a/erpnext/docs/user/manual/en/accounts/credit-limit.md +++ b/erpnext/docs/user/manual/en/accounts/credit-limit.md @@ -14,7 +14,7 @@ To set credit limit go to Customer - Master #### Figure 1: Credit Limit -Credit Limit +Credit Limit Go to the 'CREDIT LIMIT' section and enter the amount in the field Credit Limit. @@ -50,7 +50,7 @@ For 'CREDIT LIMIT' check functionality, Priority (High to Low) is as below #### Figure 2: Credit Controller -Credit Limit +Credit Limit Save the changes. diff --git a/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md b/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md index a2aefc303a..85df285560 100644 --- a/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md +++ b/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md @@ -12,17 +12,17 @@ Items on which differential tax rate is applied, you should mention tax rate for Here is the example of Item on which 12% GST is applied only. -Opening Account +Opening Account For the item which is exempted from GST totally, mention 0% as tax rate in the Item master. -Opening Account +Opening Account ####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. -Opening Account +Opening Account
If you want to have tax rate always applied from the Item master, then you should update Rate for the tax account as zero in the Taxes and Charges master.
@@ -30,7 +30,7 @@ In Sales Taxes and Other Charges master, select GST 16% account and mention Tax In the Sales Order, we have selected many Items. For the items mentioned in blue, tax rate is applied based on tax rate mentioned in the taxes table. For the items highlited in red, tax rate has fetched for them from the respective item master. -Opening Account +Opening Account 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/erpnext/docs/user/manual/en/accounts/journal-entry.md b/erpnext/docs/user/manual/en/accounts/journal-entry.md index ebfc9f59a1..8c9ee4a745 100644 --- a/erpnext/docs/user/manual/en/accounts/journal-entry.md +++ b/erpnext/docs/user/manual/en/accounts/journal-entry.md @@ -9,7 +9,7 @@ To create a Journal Entry go to: > Accounts > Documents > Journal Entry > New -Journal Entry +Journal Entry In a Journal Entry, you must select. diff --git a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md index 060cd17d99..118f059852 100644 --- a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md +++ b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md @@ -6,15 +6,15 @@ In ERPNext, you can make accounting entries in multiple currency. For example, i To get started with multi-currency accounting, you need to assign accounting currency in Account record. You can define Currency from Chart of Accounts while creating Account. -Set Currency from Chart of Accounts +Set Currency from Chart of Accounts You can also assign / modify the currency by opening specific Account record for existing Accounts. -Modify Account Currency +Modify Account Currency For Customer / Supplier (Party), you can also define it's billing currency in the Party record. If the Party's accounting currency is different from Company Currency, you should mention Default Receivable / Payable Account in that currency. -Customer Accounting Currency +Customer Accounting Currency Once you defined Currency in the Account and selected relevant accounts in the Party record , you are ready to make transactions against them. If Party account currency is different from Company Currency, system will restrict to make transaction for that party with that currency only. If account currency is same as Company Currency, you can make transactions for that Party in any currency. But accounting entries (GL Entries) will always be in Party Account Currency. @@ -42,7 +42,7 @@ Now, in POS, Paid Amount will be entered in transaction currency, instead of ear Outstanding Amount and Advance Amount will always be calculated and shown in Customer's Account Currency. -Sales Invoice Outstanding +Sales Invoice Outstanding ### Purchase Invoice @@ -52,12 +52,12 @@ Similarly, in Purchase Invoice, accounting entries will be made based on Supplie In Journal Entry, you can make transactions in different currencies. There is a checkbox "Multi Currency", to enable multi-currency entries. If "Multi Currency" option selected, you will be able to select accounts with different currencies. -Journal Entry Exchange Rate +Journal Entry Exchange Rate In Accounts table, on selection of foreign currency account, system will show Currency section and fetch Account Currency and Exchange Rate automatically. You can change / modify the Exchange Rate later manually. Debit / Credit amount should be entered in Account Currency, system will calculate and show the Debit / Credit amount in Company Currency automatically. -Journal Entry in multi currency +Journal Entry in multi currency ## Reports @@ -65,12 +65,12 @@ In Accounts table, on selection of foreign currency account, system will show Cu In General Ledger, system shows debit / credit amount in both currency if filtered by an Account and Account Currency is different from Company Currency. -General Ledger Report +General Ledger Report ### Accounts Receivable / Payable In Accounts Receivable / Payable report, system shows all the amounts in Party / Account Currency. -Accounts Receivable Report +Accounts Receivable Report {next} diff --git a/erpnext/docs/user/manual/en/accounts/opening-accounts.md b/erpnext/docs/user/manual/en/accounts/opening-accounts.md index 958c20b575..3261ccfd1c 100644 --- a/erpnext/docs/user/manual/en/accounts/opening-accounts.md +++ b/erpnext/docs/user/manual/en/accounts/opening-accounts.md @@ -28,7 +28,7 @@ To open new Journal Entry, go to: If Entry Type is selected as Opening Entry, all the Balance Sheet Accounts will be auto-fetched in the Journal Entry. -Opening Account +Opening Account #### Step 3: Posting Date @@ -38,13 +38,13 @@ Select Posting Date on which Accounts Opening Balance will be updated. For each Account, enter opening value in the Debit or Credit column. As per the double entry valuation system, Total Debit value in a entry must be equal to Total Credit value. -Opening Account +Opening Account ####Step 5: Is Opening Set field `Is Opening` as `Yes`. -Opening Account +Opening Account ####Step 6: Save and Submit @@ -56,13 +56,13 @@ If your Balance Sheet has many Accounts, then updating Account Opening balance f If you are updating account opening balance in few accounts at a time, you can use **Temporary Opening** account for balancing purpose. In the standard chart of accounts, a Temporary Opening Account is auto-created under Assets. -Opening Account +Opening Account 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. -Opening Account +Opening Account Once all your invoices are entered, your **Temporary Opening** account will have a balance of zero! @@ -70,7 +70,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: -Opening Account +Opening Account ###Stock Opening @@ -78,7 +78,7 @@ To track stock balance in the Chart of Account, an Account is created for each W `Chart of Accounts > Assets > Current Asset > StocK Assets > (Warehouse Account)` -Opening Account +Opening Account 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. @@ -102,6 +102,6 @@ To use this tool, just type "Opening Invoice" in the search bar and select the * Here, select the company and type of invoice (sales or purchase) and add a line item for each invoice you want to create. -Opening Invoice Creation Tool +Opening Invoice Creation Tool {next} diff --git a/erpnext/docs/user/manual/en/accounts/payment-entry.md b/erpnext/docs/user/manual/en/accounts/payment-entry.md index ae82eb21f4..c361099412 100644 --- a/erpnext/docs/user/manual/en/accounts/payment-entry.md +++ b/erpnext/docs/user/manual/en/accounts/payment-entry.md @@ -12,25 +12,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. -Making Payment +Making Payment ####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. -Making Paymentt +Making Paymentt ####Step 3: Payment Amount Enter actual payment amount received from the Customer or paid to the Supplier or Employee. -Making Payment +Making Payment ####Step 4: Allocate Amount If creating Payment Entry for the Customer, Payment Amount will be allocated against Sales Invoice. -Making Payment +Making Payment On the same lines, when creating Payment Entry for a Supplier, Payment Amount will be allocated against Purchase Invoice. @@ -40,13 +40,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. -Making Payment +Making Payment ####Step 6: Submit Save and Submit Payment Entry. On submission, outstanding will be updated in the Invoices. -Making Payment +Making Payment 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. @@ -64,11 +64,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. -Making Payment +Making 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. -Making Payment +Making Payment Payments can also be made independent of invoices by creating a new Payment Entry. @@ -81,7 +81,7 @@ Following internal transfers can be managed from the Payment Entry. 3. Cash - Cash 4. Bank - Bank -Making Payment +Making Payment ###Difference between Payment Entry and Journal Entry? diff --git a/erpnext/docs/user/manual/en/accounts/payment-request.md b/erpnext/docs/user/manual/en/accounts/payment-request.md index 7ee397e3ad..a65461173b 100644 --- a/erpnext/docs/user/manual/en/accounts/payment-request.md +++ b/erpnext/docs/user/manual/en/accounts/payment-request.md @@ -3,10 +3,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 -Payment Request +Payment Request - Create payment Request via Sales Invoice -Payment Request +Payment Request --- @@ -15,16 +15,16 @@ considered to create journal entry. Note: Invoice/Order currency and Payment Gateway Account currency should be same. -Payment Request +Payment Request --- ##### 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. -Payment Request +Payment Request ##### Request Mail -Payment Request +Payment Request {next} diff --git a/erpnext/docs/user/manual/en/accounts/payments.md b/erpnext/docs/user/manual/en/accounts/payments.md index e2d8adeba7..e29ac9d43c 100644 --- a/erpnext/docs/user/manual/en/accounts/payments.md +++ b/erpnext/docs/user/manual/en/accounts/payments.md @@ -18,11 +18,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. -Making Payment +Making Payment ####Step 2: Payment Entry -Making Payment +Making Payment For more details about payment entry [check here.](/docs/user/manual/en/accounts/payment-entry) @@ -34,18 +34,18 @@ To make paymant using journal entry, check below steps Goto Accounts Settings > checked Make Payment via Journal Entry -Making Payment +Making Payment ####Step 2: Make Payment On submitting a document against which Journal Entry can be made, you will find Make Payment button. -Making Payment +Making Payment ####Step 3: Journal Entry Save and submit the journal entry to record the payament against the invoice -Making Payment +Making Payment For more details about journal entry [check here.](/docs/user/manual/en/accounts/journal-entry) diff --git a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md index 7458f0da78..166f2c56e6 100644 --- a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md +++ b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md @@ -29,7 +29,7 @@ In ERPNext all Sales and Purchase transactions, like Sales Invoice, Quotation, S In POS, user can select the existing customer during making an order or create the new customer. This features works in the offline mode also. User can also add the customer details like contact number, address details etc on the form. The customer which has been created from the POS will be synced when the internet connection is active. -POS Customer +POS Customer ### Adding an Item @@ -39,7 +39,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. -POS Item +POS Item > 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. @@ -51,7 +51,7 @@ in Search box. 1. Select row in the cart and clik on delete button in the numeric keypad -POS Item +POS Item 2. Set Qty as zero to remove Item from the POS invoice. There are two ways to remove an Item. @@ -69,7 +69,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. -POS Payment +POS Payment Submit the document to finalise the record. After the document is submitted, you can either print or email it directly to the customer. @@ -78,7 +78,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. -POS Payment +POS Payment System books the write off amount into the ledger which has selected on the POS Profile. @@ -86,12 +86,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. -POS Payment +POS Payment ### 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 -POS Payment +POS Payment #### Accounting entries (GL Entry) for a Point of Sale: @@ -112,7 +112,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 -POS Payment +POS Payment After sync of an order, email sent to the customer with the print of the bill in the attachment {next} diff --git a/erpnext/docs/user/manual/en/accounts/pricing-rule.md b/erpnext/docs/user/manual/en/accounts/pricing-rule.md index dfb27bd98b..6048fea286 100644 --- a/erpnext/docs/user/manual/en/accounts/pricing-rule.md +++ b/erpnext/docs/user/manual/en/accounts/pricing-rule.md @@ -25,7 +25,7 @@ In this section, conditions are set for the application of Pricing Rule. When tr ####1.1 Applicable On: -Applicable On +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). @@ -33,31 +33,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. -Applicable for +Applicable for ####1.3 Quantity: Specify minimum and maximum qty of an item when this Pricing Rule should be applicable. -Applicable Qty +Applicable Qty ###2. Application: Using Price List Rule, you can ultimately define price or %discount to be applied on an item. -Applicable +Applicable ####2.1 Price 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. -Applicable Price +Applicable Price #### 2.2 Discount Percentage Discount Percentage can be applied for a specific Price List. To have it applied for all the Price List, %Discount field should be left blank. -Discount +Discount If %Discount is to be applied on all Price Lists, then leave Price List field blank. @@ -65,19 +65,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. -Validity +Validity #### 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. -Priority +Priority #### Disable Check to Disable Pricing Rule. -Disable +Disable ### Add Margin @@ -89,20 +89,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. -Disable +Disable ####2. Make Pricing Rule Create pricing rule for the item against which supplier rate has created -Disable +Disable ####2. Make Invoice System apply the margin rate on the item price on selection of an item. -Disable +Disable For more details about pricing rule [Click Here](/docs/user/manual/en/selling/articles/adding-margin.html) diff --git a/erpnext/docs/user/manual/en/accounts/purchase-invoice.md b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md index c6b2050e53..8076bd8419 100644 --- a/erpnext/docs/user/manual/en/accounts/purchase-invoice.md +++ b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md @@ -14,7 +14,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 -Purchase Invoice +Purchase Invoice The concept of “Posting Date” is again same as Sales Invoice. “Bill No” and “Bill Date” helps to track the bill number as set by your Supplier for diff --git a/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md b/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md index 7923d8ffdf..713fb60c9e 100644 --- a/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md +++ b/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md @@ -10,7 +10,7 @@ Feature of setting document as recurring is available in Sales Order, Sales Invo Option to set document as recurring will be visible only after submission. Recurring is last section in document. Check **Is Recurring** to set document as recurring. -Recurring Invoice +Recurring Invoice **From Date and To Date:** This defines contract period with the customer. diff --git a/erpnext/docs/user/manual/en/accounts/sales-invoice.md b/erpnext/docs/user/manual/en/accounts/sales-invoice.md index 3ea13f09b5..5067975d2a 100644 --- a/erpnext/docs/user/manual/en/accounts/sales-invoice.md +++ b/erpnext/docs/user/manual/en/accounts/sales-invoice.md @@ -8,7 +8,7 @@ You can create a Sales Invoice directly from or you can Make a new Sales Invoice after you submit the Delivery Note. -Sales Invoice +Sales Invoice #### Accounting Impact @@ -64,7 +64,7 @@ is checked. The batch number will be fetched on a First Expiring First Out (FEFO) basis. This is a variant of First In First Out (FIFO) that gives highest priority to the soonest to expire Items. -POS Invoice +POS Invoice 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 @@ -79,7 +79,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. -POS Invoice +POS Invoice #### Billing Timesheet with Project @@ -88,7 +88,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. -POS Invoice +POS Invoice * * * diff --git a/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md index f47f6e6610..9bb7ec3d41 100644 --- a/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md +++ b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md @@ -1,7 +1,7 @@ # Accounts Settings -Account Settings +Account Settings * Accounts Frozen Upto: Freeze accounting transactions upto specified date, nobody can make / modify entry except specified role. diff --git a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md index 0eabce7a29..dfe42315b9 100644 --- a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md +++ b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md @@ -34,6 +34,6 @@ To setup your Chart of Cost Centers go to: > Accounts > Setup > Chart of Cost Centers -Cost Center +Cost Center {next} diff --git a/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md index a211ee3528..e4c55ed87e 100644 --- a/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md +++ b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md @@ -25,6 +25,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. -Fiscal Year +Fiscal Year {next} diff --git a/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md index a7dee0842a..2d375cd737 100644 --- a/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md +++ b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md @@ -2,7 +2,7 @@ You can define which [Tax Template](/docs/user/manual/en/setting-up/setting-up-taxes.html) must be applied on a Sales / Purchase transaction using Tax Rule. -Tax Rule +Tax Rule You can define Tax Rules for Sales or Purchase Taxes. While making a Transaction the system will select and apply tax template based on the tax rule defined. @@ -12,9 +12,9 @@ Let us consider a senario to understand Tax Rule Better. Suppose we define 2 Tax Rules as below. -Tax Rule +Tax Rule -Tax Rule +Tax Rule Here Tax Rule 1 has Billing Country as India and Tax Rule 2 has Billing Country as United Kingdom diff --git a/erpnext/docs/user/manual/en/accounts/subscription.md b/erpnext/docs/user/manual/en/accounts/subscription.md index 9afab58e25..aa67b59682 100644 --- a/erpnext/docs/user/manual/en/accounts/subscription.md +++ b/erpnext/docs/user/manual/en/accounts/subscription.md @@ -2,7 +2,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. -Subscription +Subscription #### Scenario @@ -11,7 +11,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 -Subscription +Subscription **From Date and To Date**: This defines contract period with the customer. diff --git a/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md index 77d27ef99a..2f0ebaaa11 100644 --- a/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md +++ b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md @@ -8,7 +8,7 @@ The Bank Reconciliation Report provide the difference between the bank balance s ####Bank Reconciliation Statement -Bank Reconciliation statement +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. @@ -36,7 +36,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. -Bank Reconciliation +Bank Reconciliation __Step 5:__ Click on the button 'Update Clearance Date'. diff --git a/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md index 329d789704..e7c888f625 100644 --- a/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md +++ b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md @@ -10,7 +10,7 @@ In this tool, you can select an account (your Customer’s account) and click on To cancel off some payments and invoices, select the Invoices and Journal Vouchers and click on “Reconcile”. -Payment Reconciliation +Payment Reconciliation __Step 1:__ Select the Account against whom the payments need to be reconciled. diff --git a/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md index e48055d4d3..6bc0f5a114 100644 --- a/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md +++ b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md @@ -21,7 +21,7 @@ In ERPNext after making all the special entries via Journal Entry for the curren **Closing Fiscal Year** will be an year for which you are closing your financial statement. -Period Closing Voucher +Period Closing Voucher This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a liability account like Reserves and Surplus, or Capital Fund account as Closing Account. diff --git a/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop.md b/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop.md index ecdc4f971f..3ee1590680 100644 --- a/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop.md +++ b/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop.md @@ -45,6 +45,6 @@ Click 'Save' You form should now look something like this -Task +Task 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/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md b/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md index 7a9c3eb4de..07f8bcfb0b 100644 --- a/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md +++ b/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md @@ -19,7 +19,7 @@ Save the new Crop Cycle It should now look something like this -Task +Task Repeat these for every Crop Cycle you need @@ -27,4 +27,4 @@ As you can see a Project was created, with the same name as the Crop Cycle and l > Projects > Project -Task +Task diff --git a/erpnext/docs/user/manual/en/agriculture/crops_and_land/land_unit.md b/erpnext/docs/user/manual/en/agriculture/crops_and_land/land_unit.md index 9b3fb23026..5ca643ec0e 100644 --- a/erpnext/docs/user/manual/en/agriculture/crops_and_land/land_unit.md +++ b/erpnext/docs/user/manual/en/agriculture/crops_and_land/land_unit.md @@ -17,7 +17,7 @@ Click Save It should look something like this -Task +Task With the farm created, we can now create our first Carrot Field! Click on New diff --git a/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md index e7f68add91..7c6bcb5a3e 100644 --- a/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md +++ b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md @@ -19,6 +19,6 @@ Click Save Now it should look something like this -Task +Task 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/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md index 8e1ccf2c48..3fbde5c162 100644 --- a/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md +++ b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md @@ -2,4 +2,4 @@ This is used to keep track of available fertilizers, and their chemical composition, which is linked to the Item master -Task \ No newline at end of file +Task \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/agriculture/index.md b/erpnext/docs/user/manual/en/agriculture/index.md index b186998596..c49d1f20eb 100644 --- a/erpnext/docs/user/manual/en/agriculture/index.md +++ b/erpnext/docs/user/manual/en/agriculture/index.md @@ -4,7 +4,7 @@ Farmers know that even a small operation requires intensive recordkeeping. A wel 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. -Task +Task 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: @@ -15,7 +15,7 @@ The Agriculture module in ERPNext helps you keep track of your farming operation * Record sale of the harvest or transfer to warehouse for further processing * View reports -Task +Task ### Topics diff --git a/erpnext/docs/user/manual/en/asset/asset-maintenance.md b/erpnext/docs/user/manual/en/asset/asset-maintenance.md index 7ad13a6d23..93f67810b8 100644 --- a/erpnext/docs/user/manual/en/asset/asset-maintenance.md +++ b/erpnext/docs/user/manual/en/asset/asset-maintenance.md @@ -11,21 +11,21 @@ To perform Asset Maintenance in ERPNext, ### Enable Asset Maintenance Check Maintain Required in Asset to enable Asset Maintenance -Asset +Asset ### Asset Maintenance Team Create Asset Maintenance Team, select team members and their role. -Asset +Asset ### 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 +Asset ### 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 +Asset ### Asset Repair You can also maintain the records of Repair/Failures of your asset which are not listed in Asset Maintenance. -Asset \ No newline at end of file +Asset \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/asset/assets.md b/erpnext/docs/user/manual/en/asset/assets.md index 1a5ce860c4..a5a84b6302 100644 --- a/erpnext/docs/user/manual/en/asset/assets.md +++ b/erpnext/docs/user/manual/en/asset/assets.md @@ -6,7 +6,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. -Asset Category +Asset Category > **Note:** You can also set default depreciation related Accounts and Cost Centers in Company master. @@ -14,13 +14,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. -Asset +Asset Explanation of the fields: 1. Item Code: An Item for the Asset must be a non-stock item, with "Is Asset" field checked. - Asset Item + Asset Item 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. @@ -42,11 +42,11 @@ Explanation of the fields: The system automatically creates a schedule for depreciation based on depreciation method and other related inputs in the Asset record. -Asset +Asset 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. -Asset +Asset 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. @@ -59,14 +59,14 @@ The system will automatically set the fiscal year end date as the next depreciat For better visibility, net value of the asset on different depreciation dates are shown in a line graph. -Asset +Asset ## 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. -Asset +Asset 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. @@ -80,23 +80,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. -Asset +Asset ## 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 +Asset ## Asset Movement The movement of the assets (from one warehouse to another) is also tracked via Asset Movement form. -Asset +Asset There is also a dedicated button "Transfer Asset" inside the Asset form to track the Asset Movement. -Asset +Asset {next} diff --git a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md index b632bb3ca1..acc8fa73c1 100644 --- a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md +++ b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md @@ -6,7 +6,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. -Supplier Item Code +Supplier Item Code #### 2. Supplier's Item Code in Transactions @@ -14,7 +14,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. -Supplier Item Code in transaction +Supplier Item Code in transaction \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md b/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md index a01f023e79..80f52833f1 100644 --- a/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md +++ b/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md @@ -12,7 +12,7 @@ To pull items from Material Request for specific Supplier only, follow below giv Update Default Supplier in the Item master. -Item Purchase UoM +Item Purchase UoM ####Step 2: New Purchase Order @@ -22,13 +22,13 @@ Update Default Supplier in the Item master. From the options available to pull data in the Purchase Order, click on `For Supplier`. -Item Purchase UoM +Item Purchase UoM ####Step 4: Get Items Select Supplier name and click on `Get`. -Item Purchase UoM +Item Purchase UoM ####Step 5: Edit Items diff --git a/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md b/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md index ad5ebd7d3b..81b1aab345 100644 --- a/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md +++ b/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md @@ -15,28 +15,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. -Item Purchase UoM +Item Purchase UoM #### Step 2: Update UoM Conversion Factors In one Box, if you get 20 Nos. of Pen, UoM Conversion Factor would be 20. -Item Conversion Factor +Item Conversion Factor 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. -Purchase Qty in Default UoM +Purchase Qty in Default UoM ### 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. -Print Format in Purchase UoM +Print Format in Purchase 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. -Purchase UoM master +Purchase UoM master \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/buying/purchase-order.md b/erpnext/docs/user/manual/en/buying/purchase-order.md index cdfd0f9829..070b3a014a 100644 --- a/erpnext/docs/user/manual/en/buying/purchase-order.md +++ b/erpnext/docs/user/manual/en/buying/purchase-order.md @@ -9,7 +9,7 @@ Supplier Quotation. #### Purchase Order Flow Chart -![Purchase Order](/docs/assets/img/buying/buying_flow.png) +![Purchase Order]({{docs_base_url}}/assets/img/buying/buying_flow.png) In ERPNext, you can also make a Purchase Order directly by going to: @@ -17,7 +17,7 @@ In ERPNext, you can also make a Purchase Order directly by going to: #### Create Purchase Order -Purchase Order +Purchase Order Entering a Purchase Order is very similar to a Purchase Request, additionally you will have to set: @@ -42,10 +42,10 @@ government is only the difference between what you collect from your Customer and what you pay to your Supplier. This is called Value Added Tax (VAT). #### Add Taxes in Purchase Order -Purchase Order +Purchase Order #### Show Tax break-up -Purchase Order +Purchase Order 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 @@ -81,7 +81,7 @@ Nos (from the Item form) #### Figure 3: Conversion of Purchase UOM to stock UOM -Purchase Order - UOM +Purchase Order - UOM __Step 4:__ Mention the UOM conversion factor. For example, (100);If one box has 100 pieces. diff --git a/erpnext/docs/user/manual/en/buying/purchase-taxes.md b/erpnext/docs/user/manual/en/buying/purchase-taxes.md index b04949ffee..448532f8b0 100644 --- a/erpnext/docs/user/manual/en/buying/purchase-taxes.md +++ b/erpnext/docs/user/manual/en/buying/purchase-taxes.md @@ -10,7 +10,7 @@ Orders and Purchase Invoices. > Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges Master -Purchase taxes +Purchase taxes You can specify if the tax / charge is only for valuation (not a part of diff --git a/erpnext/docs/user/manual/en/buying/request-for-quotation.md b/erpnext/docs/user/manual/en/buying/request-for-quotation.md index a48c297a6f..2241ed60c6 100644 --- a/erpnext/docs/user/manual/en/buying/request-for-quotation.md +++ b/erpnext/docs/user/manual/en/buying/request-for-quotation.md @@ -13,35 +13,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. -![Request For Quotation](/docs/assets/img/buying/make-supplier-quotation-from-rfq.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/make-supplier-quotation-from-rfq.png) __Step 2:__ Select supplier and click on make Supplier Quotation. -![Request For Quotation](/docs/assets/img/buying/supplier-selection-from-rfq.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-selection-from-rfq.png) __Step 3:__ System will open the Supplier Quotation, user has to enter the rate and submit it. -![Request For Quotation](/docs/assets/img/buying/supplier-quotation-from-rfq.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-quotation-from-rfq.png) #### For Supplier __Step 1:__ User has to create contact or enter Email Address against the supplier on Request for Quotation. -![Request For Quotation](/docs/assets/img/buying/set-email-id.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/set-email-id.png) __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. -![Request For Quotation](/docs/assets/img/buying/supplier-password-update-link.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-password-update-link.png) * 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. -![Request For Quotation](/docs/assets/img/buying/send-rfq-link.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/send-rfq-link.png) __Step 3:__ Supplier has to enter amount and notes(payment terms) on the form and click on submit -![Request For Quotation](/docs/assets/img/buying/supplier-portal-rfq.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-portal-rfq.png) __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 @@ -51,4 +51,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. -![Request For Quotation](/docs/assets/img/buying/request-for-quotation.gif) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/request-for-quotation.gif) diff --git a/erpnext/docs/user/manual/en/buying/setup/buying-settings.md b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md index 197a18ebb6..05f3e5aa06 100644 --- a/erpnext/docs/user/manual/en/buying/setup/buying-settings.md +++ b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md @@ -2,7 +2,7 @@ Buying Settings is where you can define properties which will be applied in the Buying module's transactions. -![Buying Settings](/docs/assets/img/buying/buying-settings.png) +![Buying Settings]({{docs_base_url}}/assets/img/buying/buying-settings.png) Let us look at the various options that can be configured: diff --git a/erpnext/docs/user/manual/en/buying/setup/supplier-type.md b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md index 16d5445fb9..5d80c1aae4 100644 --- a/erpnext/docs/user/manual/en/buying/setup/supplier-type.md +++ b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md @@ -16,7 +16,7 @@ You can create your own category of Supplier Type. > Buying > Setup > Supplier Type > New Supplier Type -Supplier Type +Supplier Type You can classify your suppliers from a range of choice available in ERPNext. Choose from a set of given options like Distributor, Electrical,Hardware, diff --git a/erpnext/docs/user/manual/en/buying/supplier-quotation.md b/erpnext/docs/user/manual/en/buying/supplier-quotation.md index 5935477949..4dabebacc0 100644 --- a/erpnext/docs/user/manual/en/buying/supplier-quotation.md +++ b/erpnext/docs/user/manual/en/buying/supplier-quotation.md @@ -10,7 +10,7 @@ You can make a supplier quotation from a Material Request #### Supplier Quotation Flow-Chart -![Supplier Quotation](/docs/assets/img/buying/buying_flow.png) +![Supplier Quotation]({{docs_base_url}}/assets/img/buying/buying_flow.png) You can also make a Supplier Quotation directly from: @@ -18,7 +18,7 @@ You can also make a Supplier Quotation directly from: #### Create Supplier Quotation -Supplier Quotation +Supplier Quotation If you have multiple Suppliers who supply you with the same Item, you usually send out a message (Request for Quote) to various Suppliers. In @@ -37,10 +37,10 @@ If your Supplier is going to charge you additional taxes or charge like a shippi You can select relevant tax by going to "Taxes and Charges" section and adding an entry to the table as shown below, -Supplier Quotation +Supplier Quotation Besides, in case of multiple items you can keep track of taxes on each by clicking "Show tax break-up" -Supplier Quotation +Supplier Quotation {next} diff --git a/erpnext/docs/user/manual/en/buying/supplier-scorecard.md b/erpnext/docs/user/manual/en/buying/supplier-scorecard.md index eb330302af..ad4ce49ff8 100644 --- a/erpnext/docs/user/manual/en/buying/supplier-scorecard.md +++ b/erpnext/docs/user/manual/en/buying/supplier-scorecard.md @@ -14,24 +14,24 @@ In ERPNext, you can create a supplier scorecard by going to: ### Create Supplier Scorecard A supplier scorecard is created for each supplier individually. Only one supplier scorecard can be created for each supplier. -Purchase Order +Purchase Order #### 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. -Purchase Order +Purchase Order 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. -Purchase Order +Purchase Order #### 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. -Purchase Order +Purchase Order 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/erpnext/docs/user/manual/en/buying/supplier.md b/erpnext/docs/user/manual/en/buying/supplier.md index 217d8b79b1..7ff645f0c5 100644 --- a/erpnext/docs/user/manual/en/buying/supplier.md +++ b/erpnext/docs/user/manual/en/buying/supplier.md @@ -6,13 +6,13 @@ You can create a new Supplier from: `Explore > Supplier > New Supplier` -Supplier Master +Supplier Master ### Contacts and Addresses Contacts and Addresses in ERPNext are stored separately so that you can create multiple Contacts and Addresses for a Suppliers. Once Supplier is saved, you will find option to create Contact and Address for that Supplier. -Supplier Master +Supplier Master > 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. @@ -22,7 +22,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. -Supplier Master +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/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md index 6facabf0bb..7fc98621fc 100644 --- a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md +++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md @@ -2,18 +2,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. -Customer Portal +Customer Portal Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance. -Customer Portal +Customer Portal #### Outstanding Sales Invoice -Customer Portal +Customer Portal #### Paid Sales Invoice -Customer Portal +Customer Portal {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/customer-portal/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md index 17b74e49cc..dc83ff6ffc 100644 --- a/erpnext/docs/user/manual/en/customer-portal/issues.md +++ b/erpnext/docs/user/manual/en/customer-portal/issues.md @@ -7,18 +7,18 @@ conversation. #### Empty Issue List -Issue List +Issue List #### New Issue -New Issue +New Issue #### Open Issue -Issue Raised +Issue Raised #### Reply on Issue -Issue reply +Issue reply {next} diff --git a/erpnext/docs/user/manual/en/customer-portal/portal-login.md b/erpnext/docs/user/manual/en/customer-portal/portal-login.md index efa70a2a95..9065968830 100644 --- a/erpnext/docs/user/manual/en/customer-portal/portal-login.md +++ b/erpnext/docs/user/manual/en/customer-portal/portal-login.md @@ -3,6 +3,6 @@ To login into the customer account, the customer has to use his Email Address and the password sent by ERPNext; generated through the sign-up process. -Website User Signup +Website User Signup {next} diff --git a/erpnext/docs/user/manual/en/customer-portal/sign-up.md b/erpnext/docs/user/manual/en/customer-portal/sign-up.md index 36e1b2cbdf..aed8057d84 100644 --- a/erpnext/docs/user/manual/en/customer-portal/sign-up.md +++ b/erpnext/docs/user/manual/en/customer-portal/sign-up.md @@ -6,11 +6,11 @@ Your Customer and Suppliers can signup to your ERPNext account by following Sign On the Login Page, you will find option to Signup. -Website User Signup +Website User Signup #### Step 2: Enter Customer Name and ID -Website User Signup +Website User Signup After the sign up process, an email will be sent to the customers Email Address with the password details. diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md index 686f748fdd..902ada8717 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md @@ -12,17 +12,17 @@ Once document is submitted, fields are frozen, and no editing is allowd. Still t In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.) -select docytpe +select docytpe #### Step 3: Edit Field Property In the fields section, click on the Custom field and check the **Allow On Submit**. -Check Allow on Submit +Check Allow on Submit #### Step 3: Update Customize Form -Update +Update 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/erpnext/docs/user/manual/en/customize-erpnext/articles/child-table-.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/child-table-.md index bc31cf21d3..65f7566904 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/child-table-.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/child-table-.md @@ -6,28 +6,28 @@ This is how Quotation Item table renders value when Editable Grid is enabled. It will maximum list four columns in the table. -Role Desk Permission +Role Desk Permission 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. -Role Desk Permission +Role Desk Permission 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. -Role Desk Permission +Role Desk Permission **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. -Role Desk Permission +Role Desk Permission 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. -Role Desk Permission +Role Desk Permission 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. -Role Desk Permission \ No newline at end of file +Role Desk Permission \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md index 9a480bdca5..b6e6ddcd5a 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md @@ -13,7 +13,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. -Select Docytpe +Select Docytpe ####Step 4: Custom Field Values @@ -24,6 +24,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 -Enter Values +Enter Values diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md index 0319fd606e..d8e5319b94 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md @@ -12,13 +12,13 @@ Select document type for which Sort Order is to be customized. -Sort Order field +Sort Order field ####Step 3: Update Sort Details In the Customize Form, you will find these fields. -Sort Order field +Sort Order field 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/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md index 6a88fb7244..b9385523f0 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md @@ -8,16 +8,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. -Report Search +Report Search ####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. -Report List +Report List Or you can open that report, and delete it from File menu option. -Report Delete +Report Delete \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md index c4009c0c07..e47692fcfd 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md @@ -2,7 +2,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. -Print Preview +Print Preview Follow steps given below to hide rounded total from Standard Print Formats, for all the sales transactions. @@ -14,7 +14,7 @@ Follow steps given below to hide rounded total from Standard Print Formats, for Check Disable Rounded Total, and Save Global Defaults. -Print Preview +Print Preview 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/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md index 04b20ac4b9..4c35e21f8f 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md @@ -8,12 +8,12 @@ For example, if you want Customer's PO No. and PO Date to be fetched from Sales Sales Order (standard fields) -Standard fields in Sales Order +Standard fields in Sales Order Sales Invoice (custom fields) -Custom Field in Sales Invoice +Custom Field in Sales Invoice 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. -Values fetching from Sales Order to Sales Invoice \ No newline at end of file +Values fetching from Sales Order to Sales Invoice \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md index ea0dd93691..2b7459c748 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md @@ -10,13 +10,13 @@ Let's assume we need to update Max Attachment for Quotation to five. #### Step 2: Select Document Type -Select Doctype +Select Doctype #### Step 3: Set Limit Set Maximum Attachments as five. -Set Max Attachment +Set Max Attachment 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/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md index b967a3583f..62cc3f9e6b 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md @@ -14,13 +14,13 @@ Go to: As per our scenario, Sales Order will be selected as Document Type. field-visible-2.gif -Document Type +Document Type #### Step 3: Uncheck Print Hide click to open field to be made visible in the Standard Print Format. Uncheck **Print Hide** field. -Uncheck Print Hide +Uncheck Print Hide #### Step 4: Update diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md index 40cad73a6b..c72004d64c 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md @@ -12,7 +12,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. -Custom Link Field +Custom Link Field 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. @@ -27,17 +27,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. -journal Voucher Link Field +journal Voucher Link Field #### 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. -Custom Dynamic Field +Custom Dynamic Field 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. -Custom Dynamic Field +Custom Dynamic Field
**Customizing options in the Doctype Link field** diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md index c3f97c4f39..191ce8a830 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md @@ -6,7 +6,7 @@ As step zero, ensure that you have "Website Manager" role assigned. It is a stan If module is hidden in-spite of assignment of required Role, then you should check if Website is not disabled from All Application. -All Applications +All Applications 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/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md index 369a7126dc..3dd6c68e55 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md @@ -16,12 +16,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. -Search By in Customize Form +Search By in Customize Form #### Searching in Another Record. While creating transaction, to get filtered result for Customer, you should firstly click on search magnifier. -Search By in Customize Form +Search By in Customize Form diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md index d098e5e89d..ede54f24e9 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md @@ -8,13 +8,13 @@ Following are the steps to set language in your ERPNext account. #### 1.1 Go to My Setting -My Setting +My Setting #### 1.2 Select Language -Select Language +Select Language -Select Language +Select Language #### 1.3 Save User @@ -30,13 +30,13 @@ Being a System Manager, you can set language in other user's master as well. #### Set Language -Global Language +Global Language #### Save Save System Settings, and refresh your EPRNext account. On refreshing, you should language in your ERPNext account changed as per your preference. -Select Language +Select Language 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/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md index 45c1f79d10..4ed070fcd7 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md @@ -8,11 +8,11 @@ To change the precision globally, go to: `Setup > Settings > System Settings`. -Global Precision +Global Precision 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. -Field-wise Precision +Field-wise Precision \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md index 29eef88dcc..586814175b 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md @@ -10,10 +10,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. -Sales Order +Sales Order #### Step 3: Apply User Permission For Role to be restricted (Sales User in this case), check "If Owner". -S +S diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md index 93abb3e95d..d6d1e3fa66 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md @@ -21,7 +21,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. -Doctype Basic +Doctype Basic #### Fields @@ -36,7 +36,7 @@ Fields are much more than database columns, they can be: 1. Actions (button) 1. Attachments or Images -Doc fields +Doc fields 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. @@ -46,19 +46,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**. -Doctype Naming +Doctype Naming #### Permission In this table, you should select roles and define permission roles for them for this Doctype. -Doctype Permissions +Doctype Permissions #### Save DocType On saving doctype, you will get pop-up to provide name for this Doctype. -Doctype Save +Doctype Save #### DocType in System @@ -67,12 +67,12 @@ Human Resource module, to access this doctype, go to: `Human Resource > Document > Book` -Doctype List +Doctype List #### Book master Using the fields entered, following is the master one book. -Doctype Form +Doctype Form {next} diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md index 2c11e0dc32..ec6c2229c8 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md @@ -14,25 +14,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. -Select Document Type +Select Document Type #### Insert Row for the Custom Field In Customize Form, open the field above which you want to insert a Custom Field. Click on Insert Above. -Select Document Type +Select Document Type ####Set Field Label Custom Field's name will be set based on its Label. If you want to create Custom Field with specific name, but with different label, then you should first set Label as you want Field Name to be set. After Custom Field is saved, you can edit the Field Label again. -Select Document Type +Select Document Type ####Select Field Type There are various types of Field like Data, Date, Link, Select, Text and so on. Select Field Type for the Custom Field. -Select Document Type +Select Document Type Click [here](/docs/user/manual/en/customize-erpnext/articles/field-types.html) to learn more about types of field you can set for your Custom Field. @@ -44,7 +44,7 @@ If you are creating a Link field, then in the Options, enter Doctype name with w If field type is set as Select (drop down field), then all he possible result for this field should be listed in the Options field. Each possible result should be separate by row. -Select Document Type +Select Document Type For Data field, Option can be set to "Email" or "Phone" and the field will be validated accordingly. @@ -65,7 +65,7 @@ You can set properties as: After inserting required details for the Custom Field, Update Customize Form. On update, Custom Field will be inserting in the form, Employee master in this case. Before checking Employee form, reload your ERPNext account. After reload, check Employee form to see Custom Field in a form. -Select Document Type +Select Document Type ####Deleting Custom Field diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md index f5519c239d..1e21e4a9ef 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md @@ -6,7 +6,7 @@ Lead form, you can do so by creating your own script. `Setup > Customization > Custom Script` -Custom Script +Custom Script ### Topics diff --git a/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md index 5f590bb35b..7eb02ab4c6 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md @@ -13,7 +13,7 @@ Go to Customize Form from: You can also reach the Customize Form tool from the List Views. -Customize Form List +Customize Form List ####Step 2: Select Document Type @@ -21,7 +21,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. -Customize Form select doctype +Customize Form select doctype ####Step 3: Edit Property @@ -29,7 +29,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. -Customize Form select doctype +Customize Form select doctype Like setting setting field Mandatory, following are the other customization options in the Customize Form tool. diff --git a/erpnext/docs/user/manual/en/customize-erpnext/document-title.md b/erpnext/docs/user/manual/en/customize-erpnext/document-title.md index 64dad31c98..a05158d66f 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/document-title.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/document-title.md @@ -23,14 +23,14 @@ You can define the title by setting document properties in braces `{}`. For exam {customer_name} for {project} Customize Title + src="{{docs_base_url}}/assets/img/customize/customize-title.gif"> #### Fixed or Editable Titles If your title is generated as a default title, it can be edited by the user by clicking on the heading of the document. Editable Title + src="{{docs_base_url}}/assets/img/customize/editable-title.gif"> If you want a fixed title, you can set the rule in the **Options** property. In this way, the title will be automatically updated everytime the document is updated. diff --git a/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md index ad4b00e2f9..ab47a4557e 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md @@ -4,7 +4,7 @@ To hide modules (icons) from the home page, go to: `Setup > Permissions > Show / Hide Modules` -Hide Features +Hide Features 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/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md index 7c1234f381..ccfa63a93a 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md @@ -8,35 +8,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 Kanban Board +Add 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. -Add card in Kanban Board +Add card in Kanban Board ###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. -Move Cards on Kanban Board +Move Cards on Kanban Board ###Manage Columns To add more columns in the Kanban board click Add columns. -Add New column in Kanban Board +Add New column in Kanban Board To move columns based on the priority drag and drop the columns as per requirement. -Move columns in Kanban Board +Move columns in Kanban Board To set Colors to a Card click drop down menu on the card and assign color to it. -Add color to cards in Kanban Board +Add color to cards in Kanban Board 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. -Archive and Restore in Kanban Board +Archive and Restore in Kanban Board diff --git a/erpnext/docs/user/manual/en/customize-erpnext/print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md index 993f92ad58..e626e9b8d4 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/print-format.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md @@ -18,7 +18,7 @@ To create your own versions, open an existing template from: `Setup > Printing > Print Formats` -Print Format +Print Format 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” @@ -45,7 +45,7 @@ To edit / update your print and PDF settings, go to: `Setup > Printing and Branding > Print Settings` -Print Format +Print Format #### Example diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md index 64183ad8be..8b35e8d378 100644 --- a/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md +++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md @@ -2,13 +2,13 @@ Assessment Criteria is the parameter based on which you assess the Student. -Assessment Criteria +Assessment Criteria 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. -Assessment Plan Criteria +Assessment Plan Criteria #### Video Tutorial on Assessment Criteria diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md index 35e00ad3d5..b1ad745ee9 100644 --- a/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md +++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md @@ -4,11 +4,11 @@ Assessment Group tree is a master where you can define the hierarchy for examina For example, if you conduct two assessment in a academic year, then setup Assessment Group as following. -Assessment Group Term +Assessment Group Term On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute. -Assessment Group Term +Assessment Group Term #### Video Tutorial on Assessment Group diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md index 8e08535514..0bb7e6b36d 100644 --- a/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md +++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md @@ -10,11 +10,11 @@ To schedule an assessment/examination for a Student Group, for specific Course, 4. Examiner and Supervisor -Assessment Plan Details +Assessment Plan Details 5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned. -Assessment Plan Criteria +Assessment Plan Criteria #### Video Tutorial on Assessment Plan diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md index 5547f2247b..4ca91a710b 100644 --- a/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md +++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md @@ -2,7 +2,7 @@ Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/education/assessment/assessment_result_tool.html). -Assessment Result +Assessment Result #### Video Tutorial on Assessment Result diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md index 1cd0762faa..f57fc182c1 100644 --- a/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md +++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md @@ -2,7 +2,7 @@ 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. -Assessment Result Tool +Assessment Result Tool 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. diff --git a/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md b/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md index c3d8b2127a..3d8f2e9ce3 100644 --- a/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md +++ b/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md @@ -2,7 +2,7 @@ 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. -Grading Scale +Grading Scale #### Video Tutorial on Grading Scale diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md b/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md index c68f473db0..cc526b5f6c 100644 --- a/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md +++ b/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md @@ -10,7 +10,7 @@ To mark the **Attedance* based on Student Group select the group based on Student detials will be autofetched and you can mark the attendance of the given date. -Student Attendance +Student Attendance #### Tutorial Video for Student Attendance Tool diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md b/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md index b93114607e..0ebb65cd48 100644 --- a/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md +++ b/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md @@ -8,7 +8,7 @@ To create Attendance record : Select the **Student, Course Schedule and Student Group** for which attendance is to be marked for the given date. Set the Status to Present/Absent and save. -Student Attendance +Student Attendance **Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**. diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md b/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md index 011d07c94c..406c20db3e 100644 --- a/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md +++ b/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md @@ -4,7 +4,7 @@ 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. -Student Attendance +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. diff --git a/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md b/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md index 5727bc230b..fa2e09a7d8 100644 --- a/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md +++ b/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md @@ -8,11 +8,11 @@ You can create the Program Enrollment for : 1. **Student Applicants**: List of Student Applicants will be fetched for the selected **Program**, **Academic year** and **Academic Term** (if provided). -Student Applicant Enrollment +Student Applicant Enrollment 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**. -Student Applicant Enrollment +Student Applicant Enrollment **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). diff --git a/erpnext/docs/user/manual/en/education/admission/program-enrollment.md b/erpnext/docs/user/manual/en/education/admission/program-enrollment.md index 36af3f263e..54bf98b521 100644 --- a/erpnext/docs/user/manual/en/education/admission/program-enrollment.md +++ b/erpnext/docs/user/manual/en/education/admission/program-enrollment.md @@ -7,7 +7,7 @@ If the student has applied online for the admission in a particular **Program** Else, to create the new Program Enrollment manually, go to: > Education > Program Enrollment > New -Student Applicant Enrollment +Student Applicant Enrollment 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. diff --git a/erpnext/docs/user/manual/en/education/admission/student-applicant.md b/erpnext/docs/user/manual/en/education/admission/student-applicant.md index fa1b4c2c75..2f725424e9 100644 --- a/erpnext/docs/user/manual/en/education/admission/student-applicant.md +++ b/erpnext/docs/user/manual/en/education/admission/student-applicant.md @@ -3,7 +3,7 @@ A Student Applicant record needs to be created when a student applies for a program at your institute. You can Approve or Reject a student applicant. By accepting a student applicant you can add them to the student master. -Student Applicant +Student Applicant ### Application Status @@ -20,12 +20,12 @@ 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. -Student Applicant Enrollment +Student Applicant Enrollment 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/education/student/program-enrollment.html). -Student Applicant Enrollment +Student Applicant Enrollment #### Video Tutorial for Student Application diff --git a/erpnext/docs/user/manual/en/education/admission/student_admission.md b/erpnext/docs/user/manual/en/education/admission/student_admission.md index f2b8ef6102..ff98a923e2 100644 --- a/erpnext/docs/user/manual/en/education/admission/student_admission.md +++ b/erpnext/docs/user/manual/en/education/admission/student_admission.md @@ -7,7 +7,7 @@ To create a Student Admission record go to : **education** >> **Admissions** >> **Student Admission** >> -Student Applicant +Student Applicant 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. diff --git a/erpnext/docs/user/manual/en/education/fees/fee-category.md b/erpnext/docs/user/manual/en/education/fees/fee-category.md index 8a4822f3b4..b724681286 100644 --- a/erpnext/docs/user/manual/en/education/fees/fee-category.md +++ b/erpnext/docs/user/manual/en/education/fees/fee-category.md @@ -2,6 +2,6 @@ List of all different type of fees collected. -Fees Category +Fees Category {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/education/fees/fee-structure.md b/erpnext/docs/user/manual/en/education/fees/fee-structure.md index 76d43a4783..f502b93220 100644 --- a/erpnext/docs/user/manual/en/education/fees/fee-structure.md +++ b/erpnext/docs/user/manual/en/education/fees/fee-structure.md @@ -8,7 +8,7 @@ You can create the Fee Structure directly from or you can create the Fee Structure from Program also. -Fees Structure +Fees Structure #### Academic Year Impact diff --git a/erpnext/docs/user/manual/en/education/fees/fees.md b/erpnext/docs/user/manual/en/education/fees/fees.md index 5e0c126dff..e5cdcb3670 100644 --- a/erpnext/docs/user/manual/en/education/fees/fees.md +++ b/erpnext/docs/user/manual/en/education/fees/fees.md @@ -3,6 +3,6 @@ Maintain a record of fees collected from students. The [Fee Structure](/docs/user/manual/en/education/fees/fee-structure.html) is fetched based on the selected Program and Academic Term. -Fees +Fees {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/education/fees/index.md b/erpnext/docs/user/manual/en/education/fees/index.md index d0ccb94857..c432db249e 100644 --- a/erpnext/docs/user/manual/en/education/fees/index.md +++ b/erpnext/docs/user/manual/en/education/fees/index.md @@ -2,7 +2,7 @@ This section contains 'Fee' related documents. -Fees Section +Fees Section ### Topics diff --git a/erpnext/docs/user/manual/en/education/index.md b/erpnext/docs/user/manual/en/education/index.md index 36c6bbd772..49dfd64e9c 100644 --- a/erpnext/docs/user/manual/en/education/index.md +++ b/erpnext/docs/user/manual/en/education/index.md @@ -3,6 +3,6 @@ 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. -Fees Section +Fees Section {index} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/education/schedule/course-schedule.md b/erpnext/docs/user/manual/en/education/schedule/course-schedule.md index 8b8a36eb15..eeccae456c 100644 --- a/erpnext/docs/user/manual/en/education/schedule/course-schedule.md +++ b/erpnext/docs/user/manual/en/education/schedule/course-schedule.md @@ -3,7 +3,7 @@ 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. -Course Schedule +Course Schedule #### Video Tutorial on Course Scheduling @@ -21,7 +21,7 @@ You can see the overall course schedule in the Calendar view. You can mark attendance for a Student Group against a Course Schedule. -Course Schedule Attendance +Course Schedule Attendance - To make attendance, expand the attendance section. - Check the students who were present for that session. @@ -32,6 +32,6 @@ You can mark attendance for a Student Group against a Course Schedule. 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. -Course Schedule Attendance +Course Schedule Attendance {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/education/schedule/examination.md b/erpnext/docs/user/manual/en/education/schedule/examination.md index d21d204189..10f59f84bf 100644 --- a/erpnext/docs/user/manual/en/education/schedule/examination.md +++ b/erpnext/docs/user/manual/en/education/schedule/examination.md @@ -2,7 +2,7 @@ The Examination record can be used to track the exam schedule and the results of that exam. -Examination +Examination {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/education/schedule/index.md b/erpnext/docs/user/manual/en/education/schedule/index.md index 247b0b8893..5e1b43a40e 100644 --- a/erpnext/docs/user/manual/en/education/schedule/index.md +++ b/erpnext/docs/user/manual/en/education/schedule/index.md @@ -1,6 +1,6 @@ # Schedule -Schedule Section +Schedule Section ### Topics diff --git a/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md b/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md index 087c933fe3..65dd95bd3a 100644 --- a/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md +++ b/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md @@ -2,7 +2,7 @@ This tool can be used to create 'Course Schedules'. -Scheduling Tool +Scheduling Tool ### Creating Course Schedules diff --git a/erpnext/docs/user/manual/en/education/setup/academic-term.md b/erpnext/docs/user/manual/en/education/setup/academic-term.md index d264dca5d6..2dd1d69c56 100644 --- a/erpnext/docs/user/manual/en/education/setup/academic-term.md +++ b/erpnext/docs/user/manual/en/education/setup/academic-term.md @@ -4,7 +4,7 @@ An academic term (or simply "term") is a portion of an academic year, the time d The **Academic term** form in ERPNext enables you to create academic terms within in a year. Based on the term schedule enter the start and end date for the schedule and generate the term for a Academic year. -Academic Term +Academic Term {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/education/setup/academic-year.md b/erpnext/docs/user/manual/en/education/setup/academic-year.md index c9ea521185..ec66c971fa 100644 --- a/erpnext/docs/user/manual/en/education/setup/academic-year.md +++ b/erpnext/docs/user/manual/en/education/setup/academic-year.md @@ -4,7 +4,7 @@ An academic year is a period of time which education, colleges and universities The **Academic year** form have the Start and End date for the Academic year. -Academic Year +Academic Year **Student group** link is given to view or add the respective groups to the Academic year. diff --git a/erpnext/docs/user/manual/en/education/setup/course.md b/erpnext/docs/user/manual/en/education/setup/course.md index ec7d813056..24482fffc9 100644 --- a/erpnext/docs/user/manual/en/education/setup/course.md +++ b/erpnext/docs/user/manual/en/education/setup/course.md @@ -4,11 +4,11 @@ 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. -Course +Course Once a **Course** is created, a course schedule can defined for the same. -Course +Course 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**. diff --git a/erpnext/docs/user/manual/en/education/setup/index.md b/erpnext/docs/user/manual/en/education/setup/index.md index 1062c3a4ac..1176544baa 100644 --- a/erpnext/docs/user/manual/en/education/setup/index.md +++ b/erpnext/docs/user/manual/en/education/setup/index.md @@ -2,7 +2,7 @@ The Setup section of education module provides facility to make some basic configuration. Below are doctypes for basic configuration. -Setup Section +Setup Section ### Topics diff --git a/erpnext/docs/user/manual/en/education/setup/instructor.md b/erpnext/docs/user/manual/en/education/setup/instructor.md index 5af4cc098e..9f4dbdca2c 100644 --- a/erpnext/docs/user/manual/en/education/setup/instructor.md +++ b/erpnext/docs/user/manual/en/education/setup/instructor.md @@ -6,7 +6,7 @@ To create new Instructor go to: > Education > Instructor > New -Instructor +Instructor 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**. diff --git a/erpnext/docs/user/manual/en/education/setup/program.md b/erpnext/docs/user/manual/en/education/setup/program.md index 0d2a4d2994..e9fb091164 100644 --- a/erpnext/docs/user/manual/en/education/setup/program.md +++ b/erpnext/docs/user/manual/en/education/setup/program.md @@ -8,11 +8,11 @@ To create a Program go to : Enter a unique code for every **Program**. You can also link the **Program** to the department under which it is conducted. -Program +Program Add the relevant Course and the Fee details for a program. -Program +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. diff --git a/erpnext/docs/user/manual/en/education/setup/room.md b/erpnext/docs/user/manual/en/education/setup/room.md index 6a1f32e9ff..02e604c86c 100644 --- a/erpnext/docs/user/manual/en/education/setup/room.md +++ b/erpnext/docs/user/manual/en/education/setup/room.md @@ -4,14 +4,14 @@ A classroom is a space (room or lab) where you want to schedule courses or exami The Room doctype allows you to record the room number and the seating capacity for a classroom. Once a room is created Course schedule link is provided in the Room doctype to view or add the course schedule for the classroom. -Room +Room 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. -Room +Room 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. -Room +Room {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/education/setup/school-settings.md b/erpnext/docs/user/manual/en/education/setup/school-settings.md index 74e5ed561f..efdf8993f5 100644 --- a/erpnext/docs/user/manual/en/education/setup/school-settings.md +++ b/erpnext/docs/user/manual/en/education/setup/school-settings.md @@ -2,14 +2,15 @@ The Education Settings page allow you to setup basic settings like **Academic Year and Term** for the educational setup. -Student + +Student 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** -Student +Student 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** -Student +Student {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/education/setup/student-batch-name.md b/erpnext/docs/user/manual/en/education/setup/student-batch-name.md index 3b5ad41edd..3c6a4055cc 100644 --- a/erpnext/docs/user/manual/en/education/setup/student-batch-name.md +++ b/erpnext/docs/user/manual/en/education/setup/student-batch-name.md @@ -2,7 +2,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 -Student +Student You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch. diff --git a/erpnext/docs/user/manual/en/education/setup/student-category.md b/erpnext/docs/user/manual/en/education/setup/student-category.md index cb5cbeae38..37abd222eb 100644 --- a/erpnext/docs/user/manual/en/education/setup/student-category.md +++ b/erpnext/docs/user/manual/en/education/setup/student-category.md @@ -6,7 +6,7 @@ To create Student category go to Setup >> Student Category >> New. We can create new student category by adding a name and save it -Student +Student {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/education/student/guardian.md b/erpnext/docs/user/manual/en/education/student/guardian.md index ca34e8b765..5df444e6dc 100644 --- a/erpnext/docs/user/manual/en/education/student/guardian.md +++ b/erpnext/docs/user/manual/en/education/student/guardian.md @@ -2,7 +2,7 @@ The Guardian doctype allows you to record the guardian details for a **Student**. -Student +Student The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements. diff --git a/erpnext/docs/user/manual/en/education/student/student-batch.md b/erpnext/docs/user/manual/en/education/student/student-batch.md index 3b5ad41edd..3c6a4055cc 100644 --- a/erpnext/docs/user/manual/en/education/student/student-batch.md +++ b/erpnext/docs/user/manual/en/education/student/student-batch.md @@ -2,7 +2,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 -Student +Student You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch. diff --git a/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md b/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md index d27f4f74f6..631e6b6710 100644 --- a/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md +++ b/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md @@ -8,7 +8,7 @@ To create Student group using this tool go to Select the **Academic Term** and the **Program** for which a student group is to be created. -Student Group Creation Tool +Student Group Creation Tool 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. diff --git a/erpnext/docs/user/manual/en/education/student/student-group.md b/erpnext/docs/user/manual/en/education/student/student-group.md index be68df1e73..58821bd7ed 100644 --- a/erpnext/docs/user/manual/en/education/student/student-group.md +++ b/erpnext/docs/user/manual/en/education/student/student-group.md @@ -8,13 +8,15 @@ To create a Student Group go to: > Education > Student > New Student Group -Student Group + +Student Group + 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. -Student Group +Student 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. diff --git a/erpnext/docs/user/manual/en/education/student/student-log.md b/erpnext/docs/user/manual/en/education/student/student-log.md index 5c113e4650..37a8c1b276 100644 --- a/erpnext/docs/user/manual/en/education/student/student-log.md +++ b/erpnext/docs/user/manual/en/education/student/student-log.md @@ -4,6 +4,6 @@ The Student log Doctype enables you to add and edit addtional information for a You can make a note of student activities using Student log. Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement' -Student +Student {next} diff --git a/erpnext/docs/user/manual/en/education/student/student.md b/erpnext/docs/user/manual/en/education/student/student.md index 9799e80a69..3dbb42c33f 100644 --- a/erpnext/docs/user/manual/en/education/student/student.md +++ b/erpnext/docs/user/manual/en/education/student/student.md @@ -3,7 +3,8 @@ 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. -Student + +Student 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. diff --git a/erpnext/docs/user/manual/en/fleet_management/index.md b/erpnext/docs/user/manual/en/fleet_management/index.md index 564cb28b06..5e32271c6b 100644 --- a/erpnext/docs/user/manual/en/fleet_management/index.md +++ b/erpnext/docs/user/manual/en/fleet_management/index.md @@ -19,15 +19,15 @@ ERPNext > Vehicle * Enter License Plate,Make,Model,Odometer Value,Fuel Type and Fuel UOM for a quick entry. - Vehicle + Vehicle * Enter details like Insurance,Chassis,Vehicle Value,Location and Employee. - Vehicle + Vehicle * Enter Vehicle attributes like color,wheels,doors and last carbon check - Vehicle + Vehicle ### Vehicle Log @@ -39,17 +39,17 @@ ERPNext > Vehicle Log * Enter License Plate,Employee,Date,Odometer reading for a quick entry. - Vehicle Log + Vehicle Log * Enter Refuelling details,Service details if applicable. - Vehicle Log + Vehicle Log ### Make Expense Claim * Click on Make Expense Claim button .This button appears only in case of Submitted Vehicle Logs. - Vehicle Log + Vehicle Log When you click on 'Make Expense Claim', @@ -57,10 +57,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 Log + Vehicle Log ### 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. - Vehicle Log + Vehicle Log diff --git a/erpnext/docs/user/manual/en/healthcare/appointment.md b/erpnext/docs/user/manual/en/healthcare/appointment.md index a5cea36b20..0abcc88b87 100755 --- a/erpnext/docs/user/manual/en/healthcare/appointment.md +++ b/erpnext/docs/user/manual/en/healthcare/appointment.md @@ -6,15 +6,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. -ERPNext Healthcare +ERPNext Healthcare 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. -ERPNext Healthcare +ERPNext Healthcare After Booking, the scheduled time of the Appointment and duration will be updated and seved in the document. -ERPNext Healthcare +ERPNext Healthcare 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/erpnext/docs/user/manual/en/healthcare/consultation.md b/erpnext/docs/user/manual/en/healthcare/consultation.md index a98713bcb5..8418644641 100755 --- a/erpnext/docs/user/manual/en/healthcare/consultation.md +++ b/erpnext/docs/user/manual/en/healthcare/consultation.md @@ -4,13 +4,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. -ERPNext Healthcare +ERPNext Healthcare ### 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 -ERPNext Healthcare +ERPNext Healthcare ### Prescriptions @@ -18,11 +18,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. -ERPNext Healthcare +ERPNext Healthcare ### 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. -ERPNext Healthcare +ERPNext Healthcare {next} diff --git a/erpnext/docs/user/manual/en/healthcare/index.md b/erpnext/docs/user/manual/en/healthcare/index.md index 85e3b6fec8..f13205f33f 100755 --- a/erpnext/docs/user/manual/en/healthcare/index.md +++ b/erpnext/docs/user/manual/en/healthcare/index.md @@ -2,7 +2,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. -ERPNext Healthcare +ERPNext Healthcare 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/erpnext/docs/user/manual/en/healthcare/lab_test.md b/erpnext/docs/user/manual/en/healthcare/lab_test.md index bdf0cfcee3..7592188cf8 100755 --- a/erpnext/docs/user/manual/en/healthcare/lab_test.md +++ b/erpnext/docs/user/manual/en/healthcare/lab_test.md @@ -6,11 +6,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 -ERPNext Healthcare +ERPNext Healthcare You can record the test results in the Lab Test document as the results gets ready. -ERPNext Healthcare +ERPNext Healthcare > 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/erpnext/docs/user/manual/en/healthcare/medical_codes.md b/erpnext/docs/user/manual/en/healthcare/medical_codes.md index c0997b1ebe..16fba05cca 100755 --- a/erpnext/docs/user/manual/en/healthcare/medical_codes.md +++ b/erpnext/docs/user/manual/en/healthcare/medical_codes.md @@ -4,6 +4,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. -ERPNext Healthcare +ERPNext Healthcare {next} diff --git a/erpnext/docs/user/manual/en/healthcare/medical_record.md b/erpnext/docs/user/manual/en/healthcare/medical_record.md index 9d2697d600..f9f7fdc25e 100755 --- a/erpnext/docs/user/manual/en/healthcare/medical_record.md +++ b/erpnext/docs/user/manual/en/healthcare/medical_record.md @@ -3,11 +3,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. -ERPNext Healthcare +ERPNext Healthcare ##### 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 -ERPNext Healthcare +ERPNext Healthcare {next} diff --git a/erpnext/docs/user/manual/en/healthcare/patient.md b/erpnext/docs/user/manual/en/healthcare/patient.md index ed6810e88f..b4765685fd 100755 --- a/erpnext/docs/user/manual/en/healthcare/patient.md +++ b/erpnext/docs/user/manual/en/healthcare/patient.md @@ -3,11 +3,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 -ERPNext Healthcare +ERPNext Healthcare 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. -ERPNext Healthcare +ERPNext Healthcare ### Patient as a Customer @@ -16,7 +16,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. -ERPNext Healthcare +ERPNext Healthcare 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/erpnext/docs/user/manual/en/healthcare/physician.md b/erpnext/docs/user/manual/en/healthcare/physician.md index 7b7995bcd9..da65df739f 100755 --- a/erpnext/docs/user/manual/en/healthcare/physician.md +++ b/erpnext/docs/user/manual/en/healthcare/physician.md @@ -5,12 +5,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. -ERPNext Healthcare +ERPNext Healthcare ### 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. -ERPNext Healthcare +ERPNext Healthcare ### 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/erpnext/docs/user/manual/en/healthcare/physician_schedule.md b/erpnext/docs/user/manual/en/healthcare/physician_schedule.md index 0da7896014..4952cd1fb1 100755 --- a/erpnext/docs/user/manual/en/healthcare/physician_schedule.md +++ b/erpnext/docs/user/manual/en/healthcare/physician_schedule.md @@ -4,10 +4,10 @@ Physician Schedule will help you to configure the availability and work hours of You can create Physician Schedule from - > Healthcare > Masters > Physician Schedule -ERPNext Healthcare +ERPNext Healthcare 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. -ERPNext Healthcare +ERPNext Healthcare {next} diff --git a/erpnext/docs/user/manual/en/healthcare/sample_collection.md b/erpnext/docs/user/manual/en/healthcare/sample_collection.md index 3473dafd10..ea960eae35 100755 --- a/erpnext/docs/user/manual/en/healthcare/sample_collection.md +++ b/erpnext/docs/user/manual/en/healthcare/sample_collection.md @@ -2,7 +2,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 -ERPNext Healthcare +ERPNext Healthcare > 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/erpnext/docs/user/manual/en/healthcare/vital_signs.md b/erpnext/docs/user/manual/en/healthcare/vital_signs.md index 21b25d96d1..8196d25379 100755 --- a/erpnext/docs/user/manual/en/healthcare/vital_signs.md +++ b/erpnext/docs/user/manual/en/healthcare/vital_signs.md @@ -2,11 +2,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 -ERPNext Healthcare +ERPNext Healthcare 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. -ERPNext Healthcare +ERPNext Healthcare 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/erpnext/docs/user/manual/en/hospitality/order-entry.md b/erpnext/docs/user/manual/en/hospitality/order-entry.md index 929cfd8ef7..ff6dea14bd 100644 --- a/erpnext/docs/user/manual/en/hospitality/order-entry.md +++ b/erpnext/docs/user/manual/en/hospitality/order-entry.md @@ -8,7 +8,7 @@ When the guest places an order, the waiter will select the table number and add 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. -Order Entry +Order Entry You can also choose items with the POS style item selector. @@ -16,11 +16,11 @@ You can also choose items with the POS style item selector. 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. -Order Entry +Order Entry ### Sales Invoice To print the invoice, you can click on the Invoice Link and print the invoice -Sales Invoice +Sales Invoice diff --git a/erpnext/docs/user/manual/en/hospitality/reservations.md b/erpnext/docs/user/manual/en/hospitality/reservations.md index 0d4a8abde5..f81f74fe1c 100644 --- a/erpnext/docs/user/manual/en/hospitality/reservations.md +++ b/erpnext/docs/user/manual/en/hospitality/reservations.md @@ -4,10 +4,10 @@ Once you have setup the restaurant and tables, you can start taking in reservati 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. -Reservation +Reservation ### Kanban As your guests walk in, You can also manage the reservations by making a simple Kanban board for the same. -Reservation Kanban Board +Reservation Kanban Board diff --git a/erpnext/docs/user/manual/en/hospitality/restaurant-menu.md b/erpnext/docs/user/manual/en/hospitality/restaurant-menu.md index dfbf4ce971..52585e0516 100644 --- a/erpnext/docs/user/manual/en/hospitality/restaurant-menu.md +++ b/erpnext/docs/user/manual/en/hospitality/restaurant-menu.md @@ -4,4 +4,4 @@ For every restaurant you must set an active Restaurant Menu from which orders ca 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. -Restaurant Menu +Restaurant Menu diff --git a/erpnext/docs/user/manual/en/hospitality/restaurant.md b/erpnext/docs/user/manual/en/hospitality/restaurant.md index 7b72318835..b6c7045ff2 100644 --- a/erpnext/docs/user/manual/en/hospitality/restaurant.md +++ b/erpnext/docs/user/manual/en/hospitality/restaurant.md @@ -6,7 +6,7 @@ You can set a unique numbering prefix for each of your restaurants. All invoices 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. -Restaurant +Restaurant After your restaurant is created, you can add Tables and Menus for that restaurant @@ -14,6 +14,6 @@ After your restaurant is created, you can add Tables and Menus for that restaura You can add a Restaurant Table by creating a new Restaurant Table from the dashboard. -Restaurant Table +Restaurant Table diff --git a/erpnext/docs/user/manual/en/human-resources/appraisal.md b/erpnext/docs/user/manual/en/human-resources/appraisal.md index 6ecb89806c..ce534e545e 100644 --- a/erpnext/docs/user/manual/en/human-resources/appraisal.md +++ b/erpnext/docs/user/manual/en/human-resources/appraisal.md @@ -8,13 +8,13 @@ giving appropriate weightage to each parameter. #### Step 1: Select an Appraisal Template -Appraisal +Appraisal After you select the template, the remaining form appears. #### Step 2: Enter Employee Details -Appraisal +Appraisal Once the Appraisal Template is completed, you can create Appraisal records for each period where you track performance. You can give points out of 5 for each diff --git a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md index a24ca93f02..dae54ba354 100644 --- a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md +++ b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md @@ -12,13 +12,13 @@ Create following Groups and Ledgers in Chart of Accounts if not there. Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation](/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters) -![CoA](/docs/assets/img/articles/Selection_433.png) +![CoA]({{docs_base_url}}/assets/img/articles/Selection_433.png) #### 1.2 Salaries Account Create Group as 'Salaries' under Current Liabilities and create employee salary loan A/C (Ledger) under it. -![CoA](/docs/assets/img/articles/Selection_434.png) +![CoA]({{docs_base_url}}/assets/img/articles/Selection_434.png) #### 1.3 Interest Account @@ -28,7 +28,7 @@ Create Ledger as 'Interest on Loan' under Indirect Income. Once loan amount is finalized, make journal voucher to book loan payment entry. You should Credit Loan amount to Bank/Cash account and Debit Loan amount employee loan account. -![Loan Entry](/docs/assets/img/articles/Selection_435.png) +![Loan Entry]({{docs_base_url}}/assets/img/articles/Selection_435.png) ### 3. Book Loan Recovery and Interest @@ -36,13 +36,13 @@ Once loan amount is finalized, make journal voucher to book loan payment entry. If your employee pays separately for his/her loan installment and loan interest, then create journal voucher. -![Loan Reco](/docs/assets/img/articles/Selection_436.png) +![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_436.png) #### 3.2 Loan Adjustment in Salary And if you deduct loan installment and interest from employees salary, then book journal entry for the same. -![Loan Reco](/docs/assets/img/articles/Selection_437.png) +![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_437.png) In the Salary Slip of an employee, then create two Deduction Types in Salary Structure. One as 'Loan Installment' and other one as 'Loan Interest'. So that you can update those values under this deduction heads. @@ -50,6 +50,6 @@ In the Salary Slip of an employee, then create two Deduction Types in Salary Str After recovering loan and loan interest, General Ledger report will show the loan account details as follows. -![Loan Reco](/docs/assets/img/articles/Selection_439.png) +![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_439.png) diff --git a/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md b/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md index 7fb045c738..715370838a 100644 --- a/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md +++ b/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md @@ -27,7 +27,7 @@ a scenario to understand how leaves impact employees Salary Slip.
  • Create Holiday List (if any), and link it with Employee master.

    • When creating Salary Slip for an Employee, following is what you will see:

    - +

    Working Days: Working Days in Salary Slip are calculated based on number of days selected above. If you don't wish to consider holiday in Working Days, then you should do following setting.
    @@ -46,7 +46,7 @@ Leave Type as "Leave Without Pay".
    As indicated above, if you have LWP checked for components in the earning and deducted table, you will notice a reduction in Amount based on no. of LWP of an Employee for that month.

    -
    +
    \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md b/erpnext/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md index 289a24abb2..8812700727 100644 --- a/erpnext/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md +++ b/erpnext/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md @@ -6,6 +6,6 @@ Working Days are shown in the In the Salary Slip. Based on your preference, it m If you want to include holidays in the count of Total Working days, then ensure that in the HR Settings, field **Include holidays in Total no. of Working Days** is checked and vice versa. -Role Desk Permission +Role Desk Permission 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/erpnext/docs/user/manual/en/human-resources/attendance.md b/erpnext/docs/user/manual/en/human-resources/attendance.md index 1cd5ad3700..1b1a6d9eaf 100644 --- a/erpnext/docs/user/manual/en/human-resources/attendance.md +++ b/erpnext/docs/user/manual/en/human-resources/attendance.md @@ -5,7 +5,7 @@ day can be created manually by: > Human Resources > Documents > Attendance > New Attendance -Attendence +Attendence You can get a monthly report of your Attendance data by going to the “Monthly Attendance Details” report. diff --git a/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md b/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md index 6ae15e0acc..d3ba22a828 100644 --- a/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md +++ b/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md @@ -12,4 +12,4 @@ Go to "Daily Work Summary Settings" via HR module or search bar and set the comp You can also choose to Customize the Message you send to your employees: -Department +Department diff --git a/erpnext/docs/user/manual/en/human-resources/employee-advance.md b/erpnext/docs/user/manual/en/human-resources/employee-advance.md index 621c8d531a..49f22e8c6e 100644 --- a/erpnext/docs/user/manual/en/human-resources/employee-advance.md +++ b/erpnext/docs/user/manual/en/human-resources/employee-advance.md @@ -6,7 +6,7 @@ To make a new Employee Advance, go to: > HR > Employee Advance > New Employee Advance -Expense Claim +Expense Claim Set the Employee ID, date, purpose and requested amount and “Save” the record. @@ -21,12 +21,12 @@ After verification, approver can submit the Employee Advance form or reject the ### 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: -Employee Advance Payment via Journal Entry +Employee Advance Payment via Journal Entry -Employee Advance Payment via Payment Entry +Employee Advance Payment via Payment Entry 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. -Employee Advance Payment via Payment Entry \ No newline at end of file +Employee Advance Payment via Payment Entry \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md b/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md index 28d28b5dc2..b76a2260c7 100644 --- a/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md +++ b/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md @@ -10,7 +10,7 @@ To create a new Loan Type go to: Configure Loan limit and Rate of interest. -Loan Type +Loan Type ### Employee Loan Application @@ -18,7 +18,7 @@ Employee can apply for loan by going to: > Human Resources > Employee Loan Management > Employee Loan Application > New Employee Loan Application -Employee Loan Application +Employee Loan Application #### In the Employee Loan Application, @@ -27,7 +27,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 Application +Employee Loan Application ### Employee Loan @@ -35,7 +35,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 -Employee Loan Application +Employee Loan Application #### In the Employee Loan, @@ -44,13 +44,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. -repayment Schedule +repayment Schedule #### 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. -Salary Slip +Salary Slip \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/employee.md b/erpnext/docs/user/manual/en/human-resources/employee.md index 99cc687828..32e332a804 100644 --- a/erpnext/docs/user/manual/en/human-resources/employee.md +++ b/erpnext/docs/user/manual/en/human-resources/employee.md @@ -6,6 +6,6 @@ To create new Employee go to: > Human Resources > Employee > New -Employee +Employee {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/expense-claim.md b/erpnext/docs/user/manual/en/human-resources/expense-claim.md index 2d7432f639..655935b59a 100644 --- a/erpnext/docs/user/manual/en/human-resources/expense-claim.md +++ b/erpnext/docs/user/manual/en/human-resources/expense-claim.md @@ -6,14 +6,14 @@ To make a new Expense Claim, go to: > HR > Expense Claim > New Expense Claim -Expense Claim +Expense Claim Set the Employee ID, date and the list of expenses that are to be claimed and “Submit” the record. ### Set Account for Employee Set employee's expense account on the employee form, system books an expense amount of an employee under this account. -Expense Claim +Expense Claim ### Approving Expenses @@ -27,16 +27,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 -Expense Claim +Expense Claim User can view unpaid expense claim using report "Unclaimed Expense Claims" -Expense Claim +Expense Claim ### Payment for Expense Claim To make payment against the expense claim, user has to click on Make > Bank Entry #### Expense Claim -Expense Claim +Expense Claim #### Payment Entry Expense Claim @@ -55,6 +55,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 -Expense Claim - Project Link +Expense Claim - Project Link {next} diff --git a/erpnext/docs/user/manual/en/human-resources/fleet-management.md b/erpnext/docs/user/manual/en/human-resources/fleet-management.md index d7c4564481..9e79d0453c 100644 --- a/erpnext/docs/user/manual/en/human-resources/fleet-management.md +++ b/erpnext/docs/user/manual/en/human-resources/fleet-management.md @@ -19,15 +19,15 @@ Human Resources > Fleet Management > Vehicle * Enter License Plate, Make, Model, Odometer Value, Fuel Type and Fuel UOM for a quick entry. - Vehicle + Vehicle * Enter details like Insurance, Chassis, Vehicle Value, Location and Employee. - Vehicle + Vehicle * Enter Vehicle attributes like color, wheels, doors and last carbon check - Vehicle + Vehicle ### Vehicle Log @@ -39,17 +39,17 @@ Human Resources > Fleet Management > Vehicle Log * Enter License Plate, Employee, Date, Odometer reading for a quick entry. - Vehicle Log + Vehicle Log * Enter Refueling details, Service details if applicable. - Vehicle Log + Vehicle Log ### Make Expense Claim * Click on Make Expense Claim button. This button appears only in case of Submitted Vehicle Logs. - Vehicle Log + Vehicle Log When you click on 'Make Expense Claim', @@ -57,10 +57,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 Log + Vehicle Log ### 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. - Vehicle Log + Vehicle Log diff --git a/erpnext/docs/user/manual/en/human-resources/holiday-list.md b/erpnext/docs/user/manual/en/human-resources/holiday-list.md index a015ebc1e7..c1e76f1924 100644 --- a/erpnext/docs/user/manual/en/human-resources/holiday-list.md +++ b/erpnext/docs/user/manual/en/human-resources/holiday-list.md @@ -14,22 +14,22 @@ Click on New to add new Holiday List. Give a name to Holiday List. It can be based in Fiscal Year or location or department as application. Also select From and To Date for the Holiday List. -Holiday List +Holiday List You can quickly add Weekly Off in the Holiday List as following. -Holiday List +Holiday List After that, you can also add specific days (like festival holidays) manually. -Holiday List +Holiday List ### Holiday List in Employee If you have created multiple Holiday List, then select specific Holiday List for an Employee in the respective master. -Holiday List +Holiday List 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/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md index 406dbdaca8..248a49a33a 100644 --- a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md +++ b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md @@ -4,37 +4,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. -Employee Leave Balance +Employee Leave Balance ### Employee Birthday Employee Birthday Report shows Birthdays of your employees. -Employee Birthday +Employee Birthday ### Employee Information Employee Information Report shows Report View of important information recorded in Employee master. -Employee Information +Employee Information ### Employee Holiday Attendance Employee Holiday Attendance shows the list of Employees who attended on Holidays. -Employee Information +Employee Information ### Monthly Salary Register Monthly Salary Register shows net pay and its components of employee(s) at a glance. -Monthly Salary Register +Monthly Salary Register ### Monthly Attendance Sheet Monthly Attendance Sheet shows monthly attendance of selected employee at a glance. -Monthly Attendance Sheet +Monthly Attendance Sheet {next} diff --git a/erpnext/docs/user/manual/en/human-resources/job-applicant.md b/erpnext/docs/user/manual/en/human-resources/job-applicant.md index d13cf19f46..105bfddae3 100644 --- a/erpnext/docs/user/manual/en/human-resources/job-applicant.md +++ b/erpnext/docs/user/manual/en/human-resources/job-applicant.md @@ -6,7 +6,7 @@ To create a new Job Applicant go to > Human Resource > Job Applicant > New -Job Applicant +Job Applicant ### Linking with an Email Account @@ -22,6 +22,6 @@ system shall create a New Job Applicant against each email received on the mailb * In 'Append To' select 'Job Applicant' -Email Account +Email Account {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/job-opening.md b/erpnext/docs/user/manual/en/human-resources/job-opening.md index e198cafc1c..cb58858442 100644 --- a/erpnext/docs/user/manual/en/human-resources/job-opening.md +++ b/erpnext/docs/user/manual/en/human-resources/job-opening.md @@ -6,7 +6,7 @@ To create a new Job Opening go to > Human Resource > Job Opening > New -Job Opening +Job Opening {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/leave-application.md b/erpnext/docs/user/manual/en/human-resources/leave-application.md index 438dbba428..b9855ab1c5 100644 --- a/erpnext/docs/user/manual/en/human-resources/leave-application.md +++ b/erpnext/docs/user/manual/en/human-resources/leave-application.md @@ -7,7 +7,7 @@ Type and the period for which the leave is taken. > Human Resources > Leave Application > New Leave Application -Leave Application +Leave Application ###Setting Leave Approver @@ -15,7 +15,7 @@ Type and the period for which the leave is taken. * You need to mention a list of Leave Approvers against an Employee in the Employee Master. -Leave Approver +Leave Approver > Tip : If you want all users to create their own Leave Applications, you can set their “Employee ID” as a match rule in the Leave Application Permission diff --git a/erpnext/docs/user/manual/en/human-resources/leave.md b/erpnext/docs/user/manual/en/human-resources/leave.md index 4fa3a57273..5b32a2b34d 100644 --- a/erpnext/docs/user/manual/en/human-resources/leave.md +++ b/erpnext/docs/user/manual/en/human-resources/leave.md @@ -12,7 +12,7 @@ Leave Type refers to types of leave allotted to an employee by a company. An emp requirement. New Leave Type + 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. @@ -45,7 +45,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. Manual Leave Allocation + src="{{docs_base_url}}/assets/img/human-resources/manual-leave-allocation.png"> ###Via Leave Allocation Tool > Human Resources > Tools > Leave Allocation Tool @@ -53,7 +53,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. Leave Allocation Tool + src="{{docs_base_url}}/assets/img/human-resources/leave-allocation-tool.png"> --- @@ -71,7 +71,7 @@ Leave Application section enables an employee to apply for leaves. Employee can - Employee gets notification on the status of his/her Leave Application Leave Allocation Tool + src="{{docs_base_url}}/assets/img/human-resources/new-leave-application.png"> **Notes:** @@ -89,4 +89,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. Leave Allocation Tool \ 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/erpnext/docs/user/manual/en/human-resources/offer-letter.md b/erpnext/docs/user/manual/en/human-resources/offer-letter.md index 1df1a38c54..734f19334a 100644 --- a/erpnext/docs/user/manual/en/human-resources/offer-letter.md +++ b/erpnext/docs/user/manual/en/human-resources/offer-letter.md @@ -7,12 +7,12 @@ In ERPNext you can make a record of the Offer Letters that you can given to cand > Human Resource > Offer Letter > New -Offer Letter +Offer Letter > Note: An offer letter can be made only against a [Job Applicant](/docs/user/manual/en/human-resources/job-applicant.html) There is a pre-designed print format to print you offer letter. -Offer Letter +Offer Letter {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md index 1f078ff863..eff40efbf2 100644 --- a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md +++ b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md @@ -46,7 +46,7 @@ To create a new Salary Structure go to: #### Figure 1.1:Salary Structure -Salary Structure +Salary Structure ### In the Salary Structure, @@ -55,7 +55,7 @@ To create a new Salary Structure go to: #### Figure 1.2:Salary Structure for Salary Slip based on Timesheet -Salary Structure +Salary Structure ### Salary Slip Based on Timesheet @@ -72,20 +72,20 @@ In the “Earnings” and “Deductions” tables, you can calculate the values #### Figure 1.3:Condition and Formula -Salary Structure +Salary Structure * Condition and Amount #### Figure 1.4:Condition and Amount -Salary Structure +Salary Structure * Only Formula * Only Amount #### Figure 1.5:Account Details -Salary Structure +Salary Structure * Select Mode of Payment and Payment Account for the Salary Slips which will be generated using this Salary Structure @@ -123,6 +123,52 @@ To create a new Salary Slip go to: #### Figure 2: Salary Slip -Salary Slip +Salary Slip + + +You can also create salary slip for multiple employees using Process Payroll: + +> Human Resources > Process Payroll + +#### Figure 3: Process Payroll + +Process Payroll + +In Process Payroll, + + 1. Select the Company for which you want to create the Salary Slips. + 2. Check "Salary Slip based on Timesheet" if you want to process timesheet based Salary Slips. + 3. Select the From Date and To Date or Fiscal year and month for which you want to create the Salary Slips. + 3. Select the Payment Account. + 3. Click on “Create Salary Slips”. This will create Salary Slip records for each active Employee for the time period selected. If the Salary Slips are created, the system will not create any more Salary Slips. All updates will be shown in the “Activity Log” section. + 4. Once all Salary Slips are created, you can check if they are created correctly or edit it if you want to deduct Leave Without Pay (LWP). + 5. After checking, you can “Submit” them all together by clicking on “Submit Salary Slips”. 1. If you want them to be automatically emailed to the Employee, make sure to check the “Send Email” box. + +### 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 Process Payroll, click on +“Make Bank Entry”. It will ask to enter the Bank Transaction Reference Number and date. +Click on "Make" and a new Journal Entry with the total salary components will be +created. + +#### Figure 3.1: Make Bank Entry + +Process Payroll + + {next} diff --git a/erpnext/docs/user/manual/en/human-resources/setup/branch.md b/erpnext/docs/user/manual/en/human-resources/setup/branch.md index 75c0c43082..33135e8c3c 100644 --- a/erpnext/docs/user/manual/en/human-resources/setup/branch.md +++ b/erpnext/docs/user/manual/en/human-resources/setup/branch.md @@ -2,6 +2,6 @@ Branches of your organization -Branch +Branch {next} diff --git a/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md index 39e7e2a32e..032d249184 100644 --- a/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md +++ b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md @@ -6,7 +6,7 @@ To create a new Deduction Type > Human Resource > Setup > Deduction Type > New -Deduction Type +Deduction Type {next} diff --git a/erpnext/docs/user/manual/en/human-resources/setup/department.md b/erpnext/docs/user/manual/en/human-resources/setup/department.md index 9eb4245175..78567dc2e6 100644 --- a/erpnext/docs/user/manual/en/human-resources/setup/department.md +++ b/erpnext/docs/user/manual/en/human-resources/setup/department.md @@ -2,6 +2,6 @@ Departments in your organization -Department +Department {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/setup/designation.md b/erpnext/docs/user/manual/en/human-resources/setup/designation.md index 5ac771f8ff..c88e085133 100644 --- a/erpnext/docs/user/manual/en/human-resources/setup/designation.md +++ b/erpnext/docs/user/manual/en/human-resources/setup/designation.md @@ -2,6 +2,6 @@ Designations in your organization -Designation +Designation {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md index 17586631e9..4e9f685259 100644 --- a/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md +++ b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md @@ -6,7 +6,7 @@ To create a new Earning Type > Human Resource > Setup > Earning Type > New -Earning Type +Earning Type {next} diff --git a/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md index de07ac9fc8..c3843b9539 100644 --- a/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md +++ b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md @@ -2,6 +2,6 @@ Various employment contracts you have with your employees. -Employment Type +Employment Type {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md index a12bcdbd8f..1741df4a5f 100644 --- a/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md +++ b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md @@ -2,6 +2,6 @@ GLobal settings for HR related documents -HR Settings +HR Settings {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md b/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md index dfc350e17a..e17dddd8c2 100644 --- a/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md +++ b/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md @@ -6,6 +6,6 @@ To go the attendance tool, go to: This tool allows you to add attendance records for multiple employees quickly. -Attendence upload +Attendence upload {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md b/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md index 7a45002fa6..4b67c11eaa 100644 --- a/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md +++ b/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md @@ -6,6 +6,6 @@ To upload the attendance go to: > Human Resources > Upload Attendance -Attendence upload +Attendence upload {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/training.md b/erpnext/docs/user/manual/en/human-resources/training.md index 4d39bf1a69..0c193c7e63 100644 --- a/erpnext/docs/user/manual/en/human-resources/training.md +++ b/erpnext/docs/user/manual/en/human-resources/training.md @@ -3,13 +3,13 @@ Create Training Program and schedule Training Events under it. It has a dashboard linked to Training Event to view which event is under the Training Program. -Employee +Employee ### Training Event Schedule seminars, workshops, conferences etc using Training Event linked to a Training Program. You can also invite your employees to attend the event using this feature. -Employee +Employee ### Inviting Employees for Event @@ -17,7 +17,7 @@ You can invite your employees to attend the event. You can do so by selecting th By default the status of the employee will be 'Open'. -Employee +Employee When you submit the Training Event, a notification will be sent to the employee notifying that the Training has been scheduled. This is sent via Email Alert "Training Scheduled". You can modify this Email Alert to customize the message. @@ -25,7 +25,7 @@ When you submit the Training Event, a notification will be sent to the employee After completion of the training Employee-wise training results can be stored based on the Feedback received from the Trainer. -Employee +Employee When the Training Result is submitted, all the employees will receive an email notifying them that they must share their feedback via "Training Feedback". This is also managed via an Email Alert, so you can customize this alert too. @@ -33,4 +33,4 @@ When the Training Result is submitted, all the employees will receive an email n Employees can then share their feedback via Training Feedback. -Employee +Employee diff --git a/erpnext/docs/user/manual/en/introduction/key-workflows.md b/erpnext/docs/user/manual/en/introduction/key-workflows.md index 91960143e2..85a1a15b33 100644 --- a/erpnext/docs/user/manual/en/introduction/key-workflows.md +++ b/erpnext/docs/user/manual/en/introduction/key-workflows.md @@ -6,7 +6,7 @@ functions. This diagram does not cover all the features of ERPNext. ![](/docs/assets/old_images/erpnext/overview.png) -Workflow +Workflow _Note: Not all of the steps are mandatory. ERPNext allows you to freely skip steps if you want to simplify the process._ diff --git a/erpnext/docs/user/manual/en/introduction/the-champion.md b/erpnext/docs/user/manual/en/introduction/the-champion.md index fca349e5f3..589c33849c 100644 --- a/erpnext/docs/user/manual/en/introduction/the-champion.md +++ b/erpnext/docs/user/manual/en/introduction/the-champion.md @@ -1,6 +1,6 @@ # The Champion -Champion +Champion We have seen dozens of ERP implementations over the past few years and we realize that successful implementation is a lot about intangibles and diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md b/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md index 4dd10b3eb7..e1c1c42bc6 100644 --- a/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md +++ b/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md @@ -2,7 +2,7 @@ Capacity Planning functionality helps you in tracking production jobs allocated on each Workstation. -Role Desk Permission +Role Desk Permission Follow are the steps to use Capacity Planning Feature in your ERPNext account. @@ -32,7 +32,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. -Role Desk Permission +Role Desk Permission **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. @@ -45,7 +45,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. -Role Desk Permission +Role Desk Permission If you want to complete disable Capacity Planning feature, in the Manufacturing Settings, check field "Disable Capacity Planning and Time Tracking". diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md index 453528e079..3f507afd35 100644 --- a/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md +++ b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md @@ -8,7 +8,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. -Nested BOM +Nested BOM Following is how the structure of nested BOM will look: diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md index 5b5ac00fb3..c09a727e85 100644 --- a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md +++ b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md @@ -4,7 +4,7 @@ **Answer:** There are 3 available options in the Valuation Based On field: -Nested BOM +Nested BOM **Valuation Rate:** Item valuation rate is defined based on it's purchase or manufacture value. diff --git a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md index 112efab7ea..11a7cac7bf 100644 --- a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md +++ b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md @@ -10,11 +10,11 @@ To make a new BOM: > Manufacturing > Bill of Materials > New BOM -Task +Task * To add Operations select 'With Operation'. The Operations table shall appear. -Task +Task * Select the Item for which you want to make the BOM. * Add the operations that you have to go through to make that particular Item in the “Operations” table. For each operation, you will be asked to enter a Workstation. You must create new Workstations as and when necessary. @@ -27,22 +27,22 @@ To make a new BOM: * Add the list of Items you require for each operation, with its quantity. This Item could be a purchased Item or a sub-assembly with its own BOM. If the row Item is a manufactured Item and has multiple BOMs, select the appropriate BOM. You can also define if a part of the Item goes into scrap. -Costing +Costing * This cost can be updated on by using the 'Update Cost' button. -Update Cost +Update Cost * User can select the currency in the BOM * System calculates the costing based on the price list currency -Update Cost +Update Cost ### 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. -Exploded Section +Exploded Section {next} diff --git a/erpnext/docs/user/manual/en/manufacturing/introduction.md b/erpnext/docs/user/manual/en/manufacturing/introduction.md index b7f0a991b8..2a947b28b2 100644 --- a/erpnext/docs/user/manual/en/manufacturing/introduction.md +++ b/erpnext/docs/user/manual/en/manufacturing/introduction.md @@ -1,6 +1,6 @@ # Introduction -Task +Task ### Types of Production Planning diff --git a/erpnext/docs/user/manual/en/manufacturing/operation.md b/erpnext/docs/user/manual/en/manufacturing/operation.md index 8d495f199b..75066aa606 100644 --- a/erpnext/docs/user/manual/en/manufacturing/operation.md +++ b/erpnext/docs/user/manual/en/manufacturing/operation.md @@ -8,6 +8,6 @@ You can also create a Operation by: > Manufacturing > Documents > Operation > New -Operation +Operation {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md index 430ef8a172..4ceb4fc480 100644 --- a/erpnext/docs/user/manual/en/manufacturing/production-order.md +++ b/erpnext/docs/user/manual/en/manufacturing/production-order.md @@ -1,6 +1,6 @@ # Production Order -Production Order +Production Order 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 @@ -13,7 +13,7 @@ by: > Manufacturing > Documents > Production Order > New -Production Order +Production Order ### Creating Production Orders @@ -35,11 +35,11 @@ by: * By default the system fetchs workstation and duration for Production Order Operations from the selected BOM. -PO Opeartions +PO Opeartions * If you wish to reassign the workstation for a particular opeeration in the Production Order, you can do so before submitting the Production Order. -PO reassigning Operations +PO reassigning Operations * Select the respective operation, and change its workstation. * You can also change the Operating Time for that operation @@ -56,19 +56,19 @@ by: * Click on 'Start'. -Transfer Materials +Transfer Materials * Mention the quantity of materials to be transfered. -Material Transfer Qty +Material Transfer Qty * Submit the Stock Entry -Stock Entry for PO +Stock Entry for PO * Material Transfered for Manufacturing will be updated in the Production Order based on the Stock Entry. -Stock Entry for PO +Stock Entry for PO #### Material Transfer through Stock Entry Use cases for this option are: @@ -84,7 +84,7 @@ If this is the case, you can select the Skip Material Transfer check box, which * Drafts of Timesheet are created based on the scheduled operations when an Production Order is Submitted. * To create more Timesheets against an operation click 'Make Timesheet' button. -Make timesheet against PO +Make timesheet against PO ###Updating Finished Goods @@ -92,11 +92,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'. -Update Finished Goods +Update Finished Goods * Mention the quantity of materials to be transfered. -Update Finished Goods Qty +Update Finished Goods Qty > Tip : You can also partially complete a Production Order by updating the Finished Goods stock creating a Stock Entry. @@ -111,7 +111,7 @@ If this is the case, you can select the Skip Material Transfer check box, which 4. Update Finished Goods: 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. 5. To check all Time Logs made against the Production Order click on 'Show Time Logs' -PO - stop +PO - stop * You can also re-start a stopped Production Order. diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md index 7e65ba2d9d..0908c37c2d 100644 --- a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md +++ b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md @@ -4,7 +4,7 @@ Manufacturing Settings can be found at: `Manufacturing > Setup > Manufacturing Settings` -Manufacturing Settings +Manufacturing Settings ####Disable Capacity Planning and Time Tracking @@ -16,7 +16,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). -Manufacturing Settings +Manufacturing Settings 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. @@ -24,7 +24,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. -Manufacturing Settings +Manufacturing Settings ####Over Production Allowance Percentage @@ -34,7 +34,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". -Manufacturing Settings +Manufacturing Settings ####Capacity Planning For (Days) diff --git a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md index 5abf0c6bbb..cfef2a5f1e 100644 --- a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md +++ b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md @@ -17,7 +17,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”. -Sub-Contracting +Sub-Contracting __Step 1:__ Make a Bill of Materials for the processed Item, with the unprocessed @@ -25,24 +25,24 @@ Items as sub-items. For example, If you are manufacturing a pen, the processed pen will be named under Bill of Materials(BOM), whereas, the refill, knob, and other items which go into the making of pen, will be categorized as sub-items. -Sub-Contracting +Sub-Contracting __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. -Sub-Contracting +Sub-Contracting Once the PO is submitted, you can view the reserved quantity of the item from the item dashboard as well. -Sub-Contracting +Sub-Contracting __Step 3:__ Make a Stock Entry to deliver the raw material Items to your Supplier. -Sub-Contracting +Sub-Contracting __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. -Sub-Contracting +Sub-Contracting > Note 1: Make sure that the “Rate” of processed Item is the processing rate (excluding the raw material rate). diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md index e9ba2a570f..9f253d6384 100644 --- a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md +++ b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md @@ -13,7 +13,7 @@ To use the Production Planning Tool, go to: > Manufacturing > Tools > Production Planning Tool -Production Planing Tool +Production Planing Tool #### Step 1: Specify source to get Production Items @@ -27,7 +27,7 @@ To use the Production Planning Tool, go to: * Use filters to get the Sales Order / Material Request * Click on Get Sales Order / Get Material Requests to generate a list. -Production Planing Tool +Production Planing Tool @@ -36,11 +36,11 @@ To use the Production Planning Tool, go to: * Get the items for the Sales Order / Material request list * You can add/remove or change quantity of these Items. -Production Planing Tool +Production Planing Tool #### Step 4: Create Production Orders -Production Planing Tool +Production Planing Tool @@ -48,7 +48,7 @@ To use the Production Planning Tool, go to: Create Material Request for Items with projected shortfall. -Production Planing Tool +Production Planing Tool diff --git a/erpnext/docs/user/manual/en/manufacturing/workstation.md b/erpnext/docs/user/manual/en/manufacturing/workstation.md index 5670893d91..80654f43e3 100644 --- a/erpnext/docs/user/manual/en/manufacturing/workstation.md +++ b/erpnext/docs/user/manual/en/manufacturing/workstation.md @@ -10,7 +10,7 @@ You can also create a Workstation by: > Manufacturing > Documents > Workstation > New -Workstation +Workstation In workstation specify the workstation working hours under the 'working hour' section. You can also specify the working hours based on shifts. diff --git a/erpnext/docs/user/manual/en/non_profit/Chapter/chapter.md b/erpnext/docs/user/manual/en/non_profit/Chapter/chapter.md index 0078f6c2fa..6587ca2dd4 100644 --- a/erpnext/docs/user/manual/en/non_profit/Chapter/chapter.md +++ b/erpnext/docs/user/manual/en/non_profit/Chapter/chapter.md @@ -8,7 +8,7 @@ To Create Chapter: > Non Profit > Chapter > New -Chapter +Chapter System User or Chapter Head can add chapter Member directly from the desk or User can join directly by visiting chapter page on website @@ -17,9 +17,9 @@ to join chapter online > My Account on website > Chapter from sidebar > Select Available chapter and click on join chapter button -online Chapter +online Chapter -online Chapter +online Chapter To leave chapter click on leave chapter button diff --git a/erpnext/docs/user/manual/en/non_profit/Donor/donor.md b/erpnext/docs/user/manual/en/non_profit/Donor/donor.md index 7958755d14..7da48398f4 100644 --- a/erpnext/docs/user/manual/en/non_profit/Donor/donor.md +++ b/erpnext/docs/user/manual/en/non_profit/Donor/donor.md @@ -8,7 +8,7 @@ To create new Donor go to: > Non Profit > Donor > New -Student +Student **Email:** Email field is the id of Member doctype. diff --git a/erpnext/docs/user/manual/en/non_profit/Donor/donor_type.md b/erpnext/docs/user/manual/en/non_profit/Donor/donor_type.md index ba74c17573..4c643b437d 100644 --- a/erpnext/docs/user/manual/en/non_profit/Donor/donor_type.md +++ b/erpnext/docs/user/manual/en/non_profit/Donor/donor_type.md @@ -10,7 +10,7 @@ To create new donor Type go to: > Non Profit > Donor Type > New -donor type +donor type **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 diff --git a/erpnext/docs/user/manual/en/non_profit/Grant Application/grant_application.md b/erpnext/docs/user/manual/en/non_profit/Grant Application/grant_application.md index 3b07d3517a..268f26aaee 100644 --- a/erpnext/docs/user/manual/en/non_profit/Grant Application/grant_application.md +++ b/erpnext/docs/user/manual/en/non_profit/Grant Application/grant_application.md @@ -7,11 +7,11 @@ To Generate Online Grant Application go to: > My Account on website > Grant Application from sidebar > Apply for new Grant Application. -Online Grant Application row +Online Grant Application row -Online Grant Application +Online Grant Application -Online Grant Application +Online Grant Application To Generate Grant Application go to: @@ -19,7 +19,7 @@ To Generate Grant Application go to: > Non Profit > Grant Application > New. -Grant Application +Grant Application **Email:** Email is a mandatory field. diff --git a/erpnext/docs/user/manual/en/non_profit/Membership/member.md b/erpnext/docs/user/manual/en/non_profit/Membership/member.md index c9dc9c6ee8..2467f149bd 100644 --- a/erpnext/docs/user/manual/en/non_profit/Membership/member.md +++ b/erpnext/docs/user/manual/en/non_profit/Membership/member.md @@ -8,7 +8,7 @@ To create new Member go to: > Non Profit > Member > New -Student +Student **Email:** Email field is the id of Member doctype. diff --git a/erpnext/docs/user/manual/en/non_profit/Membership/membership.md b/erpnext/docs/user/manual/en/non_profit/Membership/membership.md index f101b86fad..d871cc5d85 100644 --- a/erpnext/docs/user/manual/en/non_profit/Membership/membership.md +++ b/erpnext/docs/user/manual/en/non_profit/Membership/membership.md @@ -9,7 +9,7 @@ To create new Membership go to: > Non Profit > Membership > New -Membership +Membership **Member:** Member is a link field fetch member details from Member doctype. diff --git a/erpnext/docs/user/manual/en/non_profit/Membership/membership_type.md b/erpnext/docs/user/manual/en/non_profit/Membership/membership_type.md index eb7a09eec5..0e03bb45c9 100644 --- a/erpnext/docs/user/manual/en/non_profit/Membership/membership_type.md +++ b/erpnext/docs/user/manual/en/non_profit/Membership/membership_type.md @@ -9,7 +9,7 @@ To create new Membership Type go to: > Non Profit > Membership Type > New -Student +Student **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 diff --git a/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer.md b/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer.md index 6b875eed67..01b2b5176b 100644 --- a/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer.md +++ b/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer.md @@ -8,7 +8,7 @@ To create new Volunteer go to: > Non Profit > Volunteer > New -Volunteer +Volunteer **Email:** Email field is the id of Member doctype. diff --git a/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md b/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md index 95b4c81d2f..dcf2608253 100644 --- a/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md +++ b/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md @@ -8,7 +8,7 @@ To create new volunteer Type go to: > Non Profit > Volunteer Type > New -Volunteer +Volunteer **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 diff --git a/erpnext/docs/user/manual/en/non_profit/index.md b/erpnext/docs/user/manual/en/non_profit/index.md index 546581f320..7d56f4d6cc 100644 --- a/erpnext/docs/user/manual/en/non_profit/index.md +++ b/erpnext/docs/user/manual/en/non_profit/index.md @@ -13,11 +13,11 @@ Donor Management, Event and Grant etc
    Non Profit Domain + src="{{docs_base_url}}/assets/img/non_profit/non_profit_domain.png">
    ### Non Profit Domain -Non Profit +Non Profit {index} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/projects/activity-cost.md b/erpnext/docs/user/manual/en/projects/activity-cost.md index 88d4f0a5da..565686f9ba 100644 --- a/erpnext/docs/user/manual/en/projects/activity-cost.md +++ b/erpnext/docs/user/manual/en/projects/activity-cost.md @@ -3,4 +3,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. -Activity Cost +Activity Cost diff --git a/erpnext/docs/user/manual/en/projects/activity-type.md b/erpnext/docs/user/manual/en/projects/activity-type.md index 4e968a6b57..54b455e814 100644 --- a/erpnext/docs/user/manual/en/projects/activity-type.md +++ b/erpnext/docs/user/manual/en/projects/activity-type.md @@ -2,7 +2,7 @@ Activity Type makes a list of the different types of activities against which a Time Log can be made. -Activity Type +Activity Type By default the following Activity Types are created. diff --git a/erpnext/docs/user/manual/en/projects/articles/project-costing.md b/erpnext/docs/user/manual/en/projects/articles/project-costing.md index 2943ea6717..f83608ab98 100644 --- a/erpnext/docs/user/manual/en/projects/articles/project-costing.md +++ b/erpnext/docs/user/manual/en/projects/articles/project-costing.md @@ -12,17 +12,17 @@ Activity Type is a master of service offered by your personnel. You can add new Activity Cost is a master where you can track billing and costing rate for each Employee, and for each Activity Type. -Activity Cost +Activity Cost #### Time Log Based on Actual Time spent on the Project-Task, Employee will create a time log. -Time Log +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. -[Time Log Costing +[Time Log Costing Multiplying these rates with total no. of Hours in the Time Log gives Costing Amount and Billing Amount for the specific Time Log. @@ -30,10 +30,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. -Costing in Task +Costing in Task Same way, Project master will have cost updated based on Time Log created against that Projects, and tasks associated with that Project. -Costing in Project +Costing in Project \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/projects/project.md b/erpnext/docs/user/manual/en/projects/project.md index e1e936b7f3..25f28d5878 100644 --- a/erpnext/docs/user/manual/en/projects/project.md +++ b/erpnext/docs/user/manual/en/projects/project.md @@ -2,7 +2,7 @@ Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it. -Project +Project You can also track % Completion of a Project using different methods. @@ -10,34 +10,34 @@ You can also track % Completion of a Project using different methods. 2. Task Progress 3. Task Weight -Project +Project Some examples of how the % Completion is calculated based on Tasks. -Project +Project -Project +Project ### 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) -Project +Project * To view Task made against a Project click on 'Tasks' -Project - View Task +Project - View Task -Project - Task List +Project - Task List * You can also view the Tasks from the Project document itself -Project - Task Grid +Project - Task Grid * To add Weights to Tasks you can follow the below steps -Project - Task Grid -Project - Task Grid +Project - Task Grid +Project - Task Grid ### Managing time @@ -48,13 +48,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' -Project - View Time Log +Project - View Time Log -Project - Time Log List +Project - Time Log List * You can also create a Time Log directlly and link it to the Project. -Project - Link Time Log +Project - Link Time Log ### Managing expenses @@ -63,27 +63,27 @@ The system shall update the total amount from expense claims in the project cost * To view Expense Claims made against a Project click on 'Expense Claims' -Project - View Expense Claim +Project - View Expense Claim * You can also create a Expense Claims directlly and link it to the Project. -Project - Link Expense Claim +Project - Link Expense Claim * Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section -Project - Total Expense Claim +Project - Total Expense Claim ### Cost Center You can make a [Cost Center](/docs/user/manual/en/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project. -Project - Cost Center +Project - Cost Center ###Project Costing The Project Costing section helps you track the time, expenses and purchases incurred against the project. -Project - Costing +Project - Costing * The Total Cost is composed of the costing amount from timesheets, the total cost from expense claims and the total cost from purchase invoices created against this project. @@ -93,7 +93,7 @@ The Project Costing section helps you track the time, expenses and purchases inc You can make/link a [Sales Order](/docs/user/manual/en/selling/sales-order.html) against a project. Once linked you can use the standard sales module to bill your customer against the Project. -Project - Sales Order +Project - Sales Order ###Gantt Chart @@ -102,8 +102,8 @@ ERPNext gives you a illustrated view of tasks scheduled against that project in * To view gantt chart against a project, go to that project and click on 'Gantt Chart' -Project - View Gantt Chart +Project - View Gantt Chart -Project - Gantt Chart +Project - Gantt Chart {next} diff --git a/erpnext/docs/user/manual/en/projects/tasks.md b/erpnext/docs/user/manual/en/projects/tasks.md index 9447a2ed48..cae54f4194 100644 --- a/erpnext/docs/user/manual/en/projects/tasks.md +++ b/erpnext/docs/user/manual/en/projects/tasks.md @@ -3,13 +3,13 @@ Project is divided into Tasks. In ERPNext, you can also create a Task independently. -Task +Task ### Status of the Task A Task can have one of the following statuses - Open, Working, Pending Review, Closed, or Cancelled. -Task - Status +Task - Status * By default each new Task created has the status set to 'Open'. @@ -19,7 +19,7 @@ A Task can have one of the following statuses - Open, Working, Pending Review, C You can specify a list of dependent tasks under the 'Depends On' section. -Depends On +Depends On * You cannot close the parent task until all dependent tasks are closed. @@ -33,13 +33,13 @@ The Actual Start and End Time along with the costing is updated based on the Tim * To view Time Log made against a Task click on 'Time Logs' -Task - View Time Log +Task - View Time Log -Task - Time Log List +Task - Time Log List * You can also create a Time Log directly and link it to the Task. -Task - Link Time Log +Task - Link Time Log ### Managing Expenses @@ -48,14 +48,14 @@ The system shall update the total amount from expense claims in the costing sect * To view Expense Claims made against a Task click on 'Expense Claims' -Task - View Expense Claim +Task - View Expense Claim * You can also create a Expense Claims directly and link it to the Task. -Task - Link Expense Claim +Task - Link Expense Claim * Total amount of Expense Claims booked against a task is shown under 'Total Expense Claim' in the Task Costing Section -Task - Total Expense Claim +Task - Total Expense Claim {next} diff --git a/erpnext/docs/user/manual/en/projects/time-log-batch.md b/erpnext/docs/user/manual/en/projects/time-log-batch.md index b307f6a147..6904f4ed86 100644 --- a/erpnext/docs/user/manual/en/projects/time-log-batch.md +++ b/erpnext/docs/user/manual/en/projects/time-log-batch.md @@ -8,17 +8,17 @@ OR Just open your Time Log list and check the Items to you want to add to the Time Log. Then click on "Make Time Sheet" button and these Time Logs will be selected. -Time Log - Drag Calender +Time Log - Drag Calender ###Making Sales Invoice * After submitting the Time Sheet, "Make Invoice" button shall appear. -Time Log - Drag Calender +Time Log - Drag Calender * Click on that button to raise a Sales Invoice against the Time Sheet. -Time Log - Drag Calender +Time Log - Drag Calender * When you "Submit" the Sales Invoice, the Sales Invoice number will get updated in the Time Logs and Time Sheet and their status will change to "Billed". diff --git a/erpnext/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md b/erpnext/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md index 35d99aa5f2..32faf039ae 100644 --- a/erpnext/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md +++ b/erpnext/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md @@ -6,7 +6,7 @@ If salary / wages for your employees are calculated based on number of hours wor To track actual hours employee has worked for, create Timesheet for each Employee. We suggest you to create Timesheet based on a payment period. For example, if you paying employee on a weekly bases, create one Timesheet for an Employee for one week. However, you can create multiple Timesheets, and create one Salary Slip for the multiple Timesheets. -Sales Invoice +Sales Invoice ####Salary Structure for the Employee @@ -16,17 +16,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. -Sales Invoice +Sales Invoice ####Create Salary Slip from Timesheet To create Salary Slip against Timesheet, open Timesheet and click on "Salary Slip". -Sales Invoice +Sales Invoice 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. -Sales Invoice +Sales Invoice 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. @@ -34,7 +34,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". -Sales Invoice +Sales Invoice
    diff --git a/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md b/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md index 4dbdcbb6dc..89c6b63ccf 100644 --- a/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md +++ b/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md @@ -14,7 +14,7 @@ To create new Timesheet, go to: In the Employee field, only ones having ative Salary Structure will be selectable. Further in the Salary Structure , is created for the E on the actual hours worked, Employee can create Timesheet. To be able to create Sales Invoice against this Timesheet, ensure `Billable` field is checked. -Sales Invoice +Sales Invoice #### Step 3:Activity Type @@ -22,7 +22,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). -Sales Invoice +Sales Invoice #### Step 4: Enter Actual Time @@ -30,7 +30,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. -Sales Invoice +Sales Invoice Based on the actual hours worked and Activity Cost of an Employee, Total Billing Amount will be calculated for Timesheet. @@ -46,7 +46,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. -Sales Invoice +Sales Invoice Sales Invoice timesheet @@ -54,7 +54,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. -Sales Invoice +Sales Invoice ####Select Customer and Item @@ -67,4 +67,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. -Sales Invoice +Sales Invoice diff --git a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md index f51e049957..6e108b3f7d 100644 --- a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md +++ b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md @@ -4,7 +4,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. -Sales Invoice +Sales Invoice 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. @@ -12,28 +12,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. -Sales Invoice +Sales Invoice On submission on Production Order, Timesheet will be created automatically. -Sales Invoice +Sales Invoice ####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. -Sales Invoice +Sales Invoice After enter From Time and To Time for all the Operations, Total Hours will be calculated. -Sales Invoice +Sales Invoice 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. -Sales Invoice +Sales Invoice ####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. -Sales Invoice +Sales Invoice diff --git a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md index 2086673d92..1524677d48 100644 --- a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md +++ b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md @@ -2,7 +2,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. -Sales Invoice +Sales Invoice ####Billable Timesheet diff --git a/erpnext/docs/user/manual/en/regional/india/gst-remimders.md b/erpnext/docs/user/manual/en/regional/india/gst-remimders.md index b1061e4c5d..97f016d234 100644 --- a/erpnext/docs/user/manual/en/regional/india/gst-remimders.md +++ b/erpnext/docs/user/manual/en/regional/india/gst-remimders.md @@ -4,7 +4,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** -GST Settings +GST Settings Here you can click on the "Send GSTIN Update Reminders" button to send email reminders to all your customers @@ -12,10 +12,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: -GST Portal Page +GST Portal Page Here they can update their GSTIN and it will automatically be added to your customer GSTIN record. #### Sample GSTIN Reminder Email -GST Reminder Email +GST Reminder Email diff --git a/erpnext/docs/user/manual/en/regional/india/gst-setup.md b/erpnext/docs/user/manual/en/regional/india/gst-setup.md index b89be539c1..49d75b1939 100644 --- a/erpnext/docs/user/manual/en/regional/india/gst-setup.md +++ b/erpnext/docs/user/manual/en/regional/india/gst-setup.md @@ -4,7 +4,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 in Customer +GST in Customer **GST for your Company Address** @@ -12,20 +12,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. -GST in Company +GST in Company **Include GSTIN number in the Address Template** Open Address Template record for India, add GSTIN number and State Code there if not exists. -GST in Company +GST in Company ### 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 -HSN in Item +HSN in Item ### 3. Making Tax Masters @@ -35,7 +35,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. -GST in Customer +GST in Customer ### 4. Make Tax Templates @@ -43,7 +43,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 -GST in Customer +GST in Customer In your **Out of State GST** template, select IGST @@ -59,22 +59,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 -GST Invoice +GST 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. -Sample GST Tax Invoice +Sample GST Tax Invoice ### Reports ERPNext comes with most of your reports you need to prepare your GST Returns. Go to Accounts > GST India head for the list. -GST Menus +GST Menus You can check the impact of your invoice in the **GST Sales Register** and **GST Itemised Sales Register** -GST Itemised Sales Register +GST Itemised Sales Register diff --git a/erpnext/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md b/erpnext/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md index b2a38c95bc..3debdc0b46 100644 --- a/erpnext/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md +++ b/erpnext/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md @@ -5,20 +5,20 @@ Set tax registation number in the field tax id for the customer, supplier and company 1. For Customer -TRN in Customer +TRN in Customer 2. For Company -TRN in Company +TRN in 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. -Tax Code in Item +Tax Code in 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). -Default Tax Template +Default Tax Template ### 3. Making VAT Ready Invoices @@ -32,14 +32,14 @@ For **Sales Invoice**, 4. Select the template that you have created based on the type of transaction 5. Save and Submit the Invoice -VAT Invoice +VAT Invoice ### 4. Print Tax Invoice ERPNext provides 2 default print foramt 1. Simplified Tax Invoice -Simplified Tax Invoice +Simplified Tax Invoice 2. Detailed Tax Invoice -Detailed Tax Invoice +Detailed Tax Invoice diff --git a/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md index bd40808ab8..1efed7592f 100644 --- a/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md +++ b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md @@ -7,7 +7,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. -Item Unit of Measure +Item Unit of Measure ###Setp 2: In the Sale Order, you will find two UoM fields @@ -17,7 +17,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. -Sale order Unit of Measure +Sale order Unit of Measure 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. @@ -26,4 +26,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. -Stock report in UOM +Stock report in UOM diff --git a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md index 3fcd4f4887..2725feefbe 100644 --- a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md +++ b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md @@ -9,7 +9,7 @@ To setup Pricing Rule, go to: ####Adding Margin in Pricing Rule -Adding Margin in Pricing Rule +Adding Margin in Pricing Rule Total Margin is calculated as follows: `Rate = Price List Rate + Margin Rate` @@ -22,7 +22,7 @@ To add Price List, go to: ####Adding Item Price -Adding Margin in Pricing Rule +Adding Margin in Pricing Rule 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. @@ -34,4 +34,4 @@ add item and scroll down to section where you can find the Margin Type ####Adding Margin in Quotation -Adding Margin in Quotation +Adding Margin in Quotation diff --git a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md index 92273ba1bc..26dd58b139 100644 --- a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md +++ b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md @@ -6,7 +6,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. -Discount Percentage +Discount Percentage The feature of Discount (%) is available in all sales and purchase transactions. @@ -16,18 +16,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 Percentage +Discount 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 Percentage +Discount Percentage ##### 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. -Discount Percentage +Discount Percentage \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md b/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md index 78f7836f88..3990e7d309 100644 --- a/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md +++ b/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md @@ -2,7 +2,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. -Close SO +Close SO ####Scenario @@ -10,7 +10,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. -Closed SO +Closed SO 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/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md index 2a1d979c25..2d12ff4a21 100644 --- a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md +++ b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md @@ -10,19 +10,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 Item Master +Setup 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. -Setup Drop Shipping on Sales Order Item +Setup Drop Shipping on Sales Order Item #### Create Purchase Order After submitting a Sales Order, create Puchase Order. -Setup Drop Shipping on Sales Order Item +Setup Drop Shipping on Sales Order Item 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. @@ -30,16 +30,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. -Purchase Order for Drop Shipping +Purchase Order for Drop Shipping **_Close_**, is a new feature introduced on **Purchase Order** and **Sales Order**, to close or to mark fulfillment. -Close Sales Order +Close Sales Order ###Drop Shipping Print Format You can notify, Suppliers by sending a email after submitting Purchase Order by attaching Drop Shipping print format. -Drop Dhip Print Format +Drop Dhip Print Format ###Video Help on Drop Ship diff --git a/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md index cd874fcc7e..0e1e683575 100644 --- a/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md +++ b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md @@ -14,7 +14,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. -Service Item +Service Item 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/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md index aaee304435..17291ecde6 100644 --- a/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md +++ b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md @@ -4,13 +4,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 Customer +Sales Person Customer ####Sales Person Contribution If more than one sales persons are working together on an order, then contribution (%) should be set for each Sales Person. -Sales Person Order +Sales Person Order On saving transaction, based on the Net Total and Contriution (%), `Contribution to Net Total` will be calculated for each Sales Person. @@ -24,7 +24,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 Report +Sales Person Report ####Sales Person wise Commission diff --git a/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md b/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md index fa745cab80..d87ba36c4c 100644 --- a/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md +++ b/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md @@ -10,7 +10,7 @@ To setup Shipping Rule, go to: ####Shipping Rule Conditions -Shipping Rule Prices +Shipping Rule Prices 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. @@ -18,16 +18,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 Rule +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 Account +Shipping Account ####Shipping Rule Application Following is an example of how shipping charges is auto-applied on Sales Order based on Shipping Rule. -Shipping Rule Application \ No newline at end of file +Shipping Rule Application \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/selling/quotation.md b/erpnext/docs/user/manual/en/selling/quotation.md index 80af009ec8..7f95e116a3 100644 --- a/erpnext/docs/user/manual/en/selling/quotation.md +++ b/erpnext/docs/user/manual/en/selling/quotation.md @@ -7,7 +7,7 @@ Invoice”or a **Quotation**. A typical Selling flow looks like: -Make Quotation from Opportunity +Make Quotation from Opportunity To create a new Quotation navigate to: @@ -17,7 +17,7 @@ To create a new Quotation navigate to: You can also create a Quotation from an Opportunity. -Make Quotation from Opportunity +Make Quotation from Opportunity A Quotation contains details about: @@ -46,7 +46,7 @@ To add taxes to your Quotation, you can select a **Sales Taxes and Charges Templ For e.g -Taxes and Charges +Taxes and Charges To understand taxes in detail visit [Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html). diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md index 05f178b154..43d7f1b328 100644 --- a/erpnext/docs/user/manual/en/selling/sales-order.md +++ b/erpnext/docs/user/manual/en/selling/sales-order.md @@ -11,7 +11,7 @@ a Sales Order. ### Sales Order Flow-Chart -Sales Order flow +Sales Order flow To create a new Sales Order go to: @@ -21,11 +21,11 @@ To create a new Sales Order go to: You can also create a Sales Order from a submitted Quotation. -Make Sales Order from Quotation +Make Sales Order from Quotation Or you can create a new Sales Order and pull details from an Quotation. -Make Sales Order from Quotation +Make Sales Order from Quotation Most of the information in your Sales Order is the same as the Quotation. There are a few amongst other things that a Sales Order will ask you to @@ -56,7 +56,7 @@ To add taxes to your Quotation, you can select a **Sales Taxes and Charges Templ For e.g -Taxes and Charges +Taxes and Charges To understand taxes in detail visit [Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html). @@ -82,7 +82,7 @@ On updating the Sales Order, a Recurring ID will be generated which will be same ERPNext will automatically create new Order and mail a notification to the Email Addresses you set in the 'Notification Email Address'field. -Reccuring Sales Order +Reccuring Sales Order ### Next Steps diff --git a/erpnext/docs/user/manual/en/selling/setup/item-price.md b/erpnext/docs/user/manual/en/selling/setup/item-price.md index 7e352b9a15..adeeee453f 100644 --- a/erpnext/docs/user/manual/en/selling/setup/item-price.md +++ b/erpnext/docs/user/manual/en/selling/setup/item-price.md @@ -16,7 +16,7 @@ Step 1: Select Price List You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it. -+Item Price list ++Item Price list On selection of Price List, its currency and for selling or buying property will be fetched as well. @@ -26,13 +26,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. -+Item Price list ++Item Price list Step 3: Enter Rate Enter selling/buying rate of an item in Price List currency. -+Item Price list ++Item Price list Step 4: Save Item Price diff --git a/erpnext/docs/user/manual/en/selling/setup/product-bundle.md b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md index 560b7305a1..123eeaf963 100644 --- a/erpnext/docs/user/manual/en/selling/setup/product-bundle.md +++ b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md @@ -11,7 +11,7 @@ To create new Product Bundle, Go to: Selling > Setup > Product Bundle > New -Product Bundle +Product Bundle ###Select Parent Item @@ -33,7 +33,7 @@ Remember: The "Parent Item" is just virtual, so your main product (a laptop in o When making Sales transactions (Sales Invoice, Sales Order, Delivery Note) the Parent Item will be selected in the main item table. -Product Bundle +Product Bundle On selection of a Parent Item in the main item table, its child items will be fetched in Packing List table of the transaction. If child item is the serialized item, you will be able to specify its Serial Mo. diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md index d8bf0d0377..0eee169e82 100644 --- a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md +++ b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md @@ -12,7 +12,7 @@ To create a sales partner go to: Sales Partners are saved with Sales Partner name provided by user. -Sales Partner +Sales Partner You can track their address and contact details and also allocate Sales Partner for each Item Group, based on Qty and Amount. @@ -21,13 +21,13 @@ You can track their address and contact details and also allocate Sales Partner To include the name of your Partner on your website, check the "Show in Website" box. When click on "Show in Website", you will see field where you can attach logo of partner's company and enter brief and introduction of partner. -Sales Partner +Sales Partner To see listing of partner, you should go to: https://example.erpnext.com/partners -Sales Partner +Sales Partner {next} diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md index 874a95e8df..edaf47d554 100644 --- a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md +++ b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md @@ -14,7 +14,7 @@ To allocate target, you should open specific Sales Person master. In the Sales Person master, you will find table called Sales Person Target. -Sales person target +Sales person target In this table, you should select Item Group, Fiscal Year, Target Qty and Amount. @@ -36,7 +36,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. -Target Item Group +Target Item Group 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. @@ -52,7 +52,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. -Sales Person Territory Manager +Sales Person Territory Manager ####2.2 Allocating Target @@ -66,7 +66,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. -Sales Person Territory Report +Sales Person Territory Report --- @@ -78,7 +78,7 @@ To create new Monthly Distriibution, go to: `Accounts > Monthly Distributon` -Target Distribution +Target Distribution You can link Monthly Distribution while allocating targets in Sales Person as well as in Territory master. diff --git a/erpnext/docs/user/manual/en/selling/setup/selling-settings.md b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md index 96dbc29508..840abe5dec 100644 --- a/erpnext/docs/user/manual/en/selling/setup/selling-settings.md +++ b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md @@ -3,7 +3,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. -Selling Settings +Selling Settings ####1. Customer Naming By diff --git a/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md index 9b25c8c863..19961722e5 100644 --- a/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md +++ b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md @@ -3,6 +3,6 @@ Using Shipping Rule you can define the cost for delivering the product to the customer and also to the supplier. You can define different shipping rules or a fixed shipping amount for the same item across different territories. -Shipping Rule +Shipping Rule {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md index 5da473016b..505d6f3ab3 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md @@ -5,11 +5,11 @@ Each ERPNext user can customize password for his/her ERPNext account. Also user ####Step 1: Go to My Setting -Change Password +Change Password ####Step 2: Set New Password -Change Password +Change Password Enter the new password and save the form to save changes. diff --git a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md index 4c4be74876..fa7614f491 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md @@ -12,7 +12,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 -Delete Transactions +Delete Transactions **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/erpnext/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md b/erpnext/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md index a11aa212ff..969518d0e8 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md @@ -16,4 +16,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. -Role Desk Permission \ No newline at end of file +Role Desk Permission \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md index ee02438436..7148611edf 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md @@ -6,19 +6,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. -Cancel Doc +Cancel Doc ####Step 2: Amend the document On cancellation of submitted document, Amend button will be became visible. -Amend Doc +Amend Doc ####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. -Resave and Submit Doc +Resave and Submit Doc
    Note: If your document linked with other documents, then you will need to cancel last document you made on top of this document. diff --git a/erpnext/docs/user/manual/en/setting-up/articles/email-error.md b/erpnext/docs/user/manual/en/setting-up/articles/email-error.md index 9d5abd021e..6113ed51a5 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/email-error.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/email-error.md @@ -2,7 +2,7 @@ In ERPNext, you can customize the 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 is saved successfully. If not, then you might receive an error as below. -Email Error +Email Error 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/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md index e4362fb337..fc198cebac 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md @@ -16,7 +16,7 @@ Following are the steps to add new Company. Company will be saved with Company Name provided. -New Company +New Company Also, you can define other properties for new company like: @@ -28,12 +28,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. -New Company +New Company ####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. -New Company +New Company \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md index 9a4e4f7935..71239646b8 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md @@ -4,7 +4,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). -Perm Level Field +Perm Level Field 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. @@ -14,11 +14,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. -Perm Level Rule +Perm Level Rule 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 Rule 2 +Perm Level Rule 2 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/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md index 73c9870891..98e67c672e 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md @@ -24,7 +24,7 @@ Following are the steps to manage and create record in the tree structured maste ####Step 2 : Parent Territory -Default Territories +Default Territories 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. @@ -42,11 +42,11 @@ If Group Node selected as Yes, then this Territory will be created as Parent, wh
    Only child Territory Groups are selectable in another masters and transactions.
    -Default Territories +Default Territories Following is how Child Territories will be listed under a Parent Territory. -Adding new Territories +Adding new Territories Following this steps, you can manage other tree masters as well in ERPNext. diff --git a/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md index 7e80d81bea..fbb7e8779e 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md @@ -14,19 +14,19 @@ For example, you have 322 Sales Orders created in your old system with SO00322 a #### Update Series Section -Update Series Section +Update Series Section #### Select Prefix Considering our scenario, prefix for Sales Order will be "SO". -Series Prefix +Series Prefix #### 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. -Series Current Value +Series Current Value With this setting, you will have numbering for the New Sales Orders starting with #323. diff --git a/erpnext/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md b/erpnext/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md index 9694da12d3..fe90cb11a3 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md @@ -2,7 +2,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. -Email Setup Error +Email Setup Error 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/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md index f42060cee0..dafac3b7ea 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md @@ -14,7 +14,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. -Download Template +Download Template ####Step 2: Prepare Data @@ -22,7 +22,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. -Update Values +Update Values Since we are overwriting only Item Group, only following columns will be mandatory. @@ -36,13 +36,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. -Browse template +Browse template ####Step 4: Upload On clicking Import, Item Group will be over-written. -Upload +Upload 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/erpnext/docs/user/manual/en/setting-up/articles/print-format-sections.md b/erpnext/docs/user/manual/en/setting-up/articles/print-format-sections.md index 93542e6261..00bbe9df52 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/print-format-sections.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/print-format-sections.md @@ -2,10 +2,10 @@ **Question:** In the Print Format, I am getting link breaks for each section. How can I disable it? -Email Setup Error +Email Setup Error **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" -Email Setup Error \ No newline at end of file +Email Setup Error \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md index 19eef9e1c7..643d243d27 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md @@ -14,13 +14,13 @@ Open User to be renamed. From Menu, select Rename. -Rename +Rename #### Step 3: Update Enter valid Email Address and click on Rename. -Update +Update After successful renaming, User will be able login using updated user id. diff --git a/erpnext/docs/user/manual/en/setting-up/articles/report-permission-error.md b/erpnext/docs/user/manual/en/setting-up/articles/report-permission-error.md index c345d0a7ef..2130e186cf 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/report-permission-error.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/report-permission-error.md @@ -1,6 +1,6 @@ **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. -Report Permission Error +Report Permission Error **Answer:** @@ -12,6 +12,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. - Permission Manager + Permission Manager As per this permission update, User should be able to access Account Receivable report fine. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md b/erpnext/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md index cdb4e3409f..4e048adf47 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md @@ -12,30 +12,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. -Enable Two Factor Auth +Enable Two Factor Auth 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 -Role Enable Two Factor Auth +Role Enable Two Factor Auth If using SMS authentication, please make sure that your SMS settings are updated -SMS Settings +SMS Settings If using Email, make sure that your outgoing Email account settings are updated -Email Settings +Email Settings 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. -Email Notify Two Factor -QR Code Page +Email Notify Two Factor +QR Code Page 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 -Two Factor Scan App +Two Factor Scan App If either of Email/SMS is used as the authentication method, you get notifications also -Email and SMS \ No newline at end of file +Email and SMS \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/authorization-rule.md b/erpnext/docs/user/manual/en/setting-up/authorization-rule.md index 822136696f..8b99894705 100644 --- a/erpnext/docs/user/manual/en/setting-up/authorization-rule.md +++ b/erpnext/docs/user/manual/en/setting-up/authorization-rule.md @@ -36,7 +36,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. -Authorization Rule +Authorization Rule If Sales User tries submitting Sales Order of value higher than 10000, then he will get error message. diff --git a/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md index 57db1a5f36..e1c8b135fd 100644 --- a/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md +++ b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md @@ -12,4 +12,4 @@ This tool will allow you to rename multiple records at the same time. To rename multiple records, upload a **.csv** file with the old name in the first column and the new name in the second column and click on **Upload**. -Bulk Rename \ No newline at end of file +Bulk Rename \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md index b9c6ccc1d2..667822386a 100644 --- a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md +++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md @@ -4,7 +4,7 @@ The Data Import Tool is a great way to upload (or edit) bulk data, specially mas To Open the data import tool, you either go to Setup or go to the Transaction you want to Import. If Data Import is allowed, you will see an Import Button: -Start Import +Start Import The tool has two sections, one to download a template and the second to upload the data. @@ -25,33 +25,33 @@ Item can have multiple prices, An Invoice has multiple Items and so on. * Click on "Download Blank Template". * For bulk editing, you can click on "Download With Data". -Download Template +Download Template ### 2\. Fill in the Template After downloading the template, open it in a spreadsheet application and fill in the data below the column headings. -Download Template +Download Template 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 Template +Download Template ### Download in Excel -Download Template +Download Template ### 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. -Upload +Upload -Upload +Upload #### Notes: diff --git a/erpnext/docs/user/manual/en/setting-up/data/download-backup.md b/erpnext/docs/user/manual/en/setting-up/data/download-backup.md index 6c98cf34f8..8f27d505c6 100644 --- a/erpnext/docs/user/manual/en/setting-up/data/download-backup.md +++ b/erpnext/docs/user/manual/en/setting-up/data/download-backup.md @@ -6,8 +6,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. -Download Backup +Download Backup 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. -Download Backup \ No newline at end of file +Download Backup \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-account.md b/erpnext/docs/user/manual/en/setting-up/email/email-account.md index 7e9b8a767b..d5aca1a006 100644 --- a/erpnext/docs/user/manual/en/setting-up/email/email-account.md +++ b/erpnext/docs/user/manual/en/setting-up/email/email-account.md @@ -10,7 +10,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. -Defining Criteria +Defining Criteria ### Outgoing Email Accounts @@ -18,19 +18,19 @@ All emails sent from the system, either by the user to a contact or notification To setup an outgoing Email Account, check on **Enable Outgoing** and set your SMTP server settings, if you are using a popular email service, these will be preset for you. -Outgoing EMail +Outgoing EMail ### Incoming Email Accounts To setup an incoming Email Account, check on **Enable Incoming** and set your POP3 settings, if you are using a popular email service, these will be preset for you. -Incoming EMail +Incoming EMail ### Setting Import Conditions for Email Import Email Accounts allows you to set conditions according to the data of the incoming emails. The email will be imported to ERPNext only if the all conditions are true. For example if you want to import an email if the subject is "Some important email", you put doc.subject == "Some important email" in the conditions textbox. You can also set more complex conditions by combining them, as shown on the following screenshot. -Incoming EMail Conditions +Incoming EMail Conditions ### How ERPNext handles replies @@ -40,6 +40,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. -Incoming EMail +Incoming EMail {next} diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md index 2b89d7d49e..8d239ea9bb 100644 --- a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md +++ b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md @@ -32,13 +32,13 @@ To setup an Email Alert: ### 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 email on saving a Task with the Subject, "TASK##### has been created" -Setting Subject +Setting Subject ### 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. -Setting Condition +Setting Condition The above example will send an Email Alert when a Task is saved with the status "Open" and the Expected End Date for the Task is the date on or before the date on which it was saved on. @@ -74,14 +74,14 @@ field. Then you can use that as a condition in the **Condition** rules to ensure emails are not sent multiple times -Setting Property in Email Alert +Setting Property in Email Alert ### Example 1. Defining the Criteria - Defining Criteria + Defining Criteria 1. Setting the Recipients and Message - Set Message + Set Message {next} diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-digest.md b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md index bceba37a95..5fa836e604 100644 --- a/erpnext/docs/user/manual/en/setting-up/email/email-digest.md +++ b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md @@ -12,6 +12,6 @@ To set up Email Digest, go to: Set your frequency, check all the items you want to receive in your weekly update and select the user ids whom you want to send the Digest to. -Email Digest +Email Digest {next} diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md b/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md index 14dad78502..445fe26d67 100644 --- a/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md +++ b/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md @@ -12,7 +12,7 @@ To add new User, go to: `Setup > User > New User` -Email User +Email User #### Step 2: Create Email Domain @@ -22,7 +22,7 @@ To add new Email Domain, go to: `Setup > Emails > Email Domain > New` -Email Domain +Email Domain 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. @@ -43,11 +43,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. -Email Password +Email Password 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. -Email Service +Email Service >If you are creating an Email Account for Email Inbox of a User, then leave Append To field as blank. @@ -57,30 +57,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 User Link +Email User Link ## 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. -Email Inbox +Email Inbox #### 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. -Email Folders +Email Folders #### Actions On the emails in your inbox, you can take various actions like Reply, Forward, Mark as Spam or Trash. -Email Actions +Email Actions #### 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. -Make from Email +Make from Email diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-reports.md b/erpnext/docs/user/manual/en/setting-up/email/email-reports.md index 95db8bacc5..a27a2dcbdb 100644 --- a/erpnext/docs/user/manual/en/setting-up/email/email-reports.md +++ b/erpnext/docs/user/manual/en/setting-up/email/email-reports.md @@ -14,7 +14,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. -Make Auto Email Report +Make Auto Email Report #### Step 2 @@ -22,11 +22,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 -With Filters +With Filters Click on the table to edit the table -Edit Filters +Edit Filters #### Test @@ -34,4 +34,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 -Report by Email +Report by Email diff --git a/erpnext/docs/user/manual/en/setting-up/email/sending-email.md b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md index b4566de0ba..2fd163bd27 100644 --- a/erpnext/docs/user/manual/en/setting-up/email/sending-email.md +++ b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md @@ -2,7 +2,7 @@ In ERPNext you can send any document as email (with a PDF attachment) by clicking on `Menu > Email` from any open document. -Send Email +Send Email **Note:** You must have outgoing [email accounts](/docs/user/manual/en/setting-up/email/email-account.html) setup for this. diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md b/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md index 7f873cee2f..4afaee1fed 100644 --- a/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md +++ b/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md @@ -6,12 +6,12 @@ Feedback Trigger. To request a feedback manually go to respective document e.g. Sales Order, Issue etc. and click on Ask a Feedback option in Menu. -Setting Condition +Setting Condition Then, user can enter the feedback request details like email id, message and send the feedback request mail. -Setting Condition +Setting Condition Note. If Feedback Trigger is already configured for the document then system will fetch Feedback Request details (email id, message) diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md b/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md index 641d0a0b8d..0dbb3b7340 100644 --- a/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md +++ b/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md @@ -2,15 +2,15 @@ We can also Resend the Feedback Request to the Customer/User. -Setting Condition +Setting Condition To resend the Feedback Request we will need to navigate the Communication by clicking the `Details` link on Timeline Feedback. -Setting Condition +Setting Condition 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. -Setting Condition +Setting Condition {next} diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md b/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md index 441e78eff0..373d703275 100644 --- a/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md +++ b/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md @@ -19,13 +19,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 Subject +Setting Subject ### 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 Condition +Setting Condition ### Setting a Message @@ -45,9 +45,9 @@ You can use both Jinja Tags (`{% raw %}{{ doc.[field_name] }}{% endraw %}`) and ### Example 1. Setting up Feedback Trigger - Defining Criteria + Defining Criteria 1. Setting the Recipients and Message - Set Message + Set Message {next} diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md b/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md index 663aae1cfd..9069f3721b 100644 --- a/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md +++ b/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md @@ -3,17 +3,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. -Setting Condition +Setting Condition 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. -Setting Condition +Setting Condition Also, The Feedback details such as Feedback message and ratings will be shown in the Document's Timeline along with Comment, Email. -Setting Condition +Setting Condition {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md b/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md index d13c70e97e..a9a23dde68 100644 --- a/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md +++ b/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md @@ -15,7 +15,7 @@ To setup Dropbox Backup, Set Frequency to download backup in your Dropbox account. -set frequency +set frequency ####Step 2: Allow Dropbox Access @@ -25,13 +25,13 @@ After setting frequency and updating other details, click on `Allow Dropbox acce Login to your Dropbox account by entering login credentials. -Login +Login ####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. -Allow +Allow With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it. @@ -44,20 +44,20 @@ With this, a folder called "ERPNext" will be created in your Dropbox account, an ####Step 2: Create a new Dropbox app -Create new +Create new ####Step 3: Fill in the details for your new app -Choose Dropbox API and type as APP Folder +Choose Dropbox API and type as APP Folder - -Setup APP Name +Setup APP Name ####Step 4: Insert your custom domain Redirect URI `https://{yourwebsite.com}/api/method/frappe.integrations.doctype.dropbox_settings.dropbox_settings.dropbox_auth_finish` -Set Redirect URL +Set Redirect URL ####Step 5: In a new window, open the Dropbox Settings page in your ERPnext installation diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md index 2fa8f57450..ec6e8487b1 100644 --- a/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md +++ b/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md @@ -11,9 +11,9 @@ To setup LDAP, To enable ldap service, you need to configure parameters like LDAP Server Url, Organizational Unit, UID, Base Distinguished Name (DN) and Password for Base DN -LDAP Settings +LDAP Settings After setting up LDAP parameters, on login screen, the system enables **Login Via LDAP** option. -LOGIN via LDAP +LOGIN via LDAP diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md index d7c5ae62e6..9c6cb18bf0 100644 --- a/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md +++ b/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md @@ -11,17 +11,17 @@ To setup PayPal , To enable PayPal payment service, you need to configure parameters like API Username, API Password and Signature. -PayPal Settings +PayPal Settings 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. -PayPal COA +PayPal COA 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. -Payment Gateway Account +Payment Gateway Account After enabling service and configuring Payment Gateway Account your system is able to accept online payments. @@ -33,20 +33,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, PayPal Developer Account - From **Accounts** tab. create a new business account. -Payment Request +Payment Request - From this account profile you will get your sandbox api credentials -Payment Request +Payment Request --- #### PayPal Account API Signature - Login to PayPal Account and go to profile -Payment Request +Payment Request - From **My Selling Tools** go to **api Access** -Payment Request +Payment Request - On API Access Page, choose option 2 to generate API credentials -Payment Request +Payment Request diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md index d41283ce40..fe5c88503b 100644 --- a/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md +++ b/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md @@ -8,21 +8,21 @@ To setup RazorPay, `Explore > Integrations > RazorPay Settings` -Razorpay Settings +Razorpay Settings #### Setup RazorPay To enable RazorPay payment service, you need to configure parameters like API Key, API Secret -Razorpay Settings +Razorpay Settings On enabling service, the system will create Payment Gateway record and Account head in the Chart of Account with account type as Bank. -Razorpay COA +Razorpay COA 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. -Payment Gateway Account +Payment Gateway Account After enabling service and configuring Payment Gateway Account your system is able to accept online payments. diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/stripe-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/stripe-integration.md index ba62ebea1f..05f70f0d4a 100644 --- a/erpnext/docs/user/manual/en/setting-up/integrations/stripe-integration.md +++ b/erpnext/docs/user/manual/en/setting-up/integrations/stripe-integration.md @@ -6,15 +6,15 @@ To setup Stripe, #### Setup Stripe To enable Stripe payment service, you need to configure parameters like Publishable Key, Secret Key -Razorpay Settings +Razorpay Settings On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank. -Stripe COA +Stripe COA 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. -Payment Gateway Account +Payment Gateway Account After configuring Payment Gateway Account your system is able to accept online payments. diff --git a/erpnext/docs/user/manual/en/setting-up/pos-setting.md b/erpnext/docs/user/manual/en/setting-up/pos-setting.md index 375c251b5c..5bd8a1fa5c 100644 --- a/erpnext/docs/user/manual/en/setting-up/pos-setting.md +++ b/erpnext/docs/user/manual/en/setting-up/pos-setting.md @@ -14,13 +14,13 @@ from: Set default values as defined. -POS Setting +POS Setting To set the default mode of payment, enabled the option default in the mode of payments table -POS Setting +POS Setting User can sale the particular products to the particular customers from the POS by adding item groups, customer groups in the POS Profile. -POS Setting +POS Setting > 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/erpnext/docs/user/manual/en/setting-up/price-lists.md b/erpnext/docs/user/manual/en/setting-up/price-lists.md index a9655817a3..4710b6c65f 100644 --- a/erpnext/docs/user/manual/en/setting-up/price-lists.md +++ b/erpnext/docs/user/manual/en/setting-up/price-lists.md @@ -10,7 +10,7 @@ You can create new Price List > Selling/Buying/Stock > Setup > Price List >> New -Price List +Price List * These Price List will be used when creating Item Price record to track selling or buying price of an item. Click here to learn more about Item Price. diff --git a/erpnext/docs/user/manual/en/setting-up/print/address-template.md b/erpnext/docs/user/manual/en/setting-up/print/address-template.md index 34df11c69d..53dfef1bfe 100644 --- a/erpnext/docs/user/manual/en/setting-up/print/address-template.md +++ b/erpnext/docs/user/manual/en/setting-up/print/address-template.md @@ -26,6 +26,6 @@ Here is the default template: ### Example -Print Heading +Print Heading {next} diff --git a/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md b/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md index e93f3094c1..44dd412f12 100644 --- a/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md +++ b/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md @@ -2,7 +2,7 @@ Business involves making payment to various parties like suppliers and employees. Payment can be made in various modes like cash, NEFT or cheque. If you are making a payment via cheque, you can also create a Print Format for printing Cheque from ERPNext based on the Payment Entry. -Sample Cheque +Sample Cheque 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. @@ -14,13 +14,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. -Sample Cheque +Sample Cheque ####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. -Sample Cheque +Sample Cheque ####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. @@ -28,18 +28,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. -Sample Cheque +Sample 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. -Sample Cheque +Sample Cheque ####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. -Sample Cheque +Sample Cheque diff --git a/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md b/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md index 5fe6a61930..644e3dd76a 100644 --- a/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md +++ b/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md @@ -6,11 +6,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 @@ -18,17 +18,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 @@ -36,11 +36,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/erpnext/docs/user/manual/en/setting-up/print/letter-head.md b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md index e1612d7eeb..72b79e1ad9 100644 --- a/erpnext/docs/user/manual/en/setting-up/print/letter-head.md +++ b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md @@ -19,7 +19,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. -Print Heading +Print Heading > If you want to make this the default letter head, click on “Is Default”. @@ -31,7 +31,7 @@ After enter values in the Header and Footer section, Save Letter Head. This is how the letter head looks in a document's print. -Print Heading +Print Heading > Please note that Footer will be visible only when document's print is seen in the PDF. Footer will not be visible in the HTML based print preview. diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md index 4e94045924..f9799279af 100644 --- a/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md +++ b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md @@ -10,19 +10,19 @@ or Open the document for which you want to make a print format. Click the Printe ### Step 1: Make a new Format -Send Email +Send Email ### Step 2: Add a new Field To add a field, just drag it from the left sidebar and add it in your layout. You can edit the layout by clicking on the settings icon. -Send Email +Send Email ### Step 3 To remove a field, just drag it back into the fields sidebar. -Send Email +Send Email ### Step 4 @@ -30,7 +30,7 @@ You can add customized text, HTML in your print format, just add the **Custom HT Then click on **Edit HTML** to edit your content. -Send Email +Send Email To save your format, just click on the **Save** button on the top. diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-headings.md b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md index de3395bca3..7cf9b54c14 100644 --- a/erpnext/docs/user/manual/en/setting-up/print/print-headings.md +++ b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md @@ -10,10 +10,10 @@ You can create print headings from : #### Figure 1: Save Print Heading -Print Heading +Print Heading Example of a change in print heading is shown below: -Print Heading +Print Heading {next} diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-settings.md b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md index 220b467501..cdf3c54a37 100644 --- a/erpnext/docs/user/manual/en/setting-up/print/print-settings.md +++ b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md @@ -6,6 +6,6 @@ To edit print settings, go to: > Setup > Printing and Branding > Print Settings -Print Settings +Print Settings {next} diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-style.md b/erpnext/docs/user/manual/en/setting-up/print/print-style.md index bdb0ab0e26..4f2cdea724 100644 --- a/erpnext/docs/user/manual/en/setting-up/print/print-style.md +++ b/erpnext/docs/user/manual/en/setting-up/print/print-style.md @@ -10,6 +10,6 @@ To set a default style, you can go to [Print Settings](/docs/setup/print/print-s All Print Format styles are based on Bootstrap (Version 3) CSS Framework. -Print Style +Print Style {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md index 28e803da99..8314ae1a7b 100644 --- a/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md +++ b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md @@ -8,13 +8,13 @@ To setup Terms and Condition master, go to: `Selling > Terms and Condition > New` -Terms and Conditions +Terms and Conditions ### 2. Editing in HTML Content of Terms and Condition can be formatted as per your preference, and also insert images where needed. If you have expertise in HTML, you will also find option to edit the content of Terms and Condition in HTML. -Terms and Conditions, Edit HTML +Terms and Conditions, Edit HTML This also allows you to use Terms and Condition master for footer, which otherwise is not available in ERPNext as dedicated functionality. Since contents of Terms and Condition is always the last to appear in the print format, details of footer should be inserted at the end of the content, so that it actually appears as footer in the print format. @@ -22,6 +22,6 @@ This also allows you to use Terms and Condition master for footer, which otherwi In transactions, you will find section of Terms and Condition where you will be able to search and fetched required Terms and Condition master. -Terms and Conditions, Select in document +Terms and Conditions, Select in document {next} diff --git a/erpnext/docs/user/manual/en/setting-up/setting-company-sales-goal.md b/erpnext/docs/user/manual/en/setting-up/setting-company-sales-goal.md index ca0c32a4a0..e18ad053bf 100644 --- a/erpnext/docs/user/manual/en/setting-up/setting-company-sales-goal.md +++ b/erpnext/docs/user/manual/en/setting-up/setting-company-sales-goal.md @@ -2,14 +2,14 @@ Monthly sales targets can be set for a company via the Company master. By default, the Company master dashboard features past sales stats. -Sales Graph +Sales Graph You can set the **Sales Target** field to track progress to track progress with respect to it. -Setting Sales Goal +Setting Sales Goal The target progress is also shown in notifications: -Sales Notification +Sales Notification {next} diff --git a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md index 18f2f015a5..5a8b2d272e 100644 --- a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md +++ b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md @@ -24,11 +24,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. -Item Tax +Item Tax * **Inclusive and Exclusive Tax**: ERPNext allows you to enter Item rates which are tax inclusive. -Inclusive Tax +Inclusive Tax * **Exception to the rule**: Item tax settings are required only if a particular Item has a different tax rate than the rate defined in the standard tax Account * **Item tax is overwrite-able**: You can overwrite or change the item tax rate by going to the Item master in the Item tax table. @@ -51,7 +51,7 @@ have to go to: > Setup > Accounts > Sales Taxes and Charge Master -Sales Tax Master +Sales Tax Master When you create a new master, you will have to add a row for each tax type. diff --git a/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md index 87ebcba06a..412572a820 100644 --- a/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md +++ b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md @@ -6,6 +6,6 @@ You can set default values for your documents from Global Defaults Whenever a new document is created, these values will be set as default. -Global Defaults +Global Defaults {next} diff --git a/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md index f6ede50fec..3e2a109dad 100644 --- a/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md +++ b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md @@ -10,6 +10,6 @@ For example if you are in the services business, you want to hide the Manufactur Check / uncheck the items to show / hide. -Module Settings +Module Settings {next} diff --git a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md index 71029bcbe3..086a272821 100644 --- a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md +++ b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md @@ -42,7 +42,7 @@ name and the starting point in the “Update Series” section. See how to set the naming series -Naming Series +Naming Series {next} diff --git a/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md index e3f745306a..67e116e507 100644 --- a/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md +++ b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md @@ -8,7 +8,7 @@ To open System Settings, go to: > Setup > Settings > System Settings -System Settings +System Settings ####Two Factor Authentication. Settings for Two Factor Authentication can be configured here. @@ -17,7 +17,7 @@ Settings for Two Factor Authentication can be configured here. * Expiry time for QRCode image if "OTP App" is selected in method * Issuer name of the One Time Password -Two Factor Auth +Two Factor Auth {next} diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md index c8fba43408..00219fd6a0 100644 --- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md +++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md @@ -2,7 +2,7 @@ Select your language. ERPNext is available in more than 20 languages. -Language +Language --- diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md index 4f0fbcc9b0..eab5b4a4d2 100644 --- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md +++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md @@ -2,7 +2,7 @@ Set your Country Name, Time Zone and Currency. -Currency +Currency ### Default Currency diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md index d85c940c44..65e2583674 100644 --- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md +++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md @@ -2,7 +2,7 @@ Enter the First User. Give the Full Name, Email Address (as User ID) and Password. This first user will be setup as a System Manager with privileges similar to the Administrator account. -User +User --- diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md index 523195be74..37027f06ad 100644 --- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md +++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md @@ -2,7 +2,7 @@ Select the domain(s) that will be enabled after setup. -Domains +Domains --- diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md index a310144029..5e3dcb7f3a 100644 --- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md +++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md @@ -2,7 +2,7 @@ Enter Company Name, Abbreviation and add a logo. -Company Details +Company Details ### Company Abbreviation diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md index 301e529099..0e5b7f4e51 100644 --- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md +++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md @@ -4,7 +4,7 @@ Enter in a short sentence of what your company does. This is often a mission sta Add the name of the organization's primary financial institution. This information will populate **Accounts**. -Company Details +Company Details ### Chart of Accounts diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md index 477a2caf60..1927a9b0a7 100644 --- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md +++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md @@ -2,11 +2,11 @@ The initial setup wizard will create all the settings needed including the first system manager user. -Language +Language 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. -Language +Language --- diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md index 98d9f7524d..fc4f3b0823 100644 --- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md +++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md @@ -2,11 +2,11 @@ Set a monthly sales target for the organization in the currency selected during Step 2. -Language +Language If a sales target is not known, then clicking **Mark as Done** will complete the step. -Language +Language --- diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md index 9b38ae63fa..a196e8cb03 100644 --- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md +++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md @@ -2,11 +2,11 @@ Add known customers to the system. -Language +Language If customers are not known, then clicking **Mark as Done** will complete the step. -Language +Language --- diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md index 55dccb1e5d..75628f3653 100644 --- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md +++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md @@ -2,11 +2,11 @@ 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. -Language +Language If a letter head logo file is not available, the clicking **Mark as Done** will complete the step. -Language +Language --- diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md index f1e99671c4..e798e1deb2 100644 --- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md +++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md @@ -2,11 +2,11 @@ Add known suppliers to the system. -Language +Language If suppliers are not known, then clicking **Mark as Done** will complete the step. -Language +Language ## Step 11a: Other Domain Specific Steps diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md index cc2a4aef5c..774b0cd650 100644 --- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md +++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md @@ -2,11 +2,11 @@ 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. -Language +Language If users are not known, then clicking **Mark as Done** will complete the step. -Language +Language --- diff --git a/erpnext/docs/user/manual/en/setting-up/sms-setting.md b/erpnext/docs/user/manual/en/setting-up/sms-setting.md index 1cb7c36ad3..7c666924cd 100644 --- a/erpnext/docs/user/manual/en/setting-up/sms-setting.md +++ b/erpnext/docs/user/manual/en/setting-up/sms-setting.md @@ -17,7 +17,7 @@ Example URL: http://instant.smses.com/web2sms.php?username=&password;=&to;=&sender;=&message;= -SMS Setting 2 +SMS Setting 2 > Note: the string up to the "?" is the SMS Gateway URL @@ -36,6 +36,6 @@ Note that some parameters in the URL are static.You will get static values from your SMS Provider like username, password etc. These static values should be entered in the Static Parameters table. -SMS Setting +SMS Setting {next} diff --git a/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md index 36ad65a7c8..c30990378e 100644 --- a/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md +++ b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md @@ -29,17 +29,17 @@ To perform Stock Reconciliation, go to: A predefined template of an spreadsheet file should be followed for importing item's stock levels and valuations. Open new Stock Reconciliation form to see download option. -Stock Reconciliation +Stock Reconciliation #### Step 2: Enter Data in csv file. -Stock Reconciliation +Stock Reconciliation The csv format is case-sensitive. Do not edit the headers which are preset in the template. In the Item Code and Warehouse column, enter exact Item Code and Warehouse as created in your ERPNext account. For quatity, enter stock level you wish to set for that item, in a specific warehouse. #### Step 3: Upload file and Enter Values in Stock Reconciliation Form -Stock Reconciliation +Stock Reconciliation **Posting Date** @@ -61,11 +61,11 @@ report. The report will show you all types of rates. #### Step 4: Review the reconciliation data -Stock Reconciliation +Stock Reconciliation ### Stock Ledger Report -Stock Reconciliation +Stock Reconciliation **How Stock Reconciliation Works** diff --git a/erpnext/docs/user/manual/en/setting-up/territory.md b/erpnext/docs/user/manual/en/setting-up/territory.md index c82bfe4a1f..e892489de4 100644 --- a/erpnext/docs/user/manual/en/setting-up/territory.md +++ b/erpnext/docs/user/manual/en/setting-up/territory.md @@ -7,6 +7,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. -Territory Tree +Territory Tree {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md index 16bf19e826..6fb64df37e 100644 --- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md +++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md @@ -11,7 +11,7 @@ Important is to realize that the email address is the unique key (ID) identifyin ### 1. List of Users -User List +User List To add a new user, click on "New" @@ -22,8 +22,8 @@ Add user details such as First Name, Last Name, Email etc. The user's Email will become the user id. Mobile No can also be used to log in if you check the Allow Login using Mobile No checkbox under the Security section in System Settings. While Mobile No will be unique, it will not be treated as a user id. -Email Login -Mobile No Login +Email Login +Mobile No Login After adding these details, save the user. @@ -32,19 +32,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. -User Roles +User Roles ### 4. Setting Module Access Users will have access to all modules for which they have role based access. If you want to block certain modules for certain users, un-check the module from the list. -User Block Module +User Block Module ### 5. Security Settings If you wish to give the user access to the system only between office hours, or during weekends, mention it under security settings. -User Security +User Security {next} diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md index a65a295cbe..d75609ff8e 100644 --- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md +++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md @@ -5,7 +5,7 @@ ERPNext has a role-based permission system. It means that you can assign Roles t To start with, go to: > Setup > Permissions > Role Permissions Manager -Manage Read, Write, Create, Submit, Amend access using the Role Permissions Manager +Manage Read, Write, Create, Submit, Amend access using the Role Permissions Manager Permissions are applied on a combination of: @@ -38,12 +38,12 @@ Permissions are applied on a combination of: Leave Application is a good **example** that encompasses all areas of Permission System. -Leave Application Form should be created by an Employee, and approved by Leave Approver or HR User +Leave Application Form should be created by an Employee, and approved by Leave Approver or HR User 1. **It should be created by an Employee.** For this, Employee Role should be given Read, Write, Create permissions. -Giving Read, Write and Create Permissions to Employee for Leave Application +Giving Read, Write and Create Permissions to Employee for Leave Application 1. **An Employee should only be able to access his/her Leave Application.** Hence, Apply User Permissions should be enabled for Employee Role, and a User Permission record should be created for each User Employee combination. (This effort is reduced for Employee Document Type, by programmatically creating User Permission records.) @@ -53,12 +53,12 @@ Leave Application is a good **example** that encompasses all areas of Permission 1. **HR Manager should be able to see all Leave Applications.** Create a Permission Rule for HR Manager at Level 0, with Read permissions. Apply User Permissions should be disabled. -Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access. +Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access. 2. **Leave Approver should be able to see and update Leave Applications applicable to him/her.** Leave Approver is given Read and Write access at Level 0, with Apply User Permissions enabled. Relevant Employee Documents should be enlisted in the User Permissions of Leave Approvers. (This effort is reduced for Leave Approvers mentioned in Employee Documents, by programmatically creating User Permission records.) -Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee. +Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee. 3. **It should be Approved / Rejected only by HR User or Leave Approver.** The Status field of Leave Application is set at Level 1. HR User and Leave Approver are given Read and Write permissions for Level 1, while everyone else (All) are given Read permission for Level 1. @@ -69,6 +69,6 @@ Leave Application is a good **example** that encompasses all areas of Permission 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. -Let HR User delegate access to Leave Applications by checking 'Set User Permissions'. This will allow HR User to access User Permissions Manager for 'Leave Application' +Let HR User delegate access to Leave Applications by checking 'Set User Permissions'. This will allow HR User to access User Permissions Manager for 'Leave Application' {next} diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md index 5483af7246..3a26a328f6 100644 --- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md +++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md @@ -5,10 +5,10 @@ In ERPNext, user can make his custom user interface using Page and the custom re If user has enabled the developer mode, then they can add the roles directly in the page and report record. But in that case, the permissions will also be reflected in the json file for the page / report. ### For Page -Assign roles to the page +Assign roles to the page ### For Report -Assign roles to the report +Assign roles to the report ## Tool for custom roles assignment @@ -16,10 +16,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 -Tools to assign custom roles to the page +Tools to assign custom roles to the page ### 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. -Reset the default roles +Reset the default roles diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md index 23e5b32cb8..a939e656fe 100644 --- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md +++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md @@ -4,6 +4,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 - + {next} diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md index 2bf4f3f1a6..db444d1ebd 100644 --- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md +++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md @@ -15,7 +15,7 @@ When you create a new record you will have to specify 1. The type of document which will be allowed (for example "Company") 1. The specific item that you want to allow (the name of the "Company) -Creating a new user permission +Creating a new user permission 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. @@ -25,11 +25,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" -Select Document Types to Edit the Setting +Select Document Types to Edit the Setting 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. -Select Document Types to Edit the Setting +Select Document Types to Edit the Setting ### Ignoring User Permissions on Certain Fields @@ -37,7 +37,9 @@ 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" -Ignore User Permissions on specific properties + +Ignore User Permissions on specific properties + ### Strict Permissions @@ -49,4 +51,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. -Permitted Documents for User report +Permitted Documents for User report diff --git a/erpnext/docs/user/manual/en/setting-up/workflows.md b/erpnext/docs/user/manual/en/setting-up/workflows.md index 4b2cabbba7..06c47d7aa4 100644 --- a/erpnext/docs/user/manual/en/setting-up/workflows.md +++ b/erpnext/docs/user/manual/en/setting-up/workflows.md @@ -13,7 +13,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. -Workflow +Workflow To make this Workflow and transition rules go to : @@ -21,11 +21,11 @@ To make this Workflow and transition rules go to : #### Step 1: Enter the different states of Leave Approval Process. -Workflow +Workflow #### Step 2: Enter Transition Rules. -Workflow +Workflow #### Notes: @@ -48,15 +48,15 @@ workflow transition step that says from submitted you can cancel. When a Leave Application is saved by Employee, the status of the document changes to "Applied" -Workflow +Workflow When the HR User logs in, he can either Approve or Reject. If approved the status of the document changes to "Approved by HR". However, it is yet to be approved by Leave Approver. -Workflow +Workflow When the Leave Approver opens the Leave Application page, he can finally "Approve" or "Reject" the Leave Application. -Workflow +Workflow {next} diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md index 0e4d2d7be5..847c8079de 100644 --- a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md +++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md @@ -22,7 +22,7 @@ Steps: `Explore > Accounts > Accounts Settings` - Perpetual Inventory + Perpetual Inventory * 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/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md index 90bdbbf5e3..a3102ae7ff 100644 --- a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md +++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md @@ -12,7 +12,7 @@ On receipt of items in a particular warehouse, the balance in the Warehouse Acco > Setup > Company > Stock Settings > "Enable Perpetual Inventory" -Perpetual Inventory +Perpetual Inventory * Setup the following default accounts for each Company. These accounts are created automatically in the new ERPNext accounts. @@ -133,11 +133,11 @@ Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of it **Stock Ledger** -Perpetual Inventory +Perpetual Inventory **General Ledger** -Perpetual Inventory +Perpetual Inventory As stock balance increases through Purchase Receipt, "Store" accounts are debited and a temporary account "Stock Receipt But Not Billed" account is credited, to maintain double entry accounting system. At the same time, negative expense is booked in account "Expense included in Valuation" for the amount added for valuation purpose, to avoid double expense booking. @@ -149,7 +149,7 @@ On receiving Bill from supplier, for the above Purchase Receipt, you will make P **General Ledger** -Perpetual Inventory +Perpetual Inventory Here "Stock Received But Not Billed" account is debited and nullified the effect of Purchase Receipt. @@ -207,11 +207,11 @@ at $300. Following are the details of Delivery Note: **Stock Ledger** -Perpetual Inventory +Perpetual Inventory **General Ledger** -Perpetual Inventory +Perpetual Inventory As item is delivered from "Stores" warehouse, "Stores" account is credited and equal amount is debited to the expense account "Cost of Goods Sold". The @@ -240,11 +240,11 @@ of the Sales Invoice are same as the above Delivery Note. **Stock Ledger** -Perpetual Inventory +Perpetual Inventory **General Ledger** -Perpetual Inventory +Perpetual Inventory Here, apart from normal account entries for invoice, "Stores" and "Cost of Goods Sold" accounts are also affected based on the valuation amount. @@ -278,11 +278,11 @@ Goods Sold" accounts are also affected based on the valuation amount. **Stock Ledger** -Perpetual Inventory +Perpetual Inventory **General Ledger** -Perpetual Inventory +Perpetual Inventory * * * @@ -313,11 +313,11 @@ Goods Sold" accounts are also affected based on the valuation amount. **Stock Ledger** -Perpetual Inventory +Perpetual Inventory **General Ledger** -Perpetual Inventory +Perpetual Inventory * * * @@ -350,10 +350,10 @@ Goods Sold" accounts are also affected based on the valuation amount. **Stock Ledger** -Perpetual Inventory +Perpetual Inventory **General Ledger** -Perpetual Inventory +Perpetual Inventory {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md index 839ae4dd64..9b140a64a9 100644 --- a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md +++ b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md @@ -2,7 +2,7 @@ While creating Delivery Note, system validates if item's Qty mentined is same as in the Sales Order. If Item Qty has been increased, you will get over-delivery validation. If you want to be able to deliver more items than mentioned in the Sales Order, you should update "Allow over delivery or receipt upto this percent" in the Item master. -Item wise Allowance percentage +Item wise Allowance percentage 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. @@ -16,7 +16,7 @@ Update global value for "Allow over delivery or receipt upto this percent" from 3. Save Stock Settings. -Item wise Allowance percentage +Item wise Allowance percentage diff --git a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md index e95697da53..9d447027cc 100644 --- a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md +++ b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md @@ -4,17 +4,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. -reorder level +reorder level 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. -reorder level next action +reorder level next action When item's stock reaches reorder level, Material Request is auto-created automatically. You can enable this feature from: `Stock > Setup > Stock Settings` -active auto-material request +active auto-material request 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/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md index c502e71151..f236cfae0e 100644 --- a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md +++ b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md @@ -13,7 +13,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. -reorder level +reorder level After updating Valuation Rate for an item, come back to Stock Reconciliation and upload save .csv file. @@ -21,7 +21,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. -reorder level +reorder level ####Stock Reconciliation Help Video diff --git a/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md b/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md index 5cc6529d89..0cd2006cca 100644 --- a/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md +++ b/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md @@ -8,10 +8,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. -Download Backup +Download Backup You can also set Valuation Method in the item master, especially when a valuation method for an item is different from the default Method. -Download Backup +Download Backup [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/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md b/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md index 8fa2f92ab6..f93e66862b 100644 --- a/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md +++ b/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md @@ -6,7 +6,7 @@ In the item master, you might witness values in the following fields to be froze 1. Has Batch No. 1. Has Serial No. -Item Field Frozen +Item Field Frozen 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/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md index d550019c4e..82408bd4e3 100644 --- a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md +++ b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md @@ -4,7 +4,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. -Batch Item +Batch Item You can create a new Batch from: @@ -18,13 +18,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. -Batch in Purchase Receipt +Batch in Purchase Receipt #### 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 in Delivery Note +Batch in Delivery Note #### Batch-wise Stock Balance Report @@ -32,4 +32,4 @@ To check batch-wise stock balance report, go to: Stock > Standard Reports > Batch-wise Balance History -Batchwise Stock Balance +Batchwise Stock Balance diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md index de971c0765..12447e006d 100644 --- a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md +++ b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md @@ -18,7 +18,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. -UoM Must be Whole No +UoM Must be Whole No ####Validation @@ -26,7 +26,7 @@ While creating transaction, if you enter value in fraction for item whos UoM has `Quantity cannot be a fraction at row #` -UoM Validation Message +UoM Validation Message \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md index f69ddbb7d3..6ed111b99a 100644 --- a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md +++ b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md @@ -50,7 +50,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. -Difference Account +Difference Account #### Step 9: Save and Submit Stock Entry diff --git a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md index d822a23acf..1d758c8a04 100644 --- a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md +++ b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md @@ -22,7 +22,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. -Repack Entry +Repack Entry Update Qty for all the items selected. @@ -30,6 +30,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. -Repack Stock Entry +Repack Stock Entry \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md b/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md index aaaec2dea0..f3b9966be6 100644 --- a/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md +++ b/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md @@ -10,4 +10,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. -Returning Rejected Items \ No newline at end of file +Returning Rejected Items \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md index c0292f2f9c..4f2425ffb3 100644 --- a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md +++ b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md @@ -14,11 +14,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. -Serial Nos Entry +Serial Nos Entry Generated Serial numbers will be updated for each item. -Serial Nos Created +Serial Nos Created ###2. Serializing Manufacturing Item @@ -28,12 +28,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. -Serial Nos Created +Serial Nos Created ####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. -Serial Nos Created +Serial Nos Created \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md index ba29334ccd..ce22d8e525 100644 --- a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md +++ b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md @@ -8,7 +8,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. -Material Issue +Material Issue #### 2.Purpose: Material Receipt @@ -16,25 +16,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. -Material Receipt +Material Receipt #### 3.Purpose: Material Transfer Material Transfer entry is created for the inter-warehouse Material Transfer. -Material Transfer +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. -Transfer for Manufacture +Transfer for Manufacture #### 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. -Manufacture +Manufacture #### 5.Purpose: Repack @@ -44,6 +44,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.![Check this page to know more about Subcontracting](/docs/user/manual/en/manufacturing/subcontracting.html). -Subcontract +Subcontract \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md index 052ed11737..6d8fcb6297 100644 --- a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md +++ b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md @@ -6,10 +6,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. -Material Transfer +Material Transfer 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. -Material Transfer +Material Transfer \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/batch.md b/erpnext/docs/user/manual/en/stock/batch.md index a97be920ee..8283af3c8d 100644 --- a/erpnext/docs/user/manual/en/stock/batch.md +++ b/erpnext/docs/user/manual/en/stock/batch.md @@ -11,7 +11,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" -Item Setup for Batches +Item Setup for Batches ### Creating Batches @@ -25,7 +25,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. -Batch View +Batch View To move the batch from one warehouse to another, you can click on the move button. diff --git a/erpnext/docs/user/manual/en/stock/delivery-note.md b/erpnext/docs/user/manual/en/stock/delivery-note.md index a59ac35bd1..de7f6768ef 100644 --- a/erpnext/docs/user/manual/en/stock/delivery-note.md +++ b/erpnext/docs/user/manual/en/stock/delivery-note.md @@ -15,7 +15,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 Note +Delivery Note You can also “fetch” the details from an unshipped Sales Order. diff --git a/erpnext/docs/user/manual/en/stock/delivery-trip.md b/erpnext/docs/user/manual/en/stock/delivery-trip.md index 5e0911ad24..37b284c783 100644 --- a/erpnext/docs/user/manual/en/stock/delivery-trip.md +++ b/erpnext/docs/user/manual/en/stock/delivery-trip.md @@ -8,10 +8,10 @@ You can make a Delivery directly from: Delivery -Delivery +Delivery Delivery Stops -Delivery +Delivery {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/installation-note.md b/erpnext/docs/user/manual/en/stock/installation-note.md index a75e15fac6..2a85a4f6ae 100644 --- a/erpnext/docs/user/manual/en/stock/installation-note.md +++ b/erpnext/docs/user/manual/en/stock/installation-note.md @@ -2,6 +2,6 @@ You can use installation note to record the instalation of a product having a serial number. -Installation Note +Installation Note {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md index 3e2bdd35bb..5b57c60ca1 100644 --- a/erpnext/docs/user/manual/en/stock/item/index.md +++ b/erpnext/docs/user/manual/en/stock/item/index.md @@ -31,7 +31,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. -Serial No modalBatch No modal +Serial No modalBatch No modal > Important: Once you mark an item as serialized or batched or neither, you cannot change it after you have made any stock entry. @@ -57,9 +57,9 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi ### Purchase Details -Item Purchase Details +Item Purchase Details -Purchase details +Purchase details * **Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse. @@ -69,7 +69,7 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi ###Supplier Details -Item Supplier Details +Item Supplier Details * **Default Supplier:** Supplier from whom you generally purchase this item. @@ -79,23 +79,23 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi ### Sales Details -Item Sales Details +Item Sales Details * **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item. -Sales details +Sales details -Sales details +Sales details ***Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item. ***Customer Codes:** Track Item Code assigned by the Customers for this Item. This will help you in searching item while creating Sales Order based on the Item Code in the Customer's Purchase Order. -Sales details +Sales details ### Manufacturing And Website -Manufaturing details +Manufaturing details 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/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md index cc59618467..8784f68caa 100644 --- a/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md +++ b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md @@ -21,7 +21,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. -FIFO +FIFO * **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/erpnext/docs/user/manual/en/stock/item/item-variants.md b/erpnext/docs/user/manual/en/stock/item/item-variants.md index eeee0e1d91..08f88557d3 100644 --- a/erpnext/docs/user/manual/en/stock/item/item-variants.md +++ b/erpnext/docs/user/manual/en/stock/item/item-variants.md @@ -19,20 +19,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. -Has Variants +Has Variants 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. -Valid Attributes +Valid Attributes > Note: You cannot make Transactions against a 'Template' To create 'Item Variants' against a 'Template' select 'Make Variants' -Make Variants +Make Variants -Make Variants +Make Variants To learn more about setting Attributes Master check [Item Attributes](/docs/user/manual/en/stock/setup/item-attribute.html) @@ -41,12 +41,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" Setup Item Variant by Manufacturer + 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 Setup Item Variant by Manufacturer + 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" @@ -55,4 +55,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 Item Variant Settings + src='{{docs_base_url}}/assets/img/stock/item_variants_settings.png'> diff --git a/erpnext/docs/user/manual/en/stock/item/purchase-details.md b/erpnext/docs/user/manual/en/stock/item/purchase-details.md index 3de1724923..134d551d46 100644 --- a/erpnext/docs/user/manual/en/stock/item/purchase-details.md +++ b/erpnext/docs/user/manual/en/stock/item/purchase-details.md @@ -4,4 +4,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. -Item Warranty \ No newline at end of file +Item Warranty \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/item/reorder.md b/erpnext/docs/user/manual/en/stock/item/reorder.md index 06caa2c075..548a8a9ad0 100644 --- a/erpnext/docs/user/manual/en/stock/item/reorder.md +++ b/erpnext/docs/user/manual/en/stock/item/reorder.md @@ -10,4 +10,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. -Item Reorder \ No newline at end of file +Item Reorder \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md index c3ba13ceb6..96b9cea7e4 100644 --- a/erpnext/docs/user/manual/en/stock/material-request.md +++ b/erpnext/docs/user/manual/en/stock/material-request.md @@ -3,7 +3,7 @@ A Material Request is a simple document identifying a requirement of a set of Items (products or services) for a particular reason. -Material Request +Material Request To generate a Material Request manually go to: @@ -11,7 +11,7 @@ To generate a Material Request manually go to: #### Creating Material Request -Material Request +Material Request A Material Request can be generated: diff --git a/erpnext/docs/user/manual/en/stock/projected-quantity.md b/erpnext/docs/user/manual/en/stock/projected-quantity.md index e02b2c3010..2f432fcb0a 100644 --- a/erpnext/docs/user/manual/en/stock/projected-quantity.md +++ b/erpnext/docs/user/manual/en/stock/projected-quantity.md @@ -13,7 +13,7 @@ maintained to serve unexpected demands. Having a tight control of the projected inventory is crucial to determine shortages and to calculate the right order quantity. -Projected Quantity +Projected Quantity > Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty - diff --git a/erpnext/docs/user/manual/en/stock/purchase-receipt.md b/erpnext/docs/user/manual/en/stock/purchase-receipt.md index 523b0fa9a0..7241d31244 100644 --- a/erpnext/docs/user/manual/en/stock/purchase-receipt.md +++ b/erpnext/docs/user/manual/en/stock/purchase-receipt.md @@ -12,7 +12,7 @@ You can make a Purchase Receipt directly from: or from a “Submitted” Purchase Order, by clicking on “Make Purchase Receipt”. -Purchase Receipt +Purchase Receipt ### Rejections diff --git a/erpnext/docs/user/manual/en/stock/purchase-return.md b/erpnext/docs/user/manual/en/stock/purchase-return.md index 2b630341d9..4096452c73 100644 --- a/erpnext/docs/user/manual/en/stock/purchase-return.md +++ b/erpnext/docs/user/manual/en/stock/purchase-return.md @@ -8,16 +8,16 @@ You can create a Purchase Return by simply making a Purchase Receipt with negati First open the original Purchase Receipt, against which supplier delivered the items. -Original Purchase Receipt +Original Purchase Receipt Then click on "Make Purchase Return", it will open a new Purchase Receipt with "Is Return" checked, items and taxes with negative amount. -Return Against Purchase Receipt +Return Against Purchase Receipt On submission of Return Purchase Return, system will decrease item qty from the mentioned warehouse. To maintain correct stock valuation, stock balance will also go up according to the original purchase rate of the returned items. -Return Stock Ledger +Return Stock Ledger If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger. -Return Stock Ledger \ No newline at end of file +Return Stock Ledger \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/retain-sample-stock.md b/erpnext/docs/user/manual/en/stock/retain-sample-stock.md index 0f8199a0a2..12e737fc43 100644 --- a/erpnext/docs/user/manual/en/stock/retain-sample-stock.md +++ b/erpnext/docs/user/manual/en/stock/retain-sample-stock.md @@ -6,21 +6,21 @@ A sample of a batch of starting material, packaging material or finished product It is advised to create a new warehouse just for retaining samples and not use it in production. -Sample Retention Warehouse +Sample Retention Warehouse ### 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. -Retain Sample +Retain Sample ### 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. -Retain Sample +Retain Sample 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. -Retain Sample \ No newline at end of file +Retain Sample \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/sales-return.md b/erpnext/docs/user/manual/en/stock/sales-return.md index 1ba17c2709..6b2ee1c6ae 100644 --- a/erpnext/docs/user/manual/en/stock/sales-return.md +++ b/erpnext/docs/user/manual/en/stock/sales-return.md @@ -8,22 +8,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. -Original Delivery Note +Original Delivery Note Then click on "Make Sales Return", it will open a new Delivery Note with "Is Return" checked, items and taxes with negative amount. -Return Against Delivery Note +Return Against Delivery Note You can also create the return entry against original Sales Invoice, to return stock along with credit note, check "Update Stock" option in Return Sales Invoice. -Return Against Sales Invoice +Return Against Sales Invoice On submission of Return Delivery Note / Sales Invoice, system will increase stock balance in the mentioned warehouse. To maintain correct stock valuation, stock balance will go up according to the original purchase rate of the returned items. -Return Stock Ledger +Return Stock Ledger In case of Return Sales Invoice, Customer account will be credited and associated income and tax account will be debited. If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger. -Return Stock Ledger \ No newline at end of file +Return Stock Ledger \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/serial-no.md b/erpnext/docs/user/manual/en/stock/serial-no.md index cb766ba044..015812497c 100644 --- a/erpnext/docs/user/manual/en/stock/serial-no.md +++ b/erpnext/docs/user/manual/en/stock/serial-no.md @@ -22,7 +22,7 @@ Stock transaction (Stock Entry, Purchase Receipt, Delivery Note, Sales Invoice). When a new Serial No is created directly, its warehouse cannot be set. -Serial Number +Serial Number * The Status is set based on Stock Entry. diff --git a/erpnext/docs/user/manual/en/stock/setup/item-attribute.md b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md index a6e0eecb2f..8d37afc10f 100644 --- a/erpnext/docs/user/manual/en/stock/setup/item-attribute.md +++ b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md @@ -2,17 +2,17 @@ You can define Attributes and attribute values for your Item Variants here. -Attribute Master +Attribute Master #### Non Numeric Attributes * For Non Numeric Attributes, specify attributes values along with its abbreviation in the Attribute Value Table. -Attribute Master +Attribute Master #### Numeric Attributes * If your attribute is Numeric, select Numeric Values * Specify the Range and the Increment Value -Attribute Master +Attribute Master diff --git a/erpnext/docs/user/manual/en/stock/setup/item-group.md b/erpnext/docs/user/manual/en/stock/setup/item-group.md index a2800901ac..667f29f1d2 100644 --- a/erpnext/docs/user/manual/en/stock/setup/item-group.md +++ b/erpnext/docs/user/manual/en/stock/setup/item-group.md @@ -7,7 +7,7 @@ product is used as a raw-material, you have to name it under the Raw-material category. In case, your product is used only in trading, you can categorise it under Trading. -Item Group Tree +Item Group Tree ### Create a Item Group @@ -15,7 +15,7 @@ under Trading. * Select 'Add Child' -Add Item Group +Add Item Group ### Delete an Item Group @@ -23,6 +23,6 @@ under Trading. * Select 'delete' -Add Item Group +Add Item Group {next} diff --git a/erpnext/docs/user/manual/en/stock/setup/stock-settings.md b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md index 96d1627a59..91718b3966 100644 --- a/erpnext/docs/user/manual/en/stock/setup/stock-settings.md +++ b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md @@ -2,7 +2,7 @@ You can set default settings for your stock related transactions here. -Stock Settings +Stock Settings ### Clean HTML Description diff --git a/erpnext/docs/user/manual/en/stock/stock-entry.md b/erpnext/docs/user/manual/en/stock/stock-entry.md index e2ac6a1433..e931b88a98 100644 --- a/erpnext/docs/user/manual/en/stock/stock-entry.md +++ b/erpnext/docs/user/manual/en/stock/stock-entry.md @@ -7,7 +7,7 @@ To make a Stock Entry you have to go to: > Stock > Stock Entry > New -Stock Entry +Stock Entry Stock Entries can be made for the following purposes: @@ -29,15 +29,15 @@ If the stock entry is an incoming entry i.e any item is receiving at a target wa To add additional costs, enter the description and amount of the cost in the Additional Costs table. -Stock Entry Additional Costs +Stock Entry Additional Costs The added additional costs will be distributed among the receiving items (where the target warehouse mentioned) proportionately based on Basic Amount of the items. And the distributed additional cost will be added to the basic rate of the item, to calculate valuation rate. -Stock Entry Item Valuation Rate +Stock Entry Item Valuation Rate If perpetual inventory system is enabled, additional costs will be booked in "Expense Included In Valuation" account. -Additional Costs General Ledger +Additional Costs General Ledger > **Note:** To update Stock from a spreadsheet, see [Stock Reconciliation]({{doc_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html). diff --git a/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md index a11759d233..979b1554d1 100644 --- a/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md +++ b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md @@ -22,7 +22,7 @@ You can update landed cost any time in the future via Landed Cost Voucher. In the document, you can select multiple Purchase Receipts and fetch all items from those Purchase Receipts. Then you should add applicable charges in “Taxes and Charges” table. You can easily delete an item if the added charges is not applicable to that item. The added charges are proportionately distributed among all the items based their amount. -Landed Cost Vouher +Landed Cost Vouher ### What happend on submission? diff --git a/erpnext/docs/user/manual/en/stock/tools/packing-slip.md b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md index 60cfb5d138..11543ee4ce 100644 --- a/erpnext/docs/user/manual/en/stock/tools/packing-slip.md +++ b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md @@ -4,6 +4,6 @@ A packing slip is a document listing the items in a shipment. Usually attached t While Shipping a product 'Draft' for Delivery Notes are created. You can make a Packing Slip from these Delivery Notes (Draft) -Packing Slip +Packing Slip {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md index 254da8a477..3d0331a589 100644 --- a/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md +++ b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md @@ -5,6 +5,6 @@ Inspection. To enable ERPNext to perform this function, go to : > Stock > Quality Inspection > New -Quality Inspection +Quality Inspection {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/warehouse.md b/erpnext/docs/user/manual/en/stock/warehouse.md index d90e3f9b10..7c49463685 100644 --- a/erpnext/docs/user/manual/en/stock/warehouse.md +++ b/erpnext/docs/user/manual/en/stock/warehouse.md @@ -14,7 +14,7 @@ This can become quite a detailed Tree like >Warehouse >Room >Row >Shelf >Box To go to Warehouse, click on Stock and go to Warehouse under Setup. You could also switch to 'Tree' View or simply type warehouse tree in the awsone bar. -Warehouse +Warehouse In ERPNext, every Warehouse must belong to a specific company, to maintain company wise stock balance. In order to do so each Warehouse is linked with an diff --git a/erpnext/docs/user/manual/en/support/issue.md b/erpnext/docs/user/manual/en/support/issue.md index 56d0058e02..7fa535b76d 100644 --- a/erpnext/docs/user/manual/en/support/issue.md +++ b/erpnext/docs/user/manual/en/support/issue.md @@ -13,7 +13,7 @@ Frappé system. > Support > Issue > New Issue -Issue +Issue #### Discussion Thread diff --git a/erpnext/docs/user/manual/en/support/maintenance-schedule.md b/erpnext/docs/user/manual/en/support/maintenance-schedule.md index a9be3b9918..fa624892d0 100644 --- a/erpnext/docs/user/manual/en/support/maintenance-schedule.md +++ b/erpnext/docs/user/manual/en/support/maintenance-schedule.md @@ -12,7 +12,7 @@ To create a new Maintenance Schedule go to: > Support > Maintenance Schedule > New Maintenance Schedule -Maintenance Schedule +Maintenance Schedule In the Maintenance Schedule, there are two sections: diff --git a/erpnext/docs/user/manual/en/support/maintenance-visit.md b/erpnext/docs/user/manual/en/support/maintenance-visit.md index 5bda36a795..87afd4a173 100644 --- a/erpnext/docs/user/manual/en/support/maintenance-visit.md +++ b/erpnext/docs/user/manual/en/support/maintenance-visit.md @@ -6,7 +6,7 @@ Maintenance Visit from: > Support > Maintenance Visit > New Maintenance Visit -Maintenance Visit +Maintenance Visit The Maintenance Visit contains information about the: diff --git a/erpnext/docs/user/manual/en/support/support_reports.md b/erpnext/docs/user/manual/en/support/support_reports.md index 7ef6ceac0d..e136694e5c 100644 --- a/erpnext/docs/user/manual/en/support/support_reports.md +++ b/erpnext/docs/user/manual/en/support/support_reports.md @@ -7,4 +7,4 @@ This report provide the information about the time slot along with the count of > Support > Reports > Support Hours -Maintenance Visit +Maintenance Visit diff --git a/erpnext/docs/user/manual/en/support/warranty-claim.md b/erpnext/docs/user/manual/en/support/warranty-claim.md index 8080e654af..abe2c357ad 100644 --- a/erpnext/docs/user/manual/en/support/warranty-claim.md +++ b/erpnext/docs/user/manual/en/support/warranty-claim.md @@ -17,7 +17,7 @@ To create a new **Warranty Claim**: > Support > Warranty Claim > New Warranty Claim -![Warranty Claim](/docs/assets/img/support/warranty-claim.png) +![Warranty Claim]({{docs_base_url}}/assets/img/support/warranty-claim.png) If a Customer visit is required to address the issue, you can create a new Maintenance Visit record from this. diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md b/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md index 482f12f1aa..a556dde1da 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md @@ -10,9 +10,9 @@ Global Search helps users find information quickly. It’s located in the upper ### Using Awesome bar for Global Search. -Global Search +Global Search ### Enable Global Search for fields in a Doctype. -Global Search +Global Search diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md index e5188e2d2a..cd538cf991 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md @@ -4,6 +4,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. -Emailing Attachments +Emailing Attachments \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md index e7434f0d3a..f0f42c0f2e 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md @@ -8,11 +8,11 @@ There are several ways to attach file to the document. ####From Browser -Sales Order File Attachment +Sales Order File Attachment ####By drag and drop -Sales Order File Attachment +Sales Order File Attachment Click on Attach to browse and select the file. @@ -20,7 +20,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. -Sales Order Select File +Sales Order Select File `For hosted users, limit of 5 MB is applied on file size.` diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md index 874d0d7814..a753358389 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md @@ -10,7 +10,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. -Data File +Data File #### Step 2: Upload Data File @@ -20,7 +20,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. -![Upload Data](/docs/assets/img/articles/Selection_0173436a8.png) +![Upload Data]({{docs_base_url}}/assets/img/articles/Selection_0173436a8.png) {next} diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md index 5e79638ab4..76cdeb73fb 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md @@ -2,7 +2,7 @@ Links option shows one document is linked to which other documents. Check Menu for the Links options. -Cancel Doc +Cancel Doc ####Scenario @@ -18,6 +18,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. -Cancel Doc +Cancel Doc \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md index d624ffb88c..8d7700a902 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md @@ -12,18 +12,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. -Cancel Doc +Cancel Doc ####Step 2: Delete Document After cancellation, go to Menu and click on Delete. -Delete Doc +Delete Doc ####Step 3: Deleting from List For bulk deletion, you can select multiple Cancelled records and delete at once from the List View. -Delete Doc from List +Delete Doc from List \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md index c8d78a0caa..69b4ecf3e5 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md @@ -10,6 +10,6 @@ You will find Copy option under: `Menu > Copy` -Duplicate +Duplicate \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md b/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md index 4f8b2e9ea3..fd570481e4 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md @@ -4,11 +4,11 @@ In the reports, Letter Head is fetched from the Company master. To have company' `Explore > Accounts > Company` -Company Letter +Company Letter 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. -Default Letter Head +Default Letter Head 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/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md index 64672fa8bf..f03bbd8247 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md @@ -12,7 +12,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. -Sales Order File Attachment +Sales Order File Attachment #### Step 3: Merge Account @@ -20,7 +20,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. -Sales Order File Attachment +Sales Order File Attachment ###Effect of Merging diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md b/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md index b8e13ad531..839e820afc 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md @@ -4,7 +4,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. -POS View +POS View For creating POS Invoice, check following help video. diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md index f96bcb5ac9..23bfaa476c 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md @@ -8,7 +8,7 @@ Using Renaming feature, you can change ID of a master documents like Item, Wareh #### 2. Rename -Renamed Item +Renamed Item ###Effect of Renaming diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md index ec15a35937..8a0a67b3ab 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md @@ -8,20 +8,20 @@ Each filter option has three fields. Select field of the document based on which you wish to filter records. -Search Filter Field +Search Filter Field #### 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: -Search Filter Based On +Search Filter Based On #### 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. -Search Filter Based On +Search Filter Based On You can apply multiple filters at a time. To remove specific filter, just click on cancelled (X) sign ahead of it. @@ -30,6 +30,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. -Renamed Item +Renamed Item diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md index 53b886486c..a68f483d15 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md +++ b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md @@ -12,12 +12,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. -Account +Account #### 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. -Renamed Account +Renamed Account \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/using-erpnext/assignment.md b/erpnext/docs/user/manual/en/using-erpnext/assignment.md index ffd0abd1db..6fcc34ef4a 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/assignment.md +++ b/erpnext/docs/user/manual/en/using-erpnext/assignment.md @@ -12,13 +12,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. -Assign +Assign #### 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. -Assign +Assign With assignment, you can also leave a comment for the review of assignee. @@ -26,13 +26,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. -Assign +Assign ####Removing Assignment User will be able to remove assignment by clicking on "Assignment Completed" button in the document. -Assign +Assign Once assignment is set as completed, the Status of its ToDo record will be set as Closed. diff --git a/erpnext/docs/user/manual/en/using-erpnext/calendar.md b/erpnext/docs/user/manual/en/using-erpnext/calendar.md index bf0412bea7..9003c8e055 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/calendar.md +++ b/erpnext/docs/user/manual/en/using-erpnext/calendar.md @@ -4,7 +4,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. -Calendar +Calendar ### Creating Events in Calendar @@ -14,7 +14,7 @@ To create event manually, you should first determine Calendar View. If Event's s This view will 24 hours of a day broken in various slots. You should click on slot for Event Start Time, and drag it down till you reach event end time. -Calendar +Calendar Based on the selection of time slot, Start Time and End Time will be updated in the Event master. Then you can set subject for an event, and save it. @@ -22,7 +22,7 @@ Based on the selection of time slot, Start Time and End Time will be updated in In the Lead form, you will find a field called Next Contact By and Next Contact Date. Event will be auto created for date and person specified in this field. -Lead Event +Lead Event #### Birthday Event @@ -33,7 +33,7 @@ Birthday Event is created based on Date of Birth specified in the Employee maste You can set events as recurring in specific interval by Checking the "Repeat This Event". -Calendar Recurring Event +Calendar Recurring Event ### Event Reminders @@ -43,7 +43,7 @@ There are two ways you can receive email reminder for an event. In the Event master, checking "Send an email reminder in the morning" will trigger notification email to all the participants for this event. -Calendar Recurring Event +Calendar Recurring Event #### Create Email Digest @@ -53,6 +53,6 @@ Email Digest can be set from: `Setup > Email > Email Digest` -Calendar Recurring Event +Calendar Recurring Event {next} diff --git a/erpnext/docs/user/manual/en/using-erpnext/chat.md b/erpnext/docs/user/manual/en/using-erpnext/chat.md index 867c4b45e8..4c92a202db 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/chat.md +++ b/erpnext/docs/user/manual/en/using-erpnext/chat.md @@ -7,10 +7,10 @@ You can send and receive messages from the system by using the Messages tool. If you send a message to a user, and the user is logged in, it will appear as a popup message and the unread messages counter in the top toolbar will be updated. -Assign +Assign You can choose to send message to all the users, or to specific user. -Assign +Assign {next} diff --git a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md index b0cf94553f..b143dff895 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md +++ b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md @@ -11,13 +11,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. -Assign +Assign ###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. -Assign +Assign ### Tags diff --git a/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md b/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md index 75c4e6d7e5..bbcdc55dab 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md +++ b/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md @@ -6,16 +6,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. -Enable Versioning +Enable Versioning ####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 Links +Version Links ####Version Details In the Version document, you will find log of all the fields and values changes in it. -Version Details \ No newline at end of file +Version Details \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/using-erpnext/notes.md b/erpnext/docs/user/manual/en/using-erpnext/notes.md index 91c1689344..1a18b9bb78 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/notes.md +++ b/erpnext/docs/user/manual/en/using-erpnext/notes.md @@ -8,12 +8,12 @@ You can store your long notes under this section. It can contain your partner li Enter Title and Context. -Note New +Note New ####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. -Note New +Note New {next} diff --git a/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md b/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md index eba61bb855..2c60d3505a 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md +++ b/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md @@ -2,7 +2,7 @@ In ERPNext, you can delete a records if not needed. They can be masters like Items, Customer or transactions like Sales Order, Payment Entries etc. -Delete a Docuemnt +Delete a Docuemnt If you have deleted an entry by mistake and wish to restore it back into your ERPNext account. @@ -14,18 +14,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. -Deleted Docs List +Deleted Docs List ####Step 2: Open Doc and Restore Open the document to be restored from the list. Click on Restore button. -Restored Doc +Restored Doc ####Step 3: Restored Once a document is restored, you will be able to use it for creating entries in your ERPNext account. -Restored Doc +Restored Doc > If canceled document is deleted, then it will not be restored. diff --git a/erpnext/docs/user/manual/en/using-erpnext/tags.md b/erpnext/docs/user/manual/en/using-erpnext/tags.md index 99a6aac81a..547ef7d39a 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/tags.md +++ b/erpnext/docs/user/manual/en/using-erpnext/tags.md @@ -2,10 +2,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. -Assign +Assign ERPNext will also show you all the important tags in the document list. -Assign +Assign {next} diff --git a/erpnext/docs/user/manual/en/using-erpnext/to-do.md b/erpnext/docs/user/manual/en/using-erpnext/to-do.md index c6cd280757..e1d4da503b 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/to-do.md +++ b/erpnext/docs/user/manual/en/using-erpnext/to-do.md @@ -2,10 +2,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. -Assign +Assign When task is completed, you should simply remove assignment from the assigned document. With this, task will be removed from your Todo list as well. For Todo which are not assigned via document, you can set their status as Closed from the Todo master itself. -Assign +Assign {next} diff --git a/erpnext/docs/user/manual/en/website/add-products-to-website.md b/erpnext/docs/user/manual/en/website/add-products-to-website.md index e1489193ed..bb5106f525 100644 --- a/erpnext/docs/user/manual/en/website/add-products-to-website.md +++ b/erpnext/docs/user/manual/en/website/add-products-to-website.md @@ -13,14 +13,14 @@ To edit a catalog item go to: `Stock > Items and Pricing > Item`. From there se For this example, click on the **New** button to create a new item. Fill in the form and then click **Save**. -![New Website Item 01](/docs/assets/img/articles/new-item-for-website-01.png) +![New Website Item 01]({{docs_base_url}}/assets/img/articles/new-item-for-website-01.png) #### Step 2: Save Image 1. Click the new item from the list to edit it. 1. In the upper left, click the image block to give the product a picture. Be sure to uncheck the **Private** box so the image will be publicly viewable. -![New Website Item 02](/docs/assets/img/articles/new-item-for-website-02.png) +![New Website Item 02]({{docs_base_url}}/assets/img/articles/new-item-for-website-02.png) #### Step 3: Check the 'Show in Website' box @@ -28,17 +28,17 @@ Under the Website section near the bottom of the form, check the box that says * * Give the page a route on the website. -![New Website Item 03](/docs/assets/img/articles/new-item-for-website-03.png) +![New Website Item 03]({{docs_base_url}}/assets/img/articles/new-item-for-website-03.png) #### Step 4: Enter Website Details Once the `Show in Website` checkbox is checked, a new section called **Website Specifications** appears. Expand this section to add more details about the rocking chair to the website. -![New Website Item 04](/docs/assets/img/articles/new-item-for-website-04.png) +![New Website Item 04]({{docs_base_url}}/assets/img/articles/new-item-for-website-04.png) Click **Save** in the upper right and then click `See on Website` on the left under the product image to see the item on your website. -![New Website Item 05](/docs/assets/img/articles/new-item-for-website-05.png) +![New Website Item 05]({{docs_base_url}}/assets/img/articles/new-item-for-website-05.png) ### Item Groups @@ -49,17 +49,17 @@ Items can be grouped together in items groups. To see a listing of the existing * Fill in a description for your products page. * Click **Save**. -![New Website Item 06](/docs/assets/img/articles/new-item-for-website-06.png) +![New Website Item 06]({{docs_base_url}}/assets/img/articles/new-item-for-website-06.png) * Go back to the rocking chair item, expand the **website** section. * Click **Add new row** button under the `Item Group` table. * Select `Products` from the list. * Click **Save**. -![New Website Item 07](/docs/assets/img/articles/new-item-for-website-07.png) +![New Website Item 07]({{docs_base_url}}/assets/img/articles/new-item-for-website-07.png) To see on the website, go back to the `Item Group` and then click **See on website**. -![New Website Item 08](/docs/assets/img/articles/new-item-for-website-08.png) +![New Website Item 08]({{docs_base_url}}/assets/img/articles/new-item-for-website-08.png) {next} diff --git a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md index 33793e2c37..b2250e0548 100644 --- a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md +++ b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md @@ -2,7 +2,7 @@ Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page. -Website User Signup +Website User Signup As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext. diff --git a/erpnext/docs/user/manual/en/website/articles/website-banner.md b/erpnext/docs/user/manual/en/website/articles/website-banner.md index 514e23e58d..a16f7768cd 100644 --- a/erpnext/docs/user/manual/en/website/articles/website-banner.md +++ b/erpnext/docs/user/manual/en/website/articles/website-banner.md @@ -6,4 +6,4 @@ Each ERPNext account website automatically generated from it. On a website, logo For the exact steps on how to upload a Website Banner and resize it, please refer to the help given below. -Website Banner image \ No newline at end of file +Website Banner image \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/website/articles/website-home-page.md b/erpnext/docs/user/manual/en/website/articles/website-home-page.md index 92bcc77d1f..d44a31aad2 100644 --- a/erpnext/docs/user/manual/en/website/articles/website-home-page.md +++ b/erpnext/docs/user/manual/en/website/articles/website-home-page.md @@ -18,7 +18,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. -![Website Setting Home](/docs/assets/img/articles/Selection_021.png) +![Website Setting Home]({{docs_base_url}}/assets/img/articles/Selection_021.png) #### **Step 4: Save Website Settings Form.** diff --git a/erpnext/docs/user/manual/en/website/articles/website-security.md b/erpnext/docs/user/manual/en/website/articles/website-security.md index eb4223f944..ef7986a6c4 100644 --- a/erpnext/docs/user/manual/en/website/articles/website-security.md +++ b/erpnext/docs/user/manual/en/website/articles/website-security.md @@ -4,8 +4,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/erpnext/docs/user/manual/en/website/blog-post.md b/erpnext/docs/user/manual/en/website/blog-post.md index e6f7960354..2b270e2ac5 100644 --- a/erpnext/docs/user/manual/en/website/blog-post.md +++ b/erpnext/docs/user/manual/en/website/blog-post.md @@ -10,13 +10,13 @@ To create a new blog, just create a new Blog from: > Website > Blog > New Blog -Blog Post +Blog Post You can format a blog using the Markdown format.You can also access your blog by going to the page “blog.html”. #### A sample blog-page. -Blog Sample +Blog Sample {next} diff --git a/erpnext/docs/user/manual/en/website/blogger.md b/erpnext/docs/user/manual/en/website/blogger.md index a47bdeec7b..469ada1287 100644 --- a/erpnext/docs/user/manual/en/website/blogger.md +++ b/erpnext/docs/user/manual/en/website/blogger.md @@ -3,6 +3,6 @@ Blogger is a user who can post blogs. You can mention a short bio about the blogger and also set a avatar here. -Blogger +Blogger {next} diff --git a/erpnext/docs/user/manual/en/website/setup/website-settings.md b/erpnext/docs/user/manual/en/website/setup/website-settings.md index 6d5ad2321a..75f9872120 100644 --- a/erpnext/docs/user/manual/en/website/setup/website-settings.md +++ b/erpnext/docs/user/manual/en/website/setup/website-settings.md @@ -2,7 +2,7 @@ Most of the website related settings can be defined here. -Website Settings +Website Settings ####Landing Page @@ -16,7 +16,7 @@ Most of the website related settings can be defined here. Select the theme for the website. You can create new Theme for you website also. -Website Theme +Website Theme * Select 'create new website theme' if you wish to customize the default website theme. @@ -25,13 +25,13 @@ Select the theme for the website. You can create new Theme for you website also. You can add a banner/ logo to your website here. Attach the image and click on set banner from Image. An HTML code will be generated by the system under Banner HTML. -Banner +Banner ####Top Bar You can set the menus items in the Top Bar here. -Top Bar +Top Bar * Similarlly you can also set sidebar and footer links. @@ -39,7 +39,7 @@ You can set the menus items in the Top Bar here. You can integrate the website using Google Analytics and enable social media sharing for post shared on the website. -Integrations +Integrations * You can disable public signup to your ERPNext account by checking 'disable signup' diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md index 8fe5244a3d..26284f5237 100644 --- a/erpnext/docs/user/manual/en/website/shopping-cart.md +++ b/erpnext/docs/user/manual/en/website/shopping-cart.md @@ -16,7 +16,7 @@ To set up a shopping cart, go to the website module. #### Enter Company Details and Checkout Details. -Shopping Cart Settings +Shopping Cart Settings To make item available on website go to Item master. @@ -24,11 +24,11 @@ To make item available on website go to Item master. #### Enable Item for website. -Item +Item #### Enter Website Specifications for Item. -Website Specifications +Website Specifications ### Shop using Shopping Cart @@ -37,20 +37,20 @@ To make item available on website go to Item master. Click on "Add to Cart" to add item to shopping cart. -Website Specifications +Website Specifications #### Goto Checkout Click on "Go to Cart" to checkout or on "Cart" which is on upper right side of the screen. -Website Specifications +Website Specifications #### Checkout Change quantity, select Shipping and Billing Address and click on "Place Order" to place the order. -Website Specifications +Website Specifications {next} diff --git a/erpnext/docs/user/manual/en/website/web-form.md b/erpnext/docs/user/manual/en/website/web-form.md index b75ef0b0a1..1668ac06a7 100644 --- a/erpnext/docs/user/manual/en/website/web-form.md +++ b/erpnext/docs/user/manual/en/website/web-form.md @@ -17,7 +17,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. -Web Form +Web Form --- @@ -25,7 +25,7 @@ To create a new **Web Form** go to: Once you create the web form, you can view it on the url and test it out! -Web form +Web form --- diff --git a/erpnext/docs/user/manual/en/website/web-page.md b/erpnext/docs/user/manual/en/website/web-page.md index f931f024d4..5b4d46beed 100644 --- a/erpnext/docs/user/manual/en/website/web-page.md +++ b/erpnext/docs/user/manual/en/website/web-page.md @@ -6,7 +6,7 @@ To create a new Web Page, go to: > Website > Web Page > New -Web Page +Web Page #### Title diff --git a/erpnext/docs/user/manual/es/accounts/accounting-reports.md b/erpnext/docs/user/manual/es/accounts/accounting-reports.md index a887f9a81f..7827e1ad85 100644 --- a/erpnext/docs/user/manual/es/accounts/accounting-reports.md +++ b/erpnext/docs/user/manual/es/accounts/accounting-reports.md @@ -14,7 +14,7 @@ actualizado de todas las entradas que existan para una cuetna dada en un periodo determinado. Libro Mayor + src="{{docs_base_url}}/assets/img/accounts/general-ledger.png"> ### Balance Contable @@ -26,7 +26,7 @@ en una fecha particular. Para cada cuenta proporciona: * Creditos * Cierre -Balance Contable +Balance Contable La suma de todos los balances de cierre en el Balance Contable debe ser igual a cero. @@ -35,7 +35,7 @@ La suma de todos los balances de cierre en el Balance Contable debe ser igual a Este reporte permite hacer seguimiento a las facturas enviadas a los clientes y proveedores. En este reporte, se resaltan diferentes periodos de tiempo. p.e. entre 0-30 días, 30-60 días y así por el estilo. -Accounts Receivable +Accounts Receivable ### Registro de Ventas y Compras @@ -43,7 +43,7 @@ En este reporte, cada cuenta de impuestos es transpuesta en columnas. For cada f se puede obtener la cantidad de impuestos individuales que debe ser pagados, de acuerdo a la tabla de Impuestos y Contribuciones, -Sales Register +Sales Register **Trabajo en progreso.** diff --git a/erpnext/docs/user/manual/es/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/es/accounts/advance-payment-entry.md index e373c7b8a7..2778f29820 100644 --- a/erpnext/docs/user/manual/es/accounts/advance-payment-entry.md +++ b/erpnext/docs/user/manual/es/accounts/advance-payment-entry.md @@ -26,7 +26,7 @@ the row "Is Advance" click 'Yes'. #### Figure 1 : Journal Entry -Advance Entry -Advace Payment +Advace Payment ### Double Entry Accounting @@ -43,7 +43,7 @@ will be credited because it has given value. #### Figure 2: Transaction and Difference Entry -Advace Payment +Advace Payment Save and submit the JV. If this document is not saved it will not be pulled in other accounting documents. @@ -57,7 +57,7 @@ advance in the advances table. The accounting will be adjusted accordingly. #### Figure 3: Receive Advance -Advace Payment +Advace Payment Save and submit the Sales Invoice. diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md index 31e710a309..25d85c4138 100644 --- a/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md +++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md @@ -2,12 +2,12 @@ Criterios de evaluación es el parámetro basado en el que se evalúa el estudiante. -Assessment Criteria +Assessment Criteria Después de la evaluación para un curso, las calificaciones obtenidas se ingresan en base a los criterios de evaluación. Por ejemplo, si la evaluación se llevó a cabo para el tema de la ciencia, entonces usted puede evaluar al estudiante en ciencia en varios criterios como la escritura, prácticas, presentación, etc Los Criterios de Evaluación se usan al programar el Plan de Evaluación para el Grupo de Estudiantes y el Curso. -Assessment Plan Criteria +Assessment Plan Criteria {next} diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md index aaabda1aaa..ce37fe0dd7 100644 --- a/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md +++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md @@ -4,10 +4,10 @@ La estructura del grupo de evaluación es un maestro donde se puede definir la j Por ejemplo, si realiza dos evaluaciones en un año académico, configure el Grupo de evaluación de la siguiente manera. -Assessment Group Term +Assessment Group Term En la misma línea, también puede definir varios Grupo de Evaluación basado sobre la evaluación llevada a cabo en su instituto. -Assessment Group Term +Assessment Group Term {next} diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md index 566189241f..eab8b008a3 100644 --- a/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md +++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md @@ -10,10 +10,10 @@ Para programar una evaluación/examinación para un Grupo de Estudiantes, para u 4. Examinador y Supervisor -Assessment Plan Details +Assessment Plan Details 5. Los Criterios de Evaluación son la lista de criterios basados ​​en que cada estudiante en será evaluado y los grados serán asignados. -Assessment Plan Criteria +Assessment Plan Criteria {next} diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md index 67a6f9a509..14bf16abfe 100644 --- a/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md +++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md @@ -2,6 +2,6 @@ El resultado de la evaluación es un registro de las calificaciones obtenidas por el estudiante para una evaluación específica. El resultado de la evaluación se crea en el backend en base a los puntos en [Herramienta de Resultados de Evaluación](/docs/user/manual/es/education/assessment/assessment_result_tool.html). -Assessment Result +Assessment Result {next} diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md index a6a44e5bee..b05be7ec48 100644 --- a/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md +++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md @@ -3,7 +3,7 @@ Herramienta de resultados de evaluación le ayuda a ingresar las calificaciones obtenidas por los estudiantes para un curso específico. En esta herramienta, basada en el plan de evaluación, todos los estudiantes van a ser filtrados dentro de la herramienta de resultados de la evaluación. También, Columnas para los Criterios de Evaluación serán donde las calificaciones ganadas pueden ser ingresadas para cada Estudiante. -Assessment Result Tool +Assessment Result Tool A medida que vaya introduciendo las notas para un Estudiante y cambie al siguiente alumno, en el backend, el registro de Resultados del Estudiante se creará automáticamente para ese Estudiante. diff --git a/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md b/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md index bf362b4dac..ebd1069c58 100644 --- a/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md +++ b/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md @@ -2,6 +2,6 @@ En la escala de calificación, puedes definir varios grados y límites para los estudiantes. Basado en la calificación obtenida por el estudiante en la evaluación, el grado (Grade) será asignado. -Grading Scale +Grading Scale {next} diff --git a/erpnext/docs/user/manual/es/education/admission/program-enrollment.md b/erpnext/docs/user/manual/es/education/admission/program-enrollment.md index 6a242849a8..f55a577d58 100644 --- a/erpnext/docs/user/manual/es/education/admission/program-enrollment.md +++ b/erpnext/docs/user/manual/es/education/admission/program-enrollment.md @@ -2,6 +2,6 @@ Este formulario te permite inscribir un estudiante a un programa. Un estudiante puede ser inscrito en multiples programas. -Student Applicant Enrollment +Student Applicant Enrollment {next} diff --git a/erpnext/docs/user/manual/es/education/admission/student-applicant.md b/erpnext/docs/user/manual/es/education/admission/student-applicant.md index 4d8723c20c..b50e69cff7 100644 --- a/erpnext/docs/user/manual/es/education/admission/student-applicant.md +++ b/erpnext/docs/user/manual/es/education/admission/student-applicant.md @@ -3,7 +3,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. -Student Applicant +Student Applicant ### Estados de la Aplicación @@ -23,6 +23,6 @@ Puedes Aprobar o Rechazar una aplicación de estudiante. Aceptando una aplicaci Una vez aprobada una Aplicación de Estudiante, puedes inscribirlo a un programa. Cuando le das click al butón 'Inscribir', el sistema creará un estudiante usando esa aplicación y le va a redireccionar a el [Formulario de Inscripción al Programa](/docs/user/manual/es/education/student/program-enrollment.html). -Student Applicant Enrollment +Student Applicant Enrollment {next} diff --git a/erpnext/docs/user/manual/es/education/fees/fee-category.md b/erpnext/docs/user/manual/es/education/fees/fee-category.md index a38ba7e812..bd62a0c411 100644 --- a/erpnext/docs/user/manual/es/education/fees/fee-category.md +++ b/erpnext/docs/user/manual/es/education/fees/fee-category.md @@ -2,6 +2,6 @@ Todos los tipos diferentes de cuotas que se cobran -Fees Category +Fees Category {next} diff --git a/erpnext/docs/user/manual/es/education/fees/fee-structure.md b/erpnext/docs/user/manual/es/education/fees/fee-structure.md index 6fe6af98c2..0fa187ecf3 100644 --- a/erpnext/docs/user/manual/es/education/fees/fee-structure.md +++ b/erpnext/docs/user/manual/es/education/fees/fee-structure.md @@ -2,6 +2,6 @@ Una Estructura de Cuota es una plantilla que puede ser usada cuando se hacen registros de cuotas. -Fees Structure +Fees Structure {next} diff --git a/erpnext/docs/user/manual/es/education/fees/fees.md b/erpnext/docs/user/manual/es/education/fees/fees.md index 5f6eee4bfd..bfbd48e7f1 100644 --- a/erpnext/docs/user/manual/es/education/fees/fees.md +++ b/erpnext/docs/user/manual/es/education/fees/fees.md @@ -3,6 +3,6 @@ Mantiene un registro de todas las cuotas recolectadas de los estudiantes. La [Estructura de Cuota](/docs/user/manual/es/education/fees/fee-structure.html) es seleccionada basada en el programa seleccionada y los Términos Académicos. -Fees +Fees {next} diff --git a/erpnext/docs/user/manual/es/education/fees/index.md b/erpnext/docs/user/manual/es/education/fees/index.md index c1b5bb57cc..a183fdc991 100644 --- a/erpnext/docs/user/manual/es/education/fees/index.md +++ b/erpnext/docs/user/manual/es/education/fees/index.md @@ -2,7 +2,7 @@ Esta sección contiene todos los documentos relacionado a las 'Cuota' -Fees Section +Fees Section ### Temas diff --git a/erpnext/docs/user/manual/es/education/index.md b/erpnext/docs/user/manual/es/education/index.md index feca8303c0..c95004eb0a 100644 --- a/erpnext/docs/user/manual/es/education/index.md +++ b/erpnext/docs/user/manual/es/education/index.md @@ -3,6 +3,6 @@ Los módulos de School estan diseñados para satisfacer los requerimientos de Escuelas, Colegios e Institutos Educacionales. -Fees Section +Fees Section {index} diff --git a/erpnext/docs/user/manual/es/education/schedule/course-schedule.md b/erpnext/docs/user/manual/es/education/schedule/course-schedule.md index 7bf40ffacf..014728bdaa 100644 --- a/erpnext/docs/user/manual/es/education/schedule/course-schedule.md +++ b/erpnext/docs/user/manual/es/education/schedule/course-schedule.md @@ -3,13 +3,13 @@ El Horario de Curso es el horario de una sesión de un profesor para un Curso en particular. Puedes ver un resumen del horario del curso en la vista de Calendario. -Course Schedule +Course Schedule ### Marcando asistencia Puedes pasar la asistencia para un grupo de estudiantes usando el Horario de Curso. -Course Schedule Attendance +Course Schedule Attendance - Para hacer la asistencia, expandir la sección de asistencia. - Selecciona los estudiantes que estaban presentes para esa sesión. @@ -20,6 +20,6 @@ Puedes pasar la asistencia para un grupo de estudiantes usando el Horario de Cur Una vez hayas marcado la asistencia usando la sección de asistencia en el Horario de un Curso, esta sección debería estar oculta. Un botón de Ver Asistencia debería aparecer. Click en el botón para ver todos los registros de asistencia creados para ese Horario de Curso. -Course Schedule Attendance +Course Schedule Attendance {next} diff --git a/erpnext/docs/user/manual/es/education/schedule/examination.md b/erpnext/docs/user/manual/es/education/schedule/examination.md index b8cef3e977..9f614b7884 100644 --- a/erpnext/docs/user/manual/es/education/schedule/examination.md +++ b/erpnext/docs/user/manual/es/education/schedule/examination.md @@ -2,7 +2,7 @@ El registro de examinación puede ser usado para hacer el seguimiento del horario de los examenes y los resultados de los mismos. -Examination +Examination {next} diff --git a/erpnext/docs/user/manual/es/education/schedule/index.md b/erpnext/docs/user/manual/es/education/schedule/index.md index 016aa1009a..c077ed9005 100644 --- a/erpnext/docs/user/manual/es/education/schedule/index.md +++ b/erpnext/docs/user/manual/es/education/schedule/index.md @@ -1,6 +1,6 @@ # Horario -Schedule Section +Schedule Section ### Temas diff --git a/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md b/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md index 55ff425c7f..752ad1ad5c 100644 --- a/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md +++ b/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md @@ -2,7 +2,7 @@ Esta herramienta puede ser usada para crear los Horarios de los Cursos. -Scheduling Tool +Scheduling Tool ### Creando Horarios de Cursos diff --git a/erpnext/docs/user/manual/es/education/schedule/student-attendance.md b/erpnext/docs/user/manual/es/education/schedule/student-attendance.md index 53bd4e938c..1ae7555b12 100644 --- a/erpnext/docs/user/manual/es/education/schedule/student-attendance.md +++ b/erpnext/docs/user/manual/es/education/schedule/student-attendance.md @@ -2,6 +2,6 @@ Mantiene los registros de la asistencia del estudiante. Los registros de asistencia pueden ser creados sobre los horarios de los cursos (Course Schedules). -Student Attendance +Student Attendance {next} diff --git a/erpnext/docs/user/manual/es/education/setup/academic-term.md b/erpnext/docs/user/manual/es/education/setup/academic-term.md index 7a6b405607..5938e592ac 100644 --- a/erpnext/docs/user/manual/es/education/setup/academic-term.md +++ b/erpnext/docs/user/manual/es/education/setup/academic-term.md @@ -1,6 +1,6 @@ # Término Académico -Academic Term +Academic Term {next} diff --git a/erpnext/docs/user/manual/es/education/setup/academic-year.md b/erpnext/docs/user/manual/es/education/setup/academic-year.md index 7fe2a8f5f2..2dfa7a4b11 100644 --- a/erpnext/docs/user/manual/es/education/setup/academic-year.md +++ b/erpnext/docs/user/manual/es/education/setup/academic-year.md @@ -1,5 +1,5 @@ # Año Académico -Academic Year +Academic Year {next} diff --git a/erpnext/docs/user/manual/es/education/setup/course.md b/erpnext/docs/user/manual/es/education/setup/course.md index fbbce625fd..25fbf1b8f0 100644 --- a/erpnext/docs/user/manual/es/education/setup/course.md +++ b/erpnext/docs/user/manual/es/education/setup/course.md @@ -1,5 +1,5 @@ # Curso -Course +Course {next} diff --git a/erpnext/docs/user/manual/es/education/setup/index.md b/erpnext/docs/user/manual/es/education/setup/index.md index 59df99502e..f23f754f09 100644 --- a/erpnext/docs/user/manual/es/education/setup/index.md +++ b/erpnext/docs/user/manual/es/education/setup/index.md @@ -1,6 +1,6 @@ # Configuración -Setup Section +Setup Section ### Temas diff --git a/erpnext/docs/user/manual/es/education/setup/instructor.md b/erpnext/docs/user/manual/es/education/setup/instructor.md index 4812c15856..b92141f5c2 100644 --- a/erpnext/docs/user/manual/es/education/setup/instructor.md +++ b/erpnext/docs/user/manual/es/education/setup/instructor.md @@ -1,5 +1,5 @@ # Instructor -Instructor +Instructor {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/es/education/setup/program.md b/erpnext/docs/user/manual/es/education/setup/program.md index 123605786a..4c4725c287 100644 --- a/erpnext/docs/user/manual/es/education/setup/program.md +++ b/erpnext/docs/user/manual/es/education/setup/program.md @@ -1,5 +1,5 @@ # Programa -Program +Program {next} diff --git a/erpnext/docs/user/manual/es/education/setup/room.md b/erpnext/docs/user/manual/es/education/setup/room.md index 7750dcfabb..23667b116b 100644 --- a/erpnext/docs/user/manual/es/education/setup/room.md +++ b/erpnext/docs/user/manual/es/education/setup/room.md @@ -1,6 +1,6 @@ # Aula -Room +Room {next} diff --git a/erpnext/docs/user/manual/es/education/student/student-batch.md b/erpnext/docs/user/manual/es/education/student/student-batch.md index bb7c9d56fb..7ff67b9a4a 100644 --- a/erpnext/docs/user/manual/es/education/student/student-batch.md +++ b/erpnext/docs/user/manual/es/education/student/student-batch.md @@ -3,6 +3,6 @@ Un lote de estudiantes es una colección de estudiantes desde los Grupos de Estudiantes. -Student +Student {next} diff --git a/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md b/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md index 942fadfce7..c89410299c 100644 --- a/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md +++ b/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md @@ -3,6 +3,6 @@ Esta herramienta te permite crear grupos de estudiantes. Puedes especificar multiples parámetros para crearlos. -Student Group Creation Tool +Student Group Creation Tool {next} diff --git a/erpnext/docs/user/manual/es/education/student/student-group.md b/erpnext/docs/user/manual/es/education/student/student-group.md index 59dfcbc275..d8f3955e36 100644 --- a/erpnext/docs/user/manual/es/education/student/student-group.md +++ b/erpnext/docs/user/manual/es/education/student/student-group.md @@ -3,6 +3,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. -Student Group +Student Group {next} diff --git a/erpnext/docs/user/manual/es/education/student/student-log.md b/erpnext/docs/user/manual/es/education/student/student-log.md index e5a5e2cb4f..72ccbfad38 100644 --- a/erpnext/docs/user/manual/es/education/student/student-log.md +++ b/erpnext/docs/user/manual/es/education/student/student-log.md @@ -3,6 +3,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' -Student +Student {next} diff --git a/erpnext/docs/user/manual/es/education/student/student.md b/erpnext/docs/user/manual/es/education/student/student.md index 21724a71b9..cbf437d77a 100644 --- a/erpnext/docs/user/manual/es/education/student/student.md +++ b/erpnext/docs/user/manual/es/education/student/student.md @@ -5,6 +5,6 @@ El doctype de Estudiante mantiene los detalles personales de los estudiantes. Puedes ver todo lo relacionado a un estudiante en particular en esta página. Ejemplo: Pagos, Grupo de Estudiante, etc. -Student +Student {next} diff --git a/erpnext/docs/user/manual/es/introduction/key-workflows.md b/erpnext/docs/user/manual/es/introduction/key-workflows.md index 6877fb3d02..cb066380af 100644 --- a/erpnext/docs/user/manual/es/introduction/key-workflows.md +++ b/erpnext/docs/user/manual/es/introduction/key-workflows.md @@ -6,7 +6,7 @@ Este diagrama no cubre toda la funcionalidad o características de ERPNext. ![](/docs/assets/old_images/erpnext/overview.png) -Workflow +Workflow _Nota: No todos los pasos son obligatorios. ERPNext te permite pasar algunos pasos si deseas simplificar el proceso._ diff --git a/erpnext/docs/user/manual/es/introduction/the-champion.md b/erpnext/docs/user/manual/es/introduction/the-champion.md index 0d2106e220..5978078bc1 100644 --- a/erpnext/docs/user/manual/es/introduction/the-champion.md +++ b/erpnext/docs/user/manual/es/introduction/the-champion.md @@ -4,7 +4,7 @@

    El campeón

    -Champion +Champion Hemos visto docenas de implementaciones de sistemas ERP en los últimos años y nos hemos dado cuenta que una implementación exitosa es más sobre cosas intangibles y actitudes. diff --git a/erpnext/docs/user/manual/es/projects/activity-cost.md b/erpnext/docs/user/manual/es/projects/activity-cost.md index 71eb15e432..8738175143 100644 --- a/erpnext/docs/user/manual/es/projects/activity-cost.md +++ b/erpnext/docs/user/manual/es/projects/activity-cost.md @@ -3,4 +3,4 @@ El costo de la actividad registra la tasa de facturación por hora y la tasa de costos de un empleado en comparación con un tipo de actividad. El sistema hace uso de esta tasa mientras hace registros de tiempo. Se usa para Costeo de proyectos. -Activity Cost +Activity Cost diff --git a/erpnext/docs/user/manual/es/projects/activity-type.md b/erpnext/docs/user/manual/es/projects/activity-type.md index 20a03e2932..9e0c777f01 100644 --- a/erpnext/docs/user/manual/es/projects/activity-type.md +++ b/erpnext/docs/user/manual/es/projects/activity-type.md @@ -2,7 +2,7 @@ Los tipos de actividad son la lista de los diferentes tipos de actividades sobre las que se hacen registro de tiempo. -Activity Type +Activity Type Por defecto, los siguientes tipos de actividades son creados. diff --git a/erpnext/docs/user/manual/es/projects/articles/project-costing.md b/erpnext/docs/user/manual/es/projects/articles/project-costing.md index a8820c7e29..feb3f29870 100644 --- a/erpnext/docs/user/manual/es/projects/articles/project-costing.md +++ b/erpnext/docs/user/manual/es/projects/articles/project-costing.md @@ -13,17 +13,17 @@ Tipo de actividad es un maestro de los servicios ofrecidos por su personal. Pued Costo de actividad es un maestro donde puedes hacer el seguimiento de los montos de facturación y costo de cada empleado, y por cada tipo de Tipo de Actividad. -Activity Cost +Activity Cost #### Registro de Tiempo Basados en el tiempo actual invertido en una Tarea del Proyecto, El empleado va a crear un registro de tiempo. -Time Log +Time Log Al momento de seleccionar el Tipo de Actividad en el Registro de tiempo, el monto de Facturación y Costo del empleado va a ser traído de su respectivo registro en el master de Costo de Actividad. -Time Log Costing +Time Log Costing Multiplicando esos montos con el total de número de horas en el registro de tiempo, nos da el monto de costos y Facturación para el registro de tiempo específico. @@ -31,10 +31,10 @@ Multiplicando esos montos con el total de número de horas en el registro de tie Basados en el total de registros de tiempos creados por una tarea en específico, su costo va a ser actualizado en el registro maestro de la tarea, o sea, en el detalle de la tarea. -Costing in Task +Costing in Task De la misma manera, el detalle del Proyecto va a actualizar su costo basado en el total de registros de tiempo a ese proyecto, y las tareas asociadas a ese proyecto. -Costing in Project +Costing in Project \ No newline at end of file diff --git a/erpnext/docs/user/manual/es/projects/project.md b/erpnext/docs/user/manual/es/projects/project.md index 942433b47b..94a7c7323e 100644 --- a/erpnext/docs/user/manual/es/projects/project.md +++ b/erpnext/docs/user/manual/es/projects/project.md @@ -2,7 +2,7 @@ El manejo de proyectos en ERPNext se hace a traves de tareas. Puedes crear un proyecto y asignar varias tareas al mismo. -Project +Project También puedes hacer el seguimiento del % completado del proyecto usando diferentes métodos. @@ -10,35 +10,35 @@ También puedes hacer el seguimiento del % completado del proyecto usando difere 2. Progreso de tareas 3. Peso de tarea -Project +Project Algunos ejemplos de como el % completado es cálculado basado en tareas. -Project +Project -Project +Project ### Manejando tareas Los proyecto pueden ser divididos en multiples tareas. Las tareas pueden ser creadas a traves del documento de Proyecto o pueden ser creadas via [Tarea](/docs/user/manual/en/projects/tasks.html) -Project +Project * Para ver las tareas creadas a un proyecto click en 'Tasks' -Project - View Task +Project - View Task -Project - Task List +Project - Task List * También puedes ver las tareas desde la misma vista del proyecto. -Project - Task Grid +Project - Task Grid * Para agregar peso a las tareas puedes seguir los pasos siguientes -Project - Task Grid -Project - Task Grid +Project - Task Grid +Project - Task Grid ### Manejando tiempo @@ -49,13 +49,13 @@ El tiempo actual de inicio y finalización junto con el costo deben ser actualiz * Para ver los Registros de Tiempo realizados a un proyecto, dar click en 'Time Logs' -Project - View Time Log +Project - View Time Log -Project - Time Log List +Project - Time Log List * Puedes agregar un registro de tiempo directamente y luego asociarlo con el proyecto. -Project - Link Time Log +Project - Link Time Log ### Gestión de gastos @@ -64,27 +64,27 @@ El sistema actualizará el monto total de las reclamaciones de gastos en la secc * Para ver las reclamaciones de gastos realizadas en un proyecto, haga clic en 'Reclamaciones de gastos' -Project - View Expense Claim +Project - View Expense Claim * También puede crear un Reclamo de gastos directamente y vincularlo al Proyecto. -Project - Link Expense Claim +Project - Link Expense Claim * El monto total de los Reclamos de gastos reservados contra un proyecto se muestra en 'Reclamo de gastos totales' en la Sección de Costos del proyecto -Project - Total Expense Claim +Project - Total Expense Claim ### Centro de Costo Puedes crear un [Cost Center](/docs/user/manual/en/accounts/setup/cost-center.html) sobre un proyecto o usar un centro de costo existente para hacer el seguimiento de todos los gastos realizados al proyecto. -Project - Cost Center +Project - Cost Center ###Costeo del proyecto La sección Costeo del proyecto le ayuda a rastrear el tiempo y los gastos incurridos en relación con el proyecto. -Project - Costing +Project - Costing * La sección de cálculo de costos se actualiza según los registros de tiempo realizados. @@ -94,7 +94,7 @@ La sección Costeo del proyecto le ayuda a rastrear el tiempo y los gastos incur Puedes crear/enlazar una [Sales Order](/docs/user/manual/en/selling/sales-order.html) a un proyecto. Una vez asociada puedes usar el módulo de ventas para facturar a un cliente sobre el proyecto. -Project - Sales Order +Project - Sales Order ###Gantt Chart @@ -103,8 +103,8 @@ ERPNext te provee con una vista para visualizar las tareas de forma calendarizad * Para visualizar el gantt chart de un proyecto, ve hasta el proyecto y dar click en 'Gantt Chart' -Project - View Gantt Chart +Project - View Gantt Chart -Project - Gantt Chart +Project - Gantt Chart {next} diff --git a/erpnext/docs/user/manual/es/projects/tasks.md b/erpnext/docs/user/manual/es/projects/tasks.md index b07b305b7a..7af7296743 100644 --- a/erpnext/docs/user/manual/es/projects/tasks.md +++ b/erpnext/docs/user/manual/es/projects/tasks.md @@ -3,13 +3,13 @@ Proyecto es dividido en Tareas. En ERPNext, puedes crear las tareas de forma independiente. -Task +Task ### Estado de una Tarea Una tarea puede tener uno de los siguientes estados - Abierto, Trabajando, Pendiente de Revisión, Cerrado, o Cancelado. -Task - Status +Task - Status * Por defecto, cada nueva tarea creada se le establece el estado 'Abierto'. @@ -19,7 +19,7 @@ Una tarea puede tener uno de los siguientes estados - Abierto, Trabajando, Pendi Puedes especificar una lista de tareas dependientes en la sección 'Depende de' -Depends On +Depends On * No puedes cerrar una tarea padre hasta que todas las tareas dependientes esten cerradas. @@ -33,13 +33,13 @@ El tiempo de inicio y fin actual junto con el costo es actualizado en base al Re * Para ver el Registro de tiempo realizado a una tarea, dar click en 'Time Logs' -Task - View Time Log +Task - View Time Log -Task - Time Log List +Task - Time Log List * Puedes también crear un Registro de Tiempo directamente y luego asociarlo a una Tarea. -Task - Link Time Log +Task - Link Time Log ### Gestión de gastos @@ -48,14 +48,14 @@ El sistema actualizará el monto total de las reclamaciones de gastos en la secc * Para ver las reclamaciones de gastos realizadas en un proyecto, haga clic en 'Reclamaciones de gastos' -Task - View Expense Claim +Task - View Expense Claim * También puede crear un Reclamo de gastos directamente y vincularlo al Proyecto. -Task - Link Expense Claim +Task - Link Expense Claim * El monto total de los Reclamos de gastos reservados contra un proyecto se muestra en 'Reclamo de gastos totales' en la Sección de Costos del proyecto -Task - Total Expense Claim +Task - Total Expense Claim {next} diff --git a/erpnext/docs/user/manual/es/projects/time-log-batch.md b/erpnext/docs/user/manual/es/projects/time-log-batch.md index 72c77b4ff8..c211fd316a 100644 --- a/erpnext/docs/user/manual/es/projects/time-log-batch.md +++ b/erpnext/docs/user/manual/es/projects/time-log-batch.md @@ -8,17 +8,17 @@ O Simplemente abra su lista de registro de tiempo y marque los elementos que desea agregar al registro de tiempo. A continuación, haga clic en el botón "Crear hoja de tiempo" y se seleccionarán estos registros de tiempo. -Time Log - Drag Calender +Time Log - Drag Calender ###Creando Factura de Venta * Despues de crear la Hoja de Tiempo/Horario, el botón "Crear Factura" debe aparecer. -Time Log - Drag Calender +Time Log - Drag Calender * Haga clic en ese botón para hacer una factura de venta usando la hoja de tiempo. -Time Log - Drag Calender +Time Log - Drag Calender * Cuando "Presente" la Factura de Ventas, el número de Factura de Ventas se actualizará en los Registros de Tiempo y la Hoja de Horario y su estado cambiará a "Facturado".