Merge pull request #9356 from tundebabzy/issue_6510
adds information about "Is Paid" and "Update Stock"
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index 1aa75d2..c2c75e1 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -40,7 +40,7 @@
"report_hide": 0,
"reqd": 0,
"search_index": 0,
- "set_only_once": 0,
+ "set_only_once": 1,
"unique": 0
},
{
@@ -1201,7 +1201,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-06-13 14:29:06.317317",
+ "modified": "2017-06-15 20:07:55.682137",
"modified_by": "Administrator",
"module": "Accounts",
"name": "POS Profile",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index c449ed2..f257efe 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -330,6 +330,37 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "pos_profile",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "POS Profile",
+ "length": 0,
+ "no_copy": 0,
+ "options": "POS Profile",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "column_break1",
"fieldtype": "Column Break",
"hidden": 0,
@@ -4565,7 +4596,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-06-13 14:29:14.696232",
+ "modified": "2017-06-16 17:07:55.483734",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 668b4c3..abe81a2 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -1577,6 +1577,7 @@
this.frm.doc.offline_pos_name = this.name;
this.frm.doc.posting_date = frappe.datetime.get_today();
this.frm.doc.posting_time = frappe.datetime.now_time();
+ this.frm.doc.pos_profile = this.pos_profile_data['name'];
invoice_data[this.name] = this.frm.doc
this.si_docs.push(invoice_data)
this.update_localstorage();
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 0000000..cc3132c
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/bank-reconciliation-2.png
Binary files 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 4ce2867..0000000
--- a/erpnext/docs/assets/img/accounts/company_default_inventory_account.png
+++ /dev/null
Binary files 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 e085f5b..0000000
--- a/erpnext/docs/assets/img/accounts/inventory_account.png
+++ /dev/null
Binary files 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 5a2b20b..0000000
--- a/erpnext/docs/assets/img/accounts/perpetual-2.png
+++ /dev/null
Binary files 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 faa7724..0000000
--- a/erpnext/docs/assets/img/accounts/perpetual-3.png
+++ /dev/null
Binary files 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 0000000..190280f
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-dn-gl-5.png
Binary files 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 0000000..79b0ca1
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-dn-sl-4.png
Binary files 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 0000000..7b6f7e3
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-inv-gl-7.png
Binary files 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 0000000..d7f4c61
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-inv-sl-6.png
Binary files 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 0000000..054a002
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-pinv-gl-3.png
Binary files 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 0000000..e6190ec
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-receipt-gl-2.png
Binary files 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 0000000..5f88638
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-receipt-sl-1.png
Binary files 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 0000000..2579463
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-st-issue-gl.png
Binary files 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 0000000..dc9b1b5
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-st-issue-sl.png
Binary files 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 0000000..ff192ce
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-st-receipt-gl.png
Binary files 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 0000000..6d183b6
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-st-receipt-sl.png
Binary files 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 0000000..551ebbc
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-st-transfer-gl.png
Binary files 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 0000000..a848d66
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-st-transfer-sl.png
Binary files 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 ac7a93c..0000000
--- a/erpnext/docs/assets/img/collaboration-tools/calendar-7.png
+++ /dev/null
Binary files 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 1d95ef4..e8c9a4c 100644
--- a/erpnext/docs/assets/old_images/erpnext/calender-email-digest.png
+++ b/erpnext/docs/assets/img/collaboration-tools/calender-email-digest.png
Binary files 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 eea5d73..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-10.png
+++ /dev/null
Binary files 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 a29c0e5..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-11.png
+++ /dev/null
Binary files 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 9143371..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-12.png
+++ /dev/null
Binary files 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 a250fd0..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-13.png
+++ /dev/null
Binary files 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 5ce57e8..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-14.png
+++ /dev/null
Binary files 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 9370e86..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-4.png
+++ /dev/null
Binary files 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 cbe25e7..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-5.png
+++ /dev/null
Binary files 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 3050931..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-6.png
+++ /dev/null
Binary files 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 dbe669e..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-7.png
+++ /dev/null
Binary files 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 bfa9516..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-8.png
+++ /dev/null
Binary files 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 4f3fa7e..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-9.png
+++ /dev/null
Binary files 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 1331a72..0000000
--- a/erpnext/docs/assets/old_images/erpnext/auto-notification.png
+++ /dev/null
Binary files 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 3483a1f..0000000
--- a/erpnext/docs/assets/old_images/erpnext/backup-manager.png
+++ /dev/null
Binary files 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 2fec1e6..0000000
--- a/erpnext/docs/assets/old_images/erpnext/bank-reconciliation-2.png
+++ /dev/null
Binary files 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 17683e3..0000000
--- a/erpnext/docs/assets/old_images/erpnext/budgeting-4.png
+++ /dev/null
Binary files 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 809d6d1..0000000
--- a/erpnext/docs/assets/old_images/erpnext/budgeting.png
+++ /dev/null
Binary files 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 dc6eb8b..0000000
--- a/erpnext/docs/assets/old_images/erpnext/calender-event-lead.png
+++ /dev/null
Binary files 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 84cb343..0000000
--- a/erpnext/docs/assets/old_images/erpnext/calender-event-manually.png
+++ /dev/null
Binary files 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 fa1e4ff..0000000
--- a/erpnext/docs/assets/old_images/erpnext/calender-event-notification.png
+++ /dev/null
Binary files 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 783f968..0000000
--- a/erpnext/docs/assets/old_images/erpnext/calender-event-permission.png
+++ /dev/null
Binary files 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 6147cf5..0000000
--- a/erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png
+++ /dev/null
Binary files 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 7aa6cec..0000000
--- a/erpnext/docs/assets/old_images/erpnext/dropbox-access.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/user/manual/de/accounts/budgeting.md b/erpnext/docs/user/manual/de/accounts/budgeting.md
index 1a2082c..88ef179 100644
--- a/erpnext/docs/user/manual/de/accounts/budgeting.md
+++ b/erpnext/docs/user/manual/de/accounts/budgeting.md
@@ -11,29 +11,29 @@
#### Schritt 1: Klicken Sie auf "Öffnen
-
-
-<img alt="Forderungen" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/accounts-receivable.png">
+<img class="screenshot" alt="Budget" src="{{docs_base_url}}/assets/img/accounts/budgeting-cost-center.png">
#### Schritt 2: Monatliche Verteilung eingeben
-
+
+<img class="screenshot" alt="Budget" src="{{docs_base_url}}/assets/img/accounts/budget-account.png">
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
-
+
+<img class="screenshot" alt="Budget" src="{{docs_base_url}}/assets/img/accounts/budget-account.png">
### 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.
-
+<img class="screenshot" alt="Monthly Distribution" src="{{docs_base_url}}/assets/img/accounts/monthly-budget-distribution.png">
Das kann über die Firmenstammdaten eingestellt werden.
-
+<img class="screenshot" alt="Budget Variance Report" src="{{docs_base_url}}/assets/img/accounts/budget-variance-report.png">
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 22f5e46..be42c80 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 @@
>Rechnungswesen > Einstellungen > Kostenstellenplan
-
+<img class="screenshot" alt="Kostenstellenplan" src="{{docs_base_url}}/assets/img/accounts/budgeting-cost-center.png">
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 ba53f5e..0000000
--- a/erpnext/docs/user/manual/de/setting-up/third-party-backups.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Drittpartei-Datensicherungen
-<span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
-
-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
-
-
-
-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"
-
-
-
-Sie müssen sich mit Ihrer ID und Ihrem Passwort an Ihrem Dropbox-Konto anmelden.
-
-
-
-## 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 9a7f431..f0e1f7a 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 @@
#### 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 @@
<p><strong>Lagerbuch</strong>
</p>
-
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-receipt-sl-1.png">
**Hauptbuch:**
-
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-receipt-gl-2.png">
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 @@
#### Hauptbuch
-
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-pinv-gl-3.png">
Hier wird das Konto "Lagerware erhalten aber noch nicht bewertet" belastet und hebt den Effekt des Kaufbeleges auf.
@@ -157,9 +157,9 @@
### 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 @@
**Lagerbuch**
-
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-dn-sl-4.png">
**Hauptbuch**
-
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-dn-gl-5.png">
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 @@
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**
-
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-inv-sl-6.png">
**Hauptbuch**
-
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-inv-gl-7.png">
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 @@
**Lagerbuch**
-
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-receipt-sl.png">
**Hauptbuch**
-
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-receipt-gl.png">
* * *
@@ -306,11 +303,11 @@
**Lagerbuch**
-
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-issue-sl.png">
**Hauptbuch**
-
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-issue-gl.png">
* * *
@@ -343,22 +340,8 @@
**Lagerbuch**
-
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-transfer-sl.png">
**Hauptbuch**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-transfer-gl.png">
\ 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 3bfc24c..87348ee 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
-
+<img class="screenshot" alt="Bank Reconciliation statement" src="{{docs_base_url}}/assets/img/accounts/bank-reconciliation-2.png">
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 f020362..ad448b0 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 c4e74ca..0000000
--- 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
-
-
-
-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
-
-
-
-You need to login to your dropbox account, with your user id and password.
-
-
-
-## 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 02fb1b9..92e0544 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 @@
* Default Inventory Account
* Stock Received But Not Billed
* Stock Adjustment Account
- * Expenses Included In Valuation
+ * Expenses Included In Valuation
* Cost Center
-<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/company_default_inventory_account.png">
-
* 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'.
-<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/inventory_account.png">
-
* 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 @@
###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 @@
**Stock Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-2.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-receipt-sl-1.png">
**General Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-3.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-receipt-gl-2.png">
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 @@
**General Ledger**
-<img alt="General" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-4.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-pinv-gl-3.png">
Here "Stock Received But Not Billed" account is debited and nullified the
effect of Purchase Receipt.
@@ -160,10 +156,10 @@
###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:**
<table class="table table-bordered">
@@ -209,21 +205,20 @@
**Stock Ledger**
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-5.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-dn-sl-4.png">
**General Ledger**
-<img alt="General" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-6.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-dn-gl-5.png">
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 @@
**Stock Ledger**
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-7.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-inv-sl-6.png">
**General Ledger**
-<img alt="General" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-8.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-inv-gl-7.png">
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 @@
**Stock Ledger**
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-9.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-receipt-sl.png">
**General Ledger**
-<img alt="General" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-10.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-receipt-gl.png">
* * *
@@ -316,11 +311,11 @@
**Stock Ledger**
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-11.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-issue-sl.png">
**General Ledger**
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-12.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-issue-gl.png">
* * *
@@ -353,10 +348,10 @@
**Stock Ledger**
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-13.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-transfer-sl.png">
**General Ledger**
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-14.png">
-
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-transfer-gl.png">
+
{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 5e0ae29..c674bf6 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
+<img class="screenshot" alt="Calendar" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-1.png">
-####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.
-
+<img class="screenshot" alt="Calendar" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-2.gif">
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.
-
+<img class="screenshot" alt="Lead Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-3.png">
-####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".
-
+<img class="screenshot" alt="Calendar Recurring Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-4.png">
-###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.
-
-
-
-###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.
-
+<img class="screenshot" alt="Calendar Recurring Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-6.png">
-####Create Email Digest
+#### Create Email Digest
To get email reminders for event, you should set Email Digest for Calender Events.
@@ -58,6 +51,6 @@
`Setup > Email > Email Digest`
-
+<img class="screenshot" alt="Calendar Recurring Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calender-email-digest.png">
{next}
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py
index 5e6a7a8..2595506 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py
@@ -10,7 +10,7 @@
def validate(self):
self.validate_accounts()
self.validate_repeating_companies()
-
+
def validate_repeating_companies(self):
"""Error when Same Company is entered multiple times in accounts"""
accounts_list = []
@@ -24,4 +24,5 @@
for entry in self.accounts:
"""Error when Company of Ledger account doesn't match with Company Selected"""
if frappe.db.get_value("Account", entry.default_account, "company") != entry.company:
- frappe.throw(_("Account does not match with Company"))
\ No newline at end of file
+ frappe.throw(_("Account {0} does not match with Company {1}"
+ ).format(entry.default_account, entry.company))
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 03e5390..83e0950 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -68,6 +68,10 @@
scrap_items = true;
}
+ if (child.bom_no) {
+ child.bom_no = '';
+ }
+
get_bom_material_detail(doc, cdt, cdn, scrap_items);
},
})
diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js
index 7d14d9e..2edfa9e 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.js
+++ b/erpnext/projects/doctype/timesheet/timesheet.js
@@ -1,9 +1,9 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-cur_frm.add_fetch('employee', 'employee_name', 'employee_name');
frappe.ui.form.on("Timesheet", {
setup: function(frm) {
+ frm.add_fetch('employee', 'employee_name', 'employee_name');
frm.fields_dict.employee.get_query = function() {
return {
filters:{
@@ -51,8 +51,8 @@
}
if(frm.doc.per_billed > 0) {
- cur_frm.fields_dict["time_logs"].grid.toggle_enable("billing_hours", false);
- cur_frm.fields_dict["time_logs"].grid.toggle_enable("billable", false);
+ frm.fields_dict["time_logs"].grid.toggle_enable("billing_hours", false);
+ frm.fields_dict["time_logs"].grid.toggle_enable("billable", false);
}
},
@@ -77,7 +77,7 @@
},
from_time: function(frm, cdt, cdn) {
- calculate_end_time(frm, cdt, cdn)
+ calculate_end_time(frm, cdt, cdn);
},
to_time: function(frm, cdt, cdn) {
@@ -109,18 +109,20 @@
},
activity_type: function(frm, cdt, cdn) {
- var child = locals[cdt][cdn];
+ frm.script_manager.copy_from_first_row('time_logs', frm.selected_doc,
+ 'project');
+
frappe.call({
method: "erpnext.projects.doctype.timesheet.timesheet.get_activity_cost",
args: {
employee: frm.doc.employee,
- activity_type: child.activity_type
+ activity_type: frm.selected_doc.activity_type
},
callback: function(r){
if(r.message){
frappe.model.set_value(cdt, cdn, 'billing_rate', r.message['billing_rate']);
frappe.model.set_value(cdt, cdn, 'costing_rate', r.message['costing_rate']);
- calculate_billing_costing_amount(frm, cdt, cdn)
+ calculate_billing_costing_amount(frm, cdt, cdn);
}
}
})
@@ -174,8 +176,8 @@
}
}
- cur_frm.set_value("total_billable_hours", total_billing_hr);
- cur_frm.set_value("total_hours", total_working_hr);
- cur_frm.set_value("total_billable_amount", total_billable_amount);
- cur_frm.set_value("total_costing_amount", total_costing_amount);
+ frm.set_value("total_billable_hours", total_billing_hr);
+ frm.set_value("total_hours", total_working_hr);
+ frm.set_value("total_billable_amount", total_billable_amount);
+ frm.set_value("total_costing_amount", total_costing_amount);
}
\ No newline at end of file
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index ca822b1..8ad64d2 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -16,11 +16,11 @@
// or set discount
item.discount_percentage = 0;
item.margin_type = 'Amount';
- item.margin_rate_or_amount = flt(item.rate - item.price_list_rate,
+ item.margin_rate_or_amount = flt(item.rate - item.price_list_rate,
precision("margin_rate_or_amount", item));
item.rate_with_margin = item.rate;
} else {
- item.discount_percentage = flt((1 - item.rate / item.price_list_rate) * 100.0,
+ item.discount_percentage = flt((1 - item.rate / item.price_list_rate) * 100.0,
precision("discount_percentage", item));
item.margin_type = '';
item.margin_rate_or_amount = 0;
@@ -602,8 +602,10 @@
toggle_conversion_factor: function(item) {
// toggle read only property for conversion factor field if the uom and stock uom are same
- this.frm.fields_dict.items.grid.toggle_enable("conversion_factor",
- (item.uom != item.stock_uom)? true: false)
+ if(this.frm.get_field('items').grid.fields_map.conversion_factor) {
+ this.frm.fields_dict.items.grid.toggle_enable("conversion_factor",
+ (item.uom != item.stock_uom)? true: false);
+ }
},
qty: function(doc, cdt, cdn) {
@@ -756,7 +758,7 @@
if(this.frm.doc.ignore_pricing_rule) {
var me = this;
var item_list = [];
-
+
$.each(this.frm.doc["items"] || [], function(i, d) {
if (d.item_code) {
item_list.push({
@@ -1144,7 +1146,7 @@
if(!item.item_code) {
frappe.throw(__("Please enter Item Code to get batch no"));
- } else if (doc.doctype == "Purchase Receipt" ||
+ } else if (doc.doctype == "Purchase Receipt" ||
(doc.doctype == "Purchase Invoice" && doc.update_stock)) {
return {
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 7ea550a..7c995f2 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -396,7 +396,7 @@
},
{
"allow_bulk_edit": 0,
- "allow_on_submit": 0,
+ "allow_on_submit": 1,
"bold": 0,
"collapsible": 0,
"columns": 0,
@@ -430,7 +430,7 @@
},
{
"allow_bulk_edit": 0,
- "allow_on_submit": 0,
+ "allow_on_submit": 1,
"bold": 0,
"collapsible": 0,
"columns": 0,
@@ -3632,7 +3632,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-06-13 14:28:50.441767",
+ "modified": "2017-06-19 13:06:31.736384",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 4a1c08a..0f3099f 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -26,7 +26,7 @@
target_warehouse = "_Test Warehouse 1 - _TC"
company = "_Test Company"
if not frappe.db.exists("Account", target_warehouse):
- parent_account = frappe.db.get_value('Account',
+ parent_account = frappe.db.get_value('Account',
{'company': company, 'is_group':1, 'account_type': 'Stock'},'name')
account = create_account(account_name="_Test Warehouse 1", \
account_type="Stock", parent_account= parent_account, company=company)
@@ -275,11 +275,20 @@
def test_return_entire_bundled_items(self):
set_perpetual_inventory()
- create_stock_reconciliation(item_code="_Test Item", target="_Test Warehouse - _TC", qty=50, rate=100)
- create_stock_reconciliation(item_code="_Test Item Home Desktop 100", target="_Test Warehouse - _TC",
- qty=50, rate=100)
+ create_stock_reconciliation(item_code="_Test Item",
+ target="_Test Warehouse - _TC", qty=50, rate=100)
+ create_stock_reconciliation(item_code="_Test Item Home Desktop 100",
+ target="_Test Warehouse - _TC", qty=50, rate=100)
- dn = create_delivery_note(item_code="_Test Product Bundle Item", qty=5, rate=500)
+ actual_qty = get_qty_after_transaction()
+ self.assertEquals(actual_qty, 50)
+
+ dn = create_delivery_note(item_code="_Test Product Bundle Item",
+ qty=5, rate=500)
+
+ # qty after return
+ actual_qty = get_qty_after_transaction()
+ self.assertEquals(actual_qty, 25)
# return bundled item
dn1 = create_delivery_note(item_code='_Test Product Bundle Item', is_return=1,
@@ -532,9 +541,9 @@
def create_delivery_note(**args):
dn = frappe.new_doc("Delivery Note")
args = frappe._dict(args)
- dn.posting_date = args.posting_date or today()
- if args.posting_time:
- dn.posting_time = args.posting_time
+ dn.posting_date = args.posting_date or nowdate()
+ dn.posting_time = args.posting_time or nowtime()
+ dn.set_posting_time = 1
dn.company = args.company or "_Test Company"
dn.customer = args.customer or "_Test Customer"
diff --git a/erpnext/stock/doctype/delivery_note/test_records.json b/erpnext/stock/doctype/delivery_note/test_records.json
deleted file mode 100644
index c76bab2..0000000
--- a/erpnext/stock/doctype/delivery_note/test_records.json
+++ /dev/null
@@ -1,39 +0,0 @@
-[
- {
- "company": "_Test Company",
- "conversion_rate": 1.0,
- "currency": "INR",
- "customer": "_Test Customer",
- "customer_name": "_Test Customer",
- "items": [
- {
- "base_amount": 100.0,
- "base_rate": 100.0,
- "cost_center": "Main - _TC",
- "description": "CPU",
- "doctype": "Delivery Note Item",
- "expense_account": "Cost of Goods Sold - _TC",
- "item_code": "_Test Item",
- "item_name": "_Test Item",
- "parentfield": "items",
- "qty": 1.0,
- "rate": 100.0,
- "uom": "_Test UOM",
- "conversion_factor": 1,
- "stock_uom": "_Test UOM",
- "warehouse": "_Test Warehouse - _TC"
- }
- ],
- "doctype": "Delivery Note",
- "base_grand_total": 100.0,
- "grand_total": 100.0,
- "naming_series": "_T-Delivery Note-",
- "base_net_total": 100.0,
- "plc_conversion_rate": 1.0,
- "posting_date": "2013-02-21",
- "price_list_currency": "INR",
- "selling_price_list": "_Test Price List",
- "status": "Draft",
- "territory": "_Test Territory"
- }
-]
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 23d1fd4..3361020 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -30,11 +30,15 @@
});
frappe.ui.form.on("Material Request Item", {
- "qty": function (frm, doctype, name) {
+ qty: function (frm, doctype, name) {
var d = locals[doctype][name];
if (flt(d.qty) < flt(d.min_order_qty)) {
frappe.msgprint(__("Warning: Material Requested Qty is less than Minimum Order Qty"));
}
+ },
+ item_code: function(frm, doctype, name) {
+ frm.script_manager.copy_from_first_row('items', frm.selected_doc,
+ 'schedule_date');
}
});
@@ -118,18 +122,6 @@
},
- schedule_date: function(doc, cdt, cdn) {
- var val = locals[cdt][cdn].schedule_date;
- if(val) {
- $.each((doc.items || []), function(i, d) {
- if(!d.schedule_date) {
- d.schedule_date = val;
- }
- });
- refresh_field("items");
- }
- },
-
get_items_from_bom: function() {
var d = new frappe.ui.Dialog({
title: __("Get Items from BOM"),
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 169bfd9..c31d7ac 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -83,7 +83,8 @@
frappe.throw(_("Row {0}: Qty is mandatory").format(item.idx))
if not flt(item.conversion_factor):
frappe.throw(_("Row {0}: UOM Conversion Factor is mandatory").format(item.idx))
- item.transfer_qty = flt(item.qty * item.conversion_factor, self.precision("transfer_qty", item))
+ item.transfer_qty = flt(flt(item.qty) * flt(item.conversion_factor),
+ self.precision("transfer_qty", item))
def validate_item(self):
stock_items = self.get_stock_items()
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 7657188..0e3a4f9 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -19,7 +19,7 @@
def validate_posting_time(self):
# set Edit Posting Date and Time to 1 while data import
- if frappe.flags.in_import:
+ if frappe.flags.in_import and self.posting_date:
self.set_posting_time = 1
if not getattr(self, 'set_posting_time', None):
@@ -149,5 +149,5 @@
for f in qty_fields:
qty = d.get(f)
if qty:
- if abs(int(qty) - float(qty)) > 0.0000001:
+ if abs(cint(qty) - flt(qty)) > 0.0000001:
frappe.throw(_("Quantity ({0}) cannot be a fraction in row {1}").format(qty, d.idx), UOMMustBeIntegerError)
