diff --git a/erpnext/docs/assets/img/accounts/bank-reconciliation-2.png b/erpnext/docs/assets/img/accounts/bank-reconciliation-2.png new file mode 100644 index 00000000000..cc3132cccc7 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/bank-reconciliation-2.png differ diff --git a/erpnext/docs/assets/img/accounts/company_default_inventory_account.png b/erpnext/docs/assets/img/accounts/company_default_inventory_account.png deleted file mode 100644 index 4ce2867c353..00000000000 Binary files a/erpnext/docs/assets/img/accounts/company_default_inventory_account.png and /dev/null differ diff --git a/erpnext/docs/assets/img/accounts/inventory_account.png b/erpnext/docs/assets/img/accounts/inventory_account.png deleted file mode 100644 index e085f5ba830..00000000000 Binary files a/erpnext/docs/assets/img/accounts/inventory_account.png and /dev/null differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-2.png b/erpnext/docs/assets/img/accounts/perpetual-2.png deleted file mode 100644 index 5a2b20b21d0..00000000000 Binary files a/erpnext/docs/assets/img/accounts/perpetual-2.png and /dev/null differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-3.png b/erpnext/docs/assets/img/accounts/perpetual-3.png deleted file mode 100644 index faa77245c5e..00000000000 Binary files a/erpnext/docs/assets/img/accounts/perpetual-3.png and /dev/null differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-dn-gl-5.png b/erpnext/docs/assets/img/accounts/perpetual-dn-gl-5.png new file mode 100644 index 00000000000..190280f2682 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-dn-gl-5.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-dn-sl-4.png b/erpnext/docs/assets/img/accounts/perpetual-dn-sl-4.png new file mode 100644 index 00000000000..79b0ca10176 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-dn-sl-4.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-inv-gl-7.png b/erpnext/docs/assets/img/accounts/perpetual-inv-gl-7.png new file mode 100644 index 00000000000..7b6f7e34169 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-inv-gl-7.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-inv-sl-6.png b/erpnext/docs/assets/img/accounts/perpetual-inv-sl-6.png new file mode 100644 index 00000000000..d7f4c61f4e1 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-inv-sl-6.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-pinv-gl-3.png b/erpnext/docs/assets/img/accounts/perpetual-pinv-gl-3.png new file mode 100644 index 00000000000..054a002e79c Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-pinv-gl-3.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-receipt-gl-2.png b/erpnext/docs/assets/img/accounts/perpetual-receipt-gl-2.png new file mode 100644 index 00000000000..e6190eccee8 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-receipt-gl-2.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-receipt-sl-1.png b/erpnext/docs/assets/img/accounts/perpetual-receipt-sl-1.png new file mode 100644 index 00000000000..5f886382798 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-receipt-sl-1.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-st-issue-gl.png b/erpnext/docs/assets/img/accounts/perpetual-st-issue-gl.png new file mode 100644 index 00000000000..257946347cc Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-st-issue-gl.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-st-issue-sl.png b/erpnext/docs/assets/img/accounts/perpetual-st-issue-sl.png new file mode 100644 index 00000000000..dc9b1b59c79 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-st-issue-sl.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-st-receipt-gl.png b/erpnext/docs/assets/img/accounts/perpetual-st-receipt-gl.png new file mode 100644 index 00000000000..ff192ce83e7 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-st-receipt-gl.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-st-receipt-sl.png b/erpnext/docs/assets/img/accounts/perpetual-st-receipt-sl.png new file mode 100644 index 00000000000..6d183b6f71b Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-st-receipt-sl.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-st-transfer-gl.png b/erpnext/docs/assets/img/accounts/perpetual-st-transfer-gl.png new file mode 100644 index 00000000000..551ebbc3fab Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-st-transfer-gl.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-st-transfer-sl.png b/erpnext/docs/assets/img/accounts/perpetual-st-transfer-sl.png new file mode 100644 index 00000000000..a848d66c99f Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-st-transfer-sl.png differ diff --git a/erpnext/docs/assets/img/collaboration-tools/calendar-7.png b/erpnext/docs/assets/img/collaboration-tools/calendar-7.png deleted file mode 100644 index ac7a93cc101..00000000000 Binary files a/erpnext/docs/assets/img/collaboration-tools/calendar-7.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/calender-email-digest.png b/erpnext/docs/assets/img/collaboration-tools/calender-email-digest.png similarity index 76% rename from erpnext/docs/assets/old_images/erpnext/calender-email-digest.png rename to erpnext/docs/assets/img/collaboration-tools/calender-email-digest.png index 1d95ef44d33..e8c9a4c64eb 100644 Binary files a/erpnext/docs/assets/old_images/erpnext/calender-email-digest.png and b/erpnext/docs/assets/img/collaboration-tools/calender-email-digest.png differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-10.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-10.png deleted file mode 100644 index eea5d736cd8..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-10.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-11.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-11.png deleted file mode 100644 index a29c0e51376..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-11.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-12.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-12.png deleted file mode 100644 index 91433712bdf..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-12.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-13.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-13.png deleted file mode 100644 index a250fd0fe1e..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-13.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-14.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-14.png deleted file mode 100644 index 5ce57e87849..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-14.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-4.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-4.png deleted file mode 100644 index 9370e86780c..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-4.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-5.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-5.png deleted file mode 100644 index cbe25e72ce2..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-5.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-6.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-6.png deleted file mode 100644 index 30509311982..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-6.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-7.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-7.png deleted file mode 100644 index dbe669efb0d..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-7.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-8.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-8.png deleted file mode 100644 index bfa951666d7..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-8.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-9.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-9.png deleted file mode 100644 index 4f3fa7e4248..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-9.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/auto-notification.png b/erpnext/docs/assets/old_images/erpnext/auto-notification.png deleted file mode 100644 index 1331a72fc16..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/auto-notification.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/backup-manager.png b/erpnext/docs/assets/old_images/erpnext/backup-manager.png deleted file mode 100644 index 3483a1f085a..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/backup-manager.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/bank-reconciliation-2.png b/erpnext/docs/assets/old_images/erpnext/bank-reconciliation-2.png deleted file mode 100644 index 2fec1e68a26..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/bank-reconciliation-2.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/budgeting-4.png b/erpnext/docs/assets/old_images/erpnext/budgeting-4.png deleted file mode 100644 index 17683e3bdf9..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/budgeting-4.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/budgeting.png b/erpnext/docs/assets/old_images/erpnext/budgeting.png deleted file mode 100644 index 809d6d191e9..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/budgeting.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-lead.png b/erpnext/docs/assets/old_images/erpnext/calender-event-lead.png deleted file mode 100644 index dc6eb8b6b1a..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/calender-event-lead.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-manually.png b/erpnext/docs/assets/old_images/erpnext/calender-event-manually.png deleted file mode 100644 index 84cb3430fa0..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/calender-event-manually.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-notification.png b/erpnext/docs/assets/old_images/erpnext/calender-event-notification.png deleted file mode 100644 index fa1e4ffcc64..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/calender-event-notification.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-permission.png b/erpnext/docs/assets/old_images/erpnext/calender-event-permission.png deleted file mode 100644 index 783f968f235..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/calender-event-permission.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png b/erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png deleted file mode 100644 index 6147cf52681..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/dropbox-access.png b/erpnext/docs/assets/old_images/erpnext/dropbox-access.png deleted file mode 100644 index 7aa6cec00d1..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/dropbox-access.png and /dev/null differ diff --git a/erpnext/docs/user/manual/de/accounts/budgeting.md b/erpnext/docs/user/manual/de/accounts/budgeting.md index 1a2082c0eca..88ef1798029 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 -![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-1.png) - -Forderungen +Budget #### Schritt 2: Monatliche Verteilung eingeben -![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-2-1.png) + +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 -![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-3.png) + +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. -![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-4.png) +Monthly Distribution Das kann über die Firmenstammdaten eingestellt werden. -![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-4-1.png) +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/setup/cost-center.md b/erpnext/docs/user/manual/de/accounts/setup/cost-center.md index 22f5e46f9ed..be42c805a23 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]({{docs_base_url}}/assets/old_images/erpnext/chart-of-cost-centers.png) +Kostenstellenplan Kostenstellen helfen Ihnen bei der Erstellung von Budgets für Geschäftstätigkeiten. diff --git a/erpnext/docs/user/manual/de/setting-up/third-party-backups.md b/erpnext/docs/user/manual/de/setting-up/third-party-backups.md deleted file mode 100644 index ba53f5e76e1..00000000000 --- a/erpnext/docs/user/manual/de/setting-up/third-party-backups.md +++ /dev/null @@ -1,49 +0,0 @@ -# Drittpartei-Datensicherungen -Beigetragen von CWT Connector & Wire Technology GmbH - -Wenn Sie Ihre Daten regelmäßig auf Dropbox sichern möchten, können Sie das direkt über ERPNext tun. - -> Einstellungen > Einbindungen > Dropbox-Datensicherung - -**Schritt 1:** Klicken Sie auf Einstellungen, dann auf Einbindungen - -**Schritt 2:** Klicken Sie auf Dropbox-Datensicherung - -### Abbildung 1: Dropbox-Datensicherung - -![Drittparteien-Datensicherung]({{docs_base_url}}/assets/old_images/erpnext/third-party-backups.png) - -Geben Sie auf der Seite "Dropbox-Datensicherung" die E-Mail-Adressen der Menschen ein, die über den Sicherungsstatus informiert werden sollen. Unter dem Punkt "Häufigkeit des Hochladens" geben Sie an, ob die Daten täglich oder wöchentlich gesichert werden sollen. - -**Schritt 3:** Klicken Sie auf **Dropbox-Zugang zulassen** - -> Tipp: Wenn Sie in der Zukunft keine Datensicherungen mehr auf Dropbox sichern wollen, dann demarkieren Sie das Feld "Datensicherungen zur Dropbox senden". - -### Abbildung 2: "Dropbox-Zugang zulassen" - -![Backup Manager]({{docs_base_url}}/assets/old_images/erpnext/backup-manager.png) - -Sie müssen sich mit Ihrer ID und Ihrem Passwort an Ihrem Dropbox-Konto anmelden. - -![Dropbox-Zugriff]({{docs_base_url}}/assets/old_images/erpnext/dropbox-access.png) - -## Für OpenSource-Nutzer - -Voreinstellungen: - -pip install dropbox - -pip install google-api-python-client - -### Erstellen Sie in der Dropbox eine Anwendung - -Legen Sie zuerst ein Dropbox-Konto an und erstellen Sie dann eine neue Anwendung (https://www.dropbox.com/developers/apps). Wenn Sie das Konto erfolgreich angelegt haben, erhalten Sie app_key, app_secret und access_type. Bearbeiten Sie nun site_config.json Ihrer Seite (/frappe-bench/sites/your-site/) und fügen Sie die folgenden Zeilen hinzu: - -* "dropbox_access_key": "app_key", und -* "dropbox_secret_key": "app_secret" - -Dann können Sie zum Modul "Einbindungen" gehen und "Dropbox-Zugang zulassen". - -> Hinweis: Bitte stellen Sie sicher, dass Ihr Browser Popups zulässt. - -{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 9a7f4311daf..f0e1f7a6886 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 @@ -66,9 +66,9 @@ Kontenplan #### Kaufbeleg -Nehmen wir an, Sie haben 10 Stück des Artikels "RM0001" zu 200€ und 5 Stück des Artikels "Tisch" zu **100€** vom Lieferanten "East Wind Inc." eingekauft. Im Folgenden finden Sie die Details des Kaufbelegs: +Nehmen wir an, Sie haben 10 Stück des Artikels "RM0001" zu 200€ und 5 Stück des Artikels "Tisch" zu **100€** vom Lieferanten "Arcu Vel Quam Fabricators" eingekauft. Im Folgenden finden Sie die Details des Kaufbelegs: -**Supplier:** East Wind Inc. +**Supplier:** Arcu Vel Quam Fabricators **Artikel:** @@ -133,11 +133,11 @@ Nehmen wir an, Sie haben 10 Stück des Artikels "RM0001" zu 200€ und 5 Stück

Lagerbuch

-![Lagerbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-2.png) +Lagerbuch **Hauptbuch:** -![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-3.png) +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]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-4.png) +Hauptbuch Hier wird das Konto "Lagerware erhalten aber noch nicht bewertet" belastet und hebt den Effekt des Kaufbeleges auf. @@ -157,9 +157,9 @@ Hier wird das Konto "Lagerware erhalten aber noch nicht bewertet" belastet und h ### Lieferschein -Nehmen wir an, dass Sie eine Kundenbestellung von "Jane Doe" über 5 Stück des Artikels "RM0001" zu 300€ haben. Im Folgenden sehen Sie die Details des Lieferscheins. +Nehmen wir an, dass Sie eine Kundenbestellung von "Utah Automation Services" über 5 Stück des Artikels "RM0001" zu 300€ haben. Im Folgenden sehen Sie die Details des Lieferscheins. -**Kunde:** Jane Doe +**Kunde:** Utah Automation Services **Artikel:** @@ -206,18 +206,15 @@ Nehmen wir an, dass Sie eine Kundenbestellung von "Jane Doe" über 5 Stück des **Lagerbuch** -![Lagerbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-5.png) +Lagerbuch **Hauptbuch** -![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-6.png) +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. - - - - + In diesem Beispiel gehen wir davon aus, dass wir als Berwertungsmethode FIFO verwenden. Bewertungpreis = Einkaufpreis + In der Bewertung enthaltene Abgaben/Gebühren = 200 + (250 * (2000 / 2500) / 10) @@ -225,20 +222,20 @@ Da der Artikel aus dem Lager "In Verkaufsstellen" geliefert wird, wird das Konto Gesamtsumme der Bewertung = 220 * 5 = 1100 - * * * ### Ausgangsrechnung mit Lageraktualisierung + Nehmen wir an, dass Sie zur obigen Bestellung keinen Lieferschein erstellt haben sondern direkt eine Ausgangsrechnung mit der Option "Lager aktualisieren" erstellt haben. Die Details der Ausgangsrechnung sind die gleichen wie bei obigem Lieferschein. **Lagerbuch** -![Lagerbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-7.png) +Lagerbuch **Hauptbuch** -![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-8.png) +Hauptbuch Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten "In Verkaufsstellen" und "Selbstkosten" basierend auf der Bewertung beeinflusst. @@ -271,11 +268,11 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten **Lagerbuch** -![Lagerbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-9.png) +Lagerbuch **Hauptbuch** -![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-10.png) +Hauptbuch * * * @@ -306,11 +303,11 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten **Lagerbuch** -![Lagerbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-11.png) +Lagerbuch **Hauptbuch** -![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-12.png) +Hauptbuch * * * @@ -343,22 +340,8 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten **Lagerbuch** -![Lagerbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-13.png) +Lagerbuch **Hauptbuch** -![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-14.png) - - - - - - - - - - - - - - +Hauptbuch \ No newline at end of file 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 3bfc24c55f8..87348eebbd1 100644 --- a/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md +++ b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md @@ -1,26 +1,20 @@ ### Bank Reconciliation Statement -If you are receiving payments or making payments via cheques, the bank statements will not accurately match the dates of your entry, this is because the bank usually takes time to “clear” these payments. Also you may have -mailed a cheque to your Supplier and it may be a few days before it is received and deposited by the Supplier. In ERPNext you can synchronise your bank statements and your Journal Entries using the “Bank Reconciliation” -tool. +If you are receiving payments or making payments via cheques, the bank statements will not accurately match the dates of your entry, this is because the bank usually takes time to “clear” these payments. Also you may have mailed a cheque to your Supplier and it may be a few days before it is received and deposited by the Supplier. In ERPNext you can synchronise your bank statements and your Journal Entries using the “Bank Reconciliation” tool. The Bank Reconciliation Report provide the difference between the bank balance shown in an organisation's bank statement, as provided by the ban against amount shown in the companies Chart of Accounts. ####Bank Reconciliation Statement -![]({{docs_base_url}}/assets/old_images/erpnext/bank-reconciliation-2.png) +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. -To add clearance entries go to: - -> Accounts > Tools > Bank Reconciliation - ###Bank Reconciliation Tool -o use this, go to: +To add clearance entries go to: -> Accounts > Tools > Bank Reconciliation +`Accounts > Tools > Bank Reconciliation` Select your “Bank” Account and enter the dates of your statement. Here you will get all the “Bank Voucher” type entries. In each of the entry on the 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 f0203627bfb..ad448b0ae2a 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 @@ -1,8 +1,8 @@ # Email Accounts -You can manage multiple incoming and outgoing Email Accounts in ERPNext. There has to be atleast one default outgoing account and one default incoming account. If you are on the ERPNext cloud, the default outgoing email is set by us. +You can manage multiple incoming and outgoing Email Accounts in ERPNext. There has to be at-least one default outgoing account and one default incoming account. If you are on the ERPNext cloud, the default outgoing email is set by us. -> **Note for self implementers:** For outgoing emails, you should setup your own SMTP server or sign up with an SMTP relay service like mandrill.com or sendgrid.com that allows a larger number of transactional emails to be sent. Regular email services like GMail will restrict you to a limited number of emails per day. +> **Note for self implementers:** For outgoing emails, you should setup your own SMTP server or sign up with an SMTP relay service like mandrill.com or sendgrid.com that allows a larger number of transactional emails to be sent. Regular email services like Gmail will restrict you to a limited number of emails per day. ### Default Email Accounts diff --git a/erpnext/docs/user/manual/en/setting-up/third-party-backups.md b/erpnext/docs/user/manual/en/setting-up/third-party-backups.md deleted file mode 100644 index c4e74ca4a02..00000000000 --- a/erpnext/docs/user/manual/en/setting-up/third-party-backups.md +++ /dev/null @@ -1,54 +0,0 @@ -If you wish to store your backups on a periodic basis,on Dropbox, you can do -it directly through ERPNext. - -> Setup > Manage 3rd Party Backups - -__Step 1:__ Click on Setup. - -__Step 2:__ Click on Manage Third Party Backup - -#### Figure 1: Manage Third Party Backup - -![Third Party Backups]({{docs_base_url}}/assets/old_images/erpnext/third-party-backups.png) - -On the Backup Manager page, enter the email addresses of those people whom you -wish to notify about the upload status. Under the topic 'Sync with Dropbox', -select whether you wish to upload Daily, Weekly or Never. - -__Step 3__ Click on **Allow Dropbox Access**. - -> Tip: In future, if you wish to discontinue uploading backups to dropbox, -then select the Never option. - -#### Figure 2: Allow Dropbox Access - -![Backup Manager]({{docs_base_url}}/assets/old_images/erpnext/backup-manager.png) - -You need to login to your dropbox account, with your user id and password. - -![Dropbox Access]({{docs_base_url}}/assets/old_images/erpnext/dropbox-access.png) - -## Open Source Users - -Installing Pre-Requisites - - - - pip install dropbox - pip install google-api-python-client - - - - -#### Create an App in Dropbox - -First create your Dropbox account and create a new app (https://www.dropbox.com/developers/apps). -After successful creation of account you will receive `app_key`, `app_secret` and `access_type`. Now edit `site_config.json` of your site (/frappe-bench/sites/your-site/) and add the following lines: -- `"dropbox_access_key": "app_key",` and -- `"dropbox_secret_key": "app_secret"` - -Then you can go to the "Integrations" module and Allow Dropbox Access. - -> Note: Please ensure Allow Pop-ups are enabled in your browser. - -{next} 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 02fb1b9bf21..92e0544e032 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 @@ -1,6 +1,6 @@ As per the perpetual inventory system, accounts posting is done for every stock transaction. -On creating new Warehouse, the system will automatically create an Account in the Chart of Accout, with the same name as Warehouse Name. +On creating new Warehouse, the system will automatically create an Account in the Chart of Account, with the same name as Warehouse Name. On receipt of items in a particular warehouse, the balance in the Warehouse Account will increase. Similarly when items are delivered from the Warehouse, an expense will be booked, and balance in the Warehouse Account will reduce. @@ -17,15 +17,11 @@ On receipt of items in a particular warehouse, the balance in the Warehouse Acco * Default Inventory Account * Stock Received But Not Billed * Stock Adjustment Account - * Expenses Included In Valuation + * Expenses Included In Valuation * Cost Center -Perpetual Inventory - * If user wants to set an individual account for each warehouse, create account head for each account under `Assets > Current Asset > Stock Assets > (Warehouse)` and set it on the respective warehouse under field 'Account'. -Perpetual Inventory - * For stock transactions, general ledger entries made against the account head set on the warehouse, if user had not set the account for the warhouse then system gets the account head from the parent warehouse. If account had not set for parent warehouse then system gets the account(Default Inventory Account) from the company master. * * * @@ -76,9 +72,9 @@ Consider following Chart of Accounts and Warehouse setup for your company: ###Purchase Receipt -Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of item "Base Plate" at **$100** from supplier "East Wind Inc". Following are the details of Purchase Receipt: +Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of item "Base Plate" at **$100** from supplier "Arcu Vel Quam Fabricators". Following are the details of Purchase Receipt: -**Supplier:** East Wind Inc. +**Supplier:** Arcu Vel Quam Fabricators **Items:** @@ -135,11 +131,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. @@ -151,7 +147,7 @@ On receiving Bill from supplier, for the above Purchase Receipt, you will make P **General Ledger** -General +Perpetual Inventory Here "Stock Received But Not Billed" account is debited and nullified the effect of Purchase Receipt. @@ -160,10 +156,10 @@ effect of Purchase Receipt. ###Delivery Note -Lets say, you have an order from "Jane Doe" to deliver 5 nos of item "RM0001" +Lets say, you have an order from "Utah Automation Services" to deliver 5 nos of item "RM0001" at $300. Following are the details of Delivery Note: -**Customer:** Jane Doe +**Customer:** Utah Automation Services **Items:** @@ -209,21 +205,20 @@ at $300. Following are the details of Delivery Note: **Stock Ledger** -Stock +Perpetual Inventory **General Ledger** -General +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 debit/credit amount is equal to the total valuation amount (buying cost) of -the selling items. And valuation amount is calculated based on your prefferred +the selling items. And valuation amount is calculated based on your preferred valuation method (FIFO / Moving Average) or actual cost of serialized items. - - + In this example, we have considered valuation method as FIFO. Valuation Rate = Purchase Rate + Charges Included in Valuation = 200 + (250 * (2000 / 2500) / 10) @@ -243,11 +238,11 @@ of the Sales Invoice are same as the above Delivery Note. **Stock Ledger** -Stock +Perpetual Inventory **General Ledger** -General +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. @@ -281,11 +276,11 @@ Goods Sold" accounts are also affected based on the valuation amount. **Stock Ledger** -Stock +Perpetual Inventory **General Ledger** -General +Perpetual Inventory * * * @@ -316,11 +311,11 @@ Goods Sold" accounts are also affected based on the valuation amount. **Stock Ledger** -Stock +Perpetual Inventory **General Ledger** -Stock +Perpetual Inventory * * * @@ -353,10 +348,10 @@ Goods Sold" accounts are also affected based on the valuation amount. **Stock Ledger** -Stock +Perpetual Inventory **General Ledger** -Stock - +Perpetual Inventory + {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/using-erpnext/calendar.md b/erpnext/docs/user/manual/en/using-erpnext/calendar.md index 5e0ae29e8a2..c674bf65623 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/calendar.md +++ b/erpnext/docs/user/manual/en/using-erpnext/calendar.md @@ -1,56 +1,49 @@ -The Calendar is a tool where you can create and share Events and also see -auto-generated events from the system. +The Calendar is a tool where you can create and share Events and also see auto-generated events from the system. You can switch calender view based on Month, Week and Day. -###Creating Events in Calender +Calendar -####Creating Event Manually +### Creating Events in Calender + +#### Creating Event Manually To create event manually, you should first determine Calender View. If Event's start and end time will be within one day, then you should first switch to Day view. 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. -![Calender Event Manually]({{docs_base_url}}/assets/old_images/erpnext/calender-event-manually.png) +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. -####Event Based on Lead +#### Event Based on Lead 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. -![Calender Event Lead]({{docs_base_url}}/assets/old_images/erpnext/calender-event-lead.png) +Lead Event -####Birthday Event +#### Birthday Event Birthday Event is created based on Date of Birth specified in the Employee master. -###Recurring Events +### Recurring Events You can set events as recurring in specific interval by Checking the "Repeat This Event". -![Calender Event Recurring]({{docs_base_url}}/assets/old_images/erpnext/calender-event-recurring.png) +Calendar Recurring Event -###Permission for Event - -You can set Event as Private or Public. Private Events will be visible only to you, and you can also assign permission for event based on Role in the participants table. - -Public Event, like Birthday will be visible to all. - -![Calender Event Permission]({{docs_base_url}}/assets/old_images/erpnext/calender-event-permission.png) - -###Event Reminders +### Event Reminders There are two ways you can receive email reminder for an event. -####Enable Reminder in Event +#### Enable Reminder in Event In the Event master, checking "Send an email reminder in the morning" will trigger notification email to all the participants for this event. -![Calender Event Notification]({{docs_base_url}}/assets/old_images/erpnext/calender-event-notification.png) +Calendar Recurring Event -####Create Email Digest +#### Create Email Digest To get email reminders for event, you should set Email Digest for Calender Events. @@ -58,6 +51,6 @@ Email Digest can be set from: `Setup > Email > Email Digest` -![Calender Email Digest]({{docs_base_url}}/assets/old_images/erpnext/calender-email-digest.png) +Calendar Recurring Event {next}