Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,683 Commits 3 Branches 0 Tags 1 GiB
4c87497b7c
Commit Graph

6813 Commits

Author SHA1 Message Date
Martin Ender
5c8c606b50 Create index.txt 2015-12-15 17:21:55 +05:30
Martin Ender
7b8e9a39e7 Update multi-currency-accounting.md 2015-12-15 17:21:55 +05:30
Martin Ender
054d63c94e Create multi-currency-accounting.md 2015-12-15 17:21:55 +05:30
Martin Ender
4deb7aaea2 Create point-of-sales-invoice.md 2015-12-15 17:21:55 +05:30
Martin Ender
f146046845 Create item-wise-tax.md 2015-12-15 17:21:55 +05:30
Martin Ender
f8942dd060 Update opening-accounts.md 2015-12-15 17:21:54 +05:30
Martin Ender
ee1f66bc86 Create opening-accounts.md 2015-12-15 17:21:54 +05:30
Martin Ender
ae77cb4959 Create budgeting.md 2015-12-15 17:21:54 +05:30
Martin Ender
6ba0f7bf75 Create accounting-entries.md 2015-12-15 17:21:54 +05:30
Martin Ender
3e2ebe5972 Update accounting-reports.md 2015-12-15 17:21:54 +05:30
Martin Ender
5f2f82de56 Create accounting-reports.md 2015-12-15 17:21:54 +05:30
Martin Ender
9d0d426ed6 Update opening-entry.md 2015-12-15 17:21:54 +05:30
Martin Ender
d7ea4ec2b6 Create opening-entry.md 2015-12-15 17:21:54 +05:30
Martin Ender
4d35ef149f Create credit-limit.md 2015-12-15 17:21:54 +05:30
Martin Ender
34fe511260 Create advance-payment-entry.md 2015-12-15 17:21:54 +05:30
Martin Ender
03a3d5089c Create making-payments.md 2015-12-15 17:21:54 +05:30
Martin Ender
8af11201d9 Update chart-of-accounts.md 2015-12-15 17:21:54 +05:30
Martin Ender
cd35d45628 Create chart-of-accounts.md 2015-12-15 17:21:53 +05:30
Martin Ender
dd09f67e75 Create purchase-invoice.md 2015-12-15 17:21:53 +05:30
Martin Ender
a51c4403a5 Update sales-invoice.md 2015-12-15 17:21:53 +05:30
Martin Ender
5656c6e969 Create sales-invoice.md 2015-12-15 17:21:53 +05:30
Martin Ender
635528e186 Create journal-entry.md 2015-12-15 17:21:53 +05:30
Martin Ender
49e39f0cde Create index.md 2015-12-15 17:21:53 +05:30
Martin Ender
e9784d1280 Create index.txt 2015-12-15 17:21:53 +05:30
Martin Ender
82e3e08650 Create sales-person.md 2015-12-15 17:21:53 +05:30
Martin Ender
721de2629e Create customer-group.md 2015-12-15 17:21:53 +05:30
Martin Ender
19d627c51f Create campaign.md 2015-12-15 17:21:53 +05:30
Martin Ender
a1d129f836 Create index.txt 2015-12-15 17:21:53 +05:30
Martin Ender
79f52a54ef Create index.md 2015-12-15 17:21:52 +05:30
Martin Ender
92091ce22d Create newsletter.md 2015-12-15 17:21:52 +05:30
Martin Ender
019196894c Create contact.md 2015-12-15 17:21:52 +05:30
Martin Ender
fbce19b2c6 Create opportunity.md 2015-12-15 17:21:52 +05:30
Martin Ender
84a9b6c816 Create customer.md 2015-12-15 17:21:52 +05:30
Martin Ender
aeb0934da0 Create lead.md 2015-12-15 17:21:52 +05:30
Martin Ender
347a580883 Create index.md 2015-12-15 17:21:52 +05:30
Martin Ender
2891c5ebca Create index.txt 2015-12-15 17:21:52 +05:30
Martin Ender
fc1bb3ee1d Create company-setup.md 2015-12-15 17:21:52 +05:30
Martin Ender
bd194a9fb7 Create bar-code.md 2015-12-15 17:21:52 +05:30
Martin Ender
4bd999cbc5 Update workflows.md 2015-12-15 17:21:52 +05:30
Martin Ender
bb154ad6c9 Create workflows.md 2015-12-15 17:21:52 +05:30
Martin Ender
f7d133f4a0 Update third-party-backups.md 2015-12-15 17:21:51 +05:30
Martin Ender
b79151ccac Create third-party-backups.md 2015-12-15 17:21:51 +05:30
Martin Ender
5b509ca194 Update territory.md 2015-12-15 17:21:51 +05:30
Martin Ender
38aa8982f8 Create territory.md 2015-12-15 17:21:51 +05:30
Martin Ender
c46504dfdf Update stock-reconciliation-for-non-serialized-item.md 2015-12-15 17:21:51 +05:30
Martin Ender
279fc35cb2 Create stock-reconciliation-for-non-serialized-item.md 2015-12-15 17:21:51 +05:30
Martin Ender
4887292513 Update sms-setting.md 2015-12-15 17:21:51 +05:30
Martin Ender
a056a7e390 Create sms-setting.md 2015-12-15 17:21:51 +05:30
Martin Ender
d82fec317e Create authorization-rule.md 2015-12-15 17:21:51 +05:30
Martin Ender
2545651a77 Create price-lists.md 2015-12-15 17:21:51 +05:30
Martin Ender
43029c2754 Create pos-setting.md 2015-12-15 17:21:51 +05:30
Martin Ender
3adcca8238 Update setting-up-taxes.md 2015-12-15 17:21:51 +05:30
Martin Ender
a76f957345 Update setting-up-taxes.md 2015-12-15 17:21:50 +05:30
Martin Ender
6935ae7f60 Create setting-up-taxes.md 2015-12-15 17:21:50 +05:30
Martin Ender
72e3741b44 Create terms-and-conditions.md 2015-12-15 17:21:50 +05:30
Martin Ender
609568d6d5 Create address-template.md 2015-12-15 17:21:50 +05:30
Martin Ender
576c76f71c Create letter-head.md 2015-12-15 17:21:50 +05:30
Martin Ender
a952fef53d Create print-headings.md 2015-12-15 17:21:50 +05:30
Martin Ender
5dc46b6096 Delete print-headings.md3 2015-12-15 17:21:50 +05:30
Martin Ender
463bd7b742 Create print-headings.md3 2015-12-15 17:21:50 +05:30
Martin Ender
e5cb6ab319 Create print-format-builder.md 2015-12-15 17:21:50 +05:30
Martin Ender
eeb280e06d Create print-settings.md 2015-12-15 17:21:50 +05:30
Martin Ender
2799039eec Create index.txt 2015-12-15 17:21:50 +05:30
Martin Ender
84f47e54af Create index.md 2015-12-15 17:21:50 +05:30
Martin Ender
3cd67c9e9b Create sending-email.md 2015-12-15 17:21:49 +05:30
Martin Ender
6b3d94a5df Update email-digest.md 2015-12-15 17:21:49 +05:30
Martin Ender
218cc5d1f2 Create email-digest.md 2015-12-15 17:21:49 +05:30
Martin Ender
f53407b76e Update concepts-and-terms.md 2015-12-15 17:21:49 +05:30
Martin Ender
92988591fc Update user-permissions.md 2015-12-15 17:21:49 +05:30
Martin Ender
9b69827d2c Update role-based-permissions.md 2015-12-15 17:21:49 +05:30
Martin Ender
4136b3170a Update adding-users.md 2015-12-15 17:21:49 +05:30
Martin Ender
f3459158c6 Delete globals-defaults.md 2015-12-15 17:21:49 +05:30
Martin Ender
a82056f424 Create global-defaults.md 2015-12-15 17:21:49 +05:30
Martin Ender
a440125ef2 Update system-settings.md 2015-12-15 17:21:49 +05:30
Martin Ender
3e8aec4d64 Update naming-series.md 2015-12-15 17:21:49 +05:30
Martin Ender
97a27f3d46 Update naming-series.md 2015-12-15 17:21:48 +05:30
Martin Ender
0eb0f59194 Update module-settings.md 2015-12-15 17:21:48 +05:30
Martin Ender
fce8780c08 Update globals-defaults.md 2015-12-15 17:21:48 +05:30
Martin Ender
48d45869ab Update email-alerts.md 2015-12-15 17:21:48 +05:30
Martin Ender
349360b3a1 Update email-alerts.md 2015-12-15 17:21:48 +05:30
Martin Ender
5e646cd8ad Update email-alerts.md 2015-12-15 17:21:48 +05:30
Martin Ender
8bcd104cec Create email-alerts.md 2015-12-15 17:21:48 +05:30
Martin Ender
5e91280912 Create email-account.md 2015-12-15 17:21:48 +05:30
Martin Ender
5fec1751a7 Create index.txt 2015-12-15 17:21:48 +05:30
Martin Ender
91802f914c Create index.md 2015-12-15 17:21:48 +05:30
Martin Ender
f779df2737 Create bulk-rename.md 2015-12-15 17:21:48 +05:30
Martin Ender
fad1363756 Update data-import-tool.md 2015-12-15 17:21:47 +05:30
Martin Ender
b041b905d0 Rename data-import-tool.md2.4.1 Werkzeug zum Datenimport Das Werkzeug zum Datenimport ist ein großartiger Weg um große Mengen an Daten, speziell Stammdaten, in das System hochzuladen oder zu bearbeiten. Um das Werkzeug zum Datenimport zu öffnen, gehen Sie entweder zu den Einstellungen oder zur Transaktion, für die Sie importieren wollen. Wenn der Datenimport erlaubt ist, sehen Sie eine Importschaltfläche: Das Werkzeug hat zwei Abschnitte, einen um eine Vorlage herunter zu laden, und einen zweiten um Daten hoch zu laden. (Anmerkung: Für den Import sind nur die DocTypes zugelassen, deren Dokumenttyp "Stammdaten" ist, oder bei denen die Einstellung "Import erlauben" aktiviert ist.) 1. Herunterladen der Vorlage Daten werden in ERPNext in Tabellen gespeichert, sehr ähnlich einer Tabellenkalkulation mit Spalten und Zeilen voller Daten. Jede Instanz in ERPNext kann mehrere verschiedene mit Ihr verbundene Untertabellen haben. Die Untertabellen sind mit Ihren übergeordneten Tabellen verknüpft und werden dort eingesetzt, wo es für eine Eigenschaft mehrere verschiedene Werte gibt. So kann z. B. ein Artikel mehrere verschiedene Preise haben, eine Rechnung hat mehrere verschiedene Artikel usw. - Klicken Sie auf die Tabelle, die Sie herunter laden wollen, oder auf "Alle Tabellen". - Für Massenbearbeitung klicken Sie auf "Mit Daten herunterladen". 2. Füllen Sie die Vorlage aus Öffnen Sie die Vorlage nach dem Herunterladen in einer Tabellenkalkulationsanwendung und fügen Sie die Daten unterhalb der Spaltenköpfe ein. Exportieren Sie dann Ihre Vorlage oder speichern Sie sie im CSV-Format (Comma Separated Values). 3. Hochladen der CSV-Datei Fügen Sie abschliessend die CSV-Datei im Abschnitt Import hinzu. Klicken Sie auf die Schaltfläche "Hochladen und Importieren". Anmerkungen: 1. Stellen Sie sicher, dass Sie als Verschlüsselung UTF-8 verwenden, wenn Ihre Anwendung das zulässt. 2. Lassen Sie die Spalte ID für einen neuen Datensatz leer. 4. Hochladen aller Tabellen (übergeordnete und Untertabellen) Wenn Sie alle Tabellen auswählen, dann erhalten Sie Spalten für alle Tabellen in einer Zeile gertrennt durch ~ Spalten. Wenn Sie mehrere verschiedene Unterzeilen haben, dann müssen Sie einen neuen Hauptartikel in einer neuen Zeile eintragen. Sehen Sie hierzu das Beispiel unten: Main Table ~ Child Table Column 1 Column 2 Column 3 ~ Column 1 Column 2 Column 3 v11 v12 v13 c11 c12 c13 c14 c15 c17 v21 v22 v23 c21 c22 c23 Um zu sehen, wie das gemacht wird, geben Sie manuell über Formulare einige Datensätze ein und exportieren Sie "Alle Tabellen" über "Mit Daten herunterladen". 5. Überschreiben ERPNext ermöglicht es Ihnen auch alle oder bestimmte Spalten zu überschreiben. Wenn Sie bestimmte Spalten aktualisieren möchten, können Sie die Vorlage mit Daten herunter laden. Vergessen Sie nicht die Box "Überschreiben" zu markieren, bevor sie hochladen. Anmerkung: Wenn Sie "Überschreiben" auswählen, werden alle Unterdatensätze eines übergeordneten Elements gelöscht. 6. Einschränkungen beim Hochladen ERPNext begrenzt die Menge an Daten, die Sie in einer Datei hochladen können. Die Menge kann sich je nach Datentyp unterscheiden. Normalerweise kann man problemlos ungefähr 1.000 Zeilen einer Tabelle in einem Vorgang hochladen. Wenn das System den Vorgang nicht akzeptiert, sehen Sie eine Fehlermeldung. Warum das alles? Wenn Sie zuviele Daten hochladen, kann das System abstürzen, im Besonderen dann, wenn andere Benutzer parallel arbeiten. Daher begrenzt ERPNext die Anzahl von Schreibvorgängen, die Sie mit einer Eingabe verarbeiten können. Wie fügen Sie Dateien an? Wenn Sie ein Formular öffnen, dann sehen Sie in der Seitenleiste rechts einen Abschnitt zum Anfügen von Dateien. Klicken Sie auf "Hinzufügen" und wählen Sie die Datei aus, die Sie anfügen möchten. Klicken Sie auf "Hochladen" und die Sache ist erledigt. Was ist eine CSV-Datei? Eine CSV (Durch Kommas getrennte Werte)-Datei ist ein Datensatz, den Sie in ERPNext hochladen können um verschiedene Daten zu aktualisieren. Jedes gebräuchliche Tabellenkalkulationsprogramm wie MS-Excel oder OpenOffice Spreadsheet kann im CSV-Format abspeichern. Wenn Sie Microsoft Excel benutzen und nicht-englische Zeichen verwenden, dann sollten Sie Ihre Datei UTF-8-kodiert abspeichern. Bei älteren Versionen von Excel gibt es keinen eindeutigen Weg als UTF-8 zu speichern. Deshalb können Sie die Datei auch ganz einfach als CSV abspeichern, dann mit Notepad öffnen und als UTF-8 abspeichern. (Microsoft Excel kann das leider nicht.) to data-import-tool.md 2015-12-15 17:21:47 +05:30
Martin Ender
ed4e85bf97 Create index.md 2015-12-15 17:21:47 +05:30
Martin Ender
1a8e484542 Create index.txt 2015-12-15 17:21:47 +05:30
Martin Ender
8794bb9c5f Delete system-settings.md 2015-12-15 17:21:47 +05:30
Martin Ender
1cd13ce2d5 Delete naming-series.md 2015-12-15 17:21:47 +05:30
Martin Ender
c1bdc108c8 Delete index.txt 2015-12-15 17:21:47 +05:30
Martin Ender
6549710eaa Delete module-settings.md 2015-12-15 17:21:47 +05:30
Martin Ender
4634194009 Delete index.md 2015-12-15 17:21:47 +05:30
Martin Ender
14006ad8c8 Delete global-defaults.md 2015-12-15 17:21:47 +05:30
Martin Ender
89a7730406 Create system-settings.md 2015-12-15 17:21:47 +05:30
Martin Ender
c2e913e0ca Create naming-series.md 2015-12-15 17:21:47 +05:30
Martin Ender
afbf3296d4 Create module-settings.md 2015-12-15 17:21:46 +05:30
Martin Ender
75963505dc Create index.md 2015-12-15 17:21:46 +05:30
Martin Ender
9ec61cf150 Create globals-defaults.md 2015-12-15 17:21:46 +05:30
Martin Ender
699feb0384 Create index.txt 2015-12-15 17:21:46 +05:30
Martin Ender
da00bacb55 Create global-defaults.md 2015-12-15 17:21:46 +05:30
Martin Ender
8ca8b14720 Create naming-series.md 2015-12-15 17:21:46 +05:30
Martin Ender
64b47ade3b Create module-settings.md 2015-12-15 17:21:46 +05:30
Martin Ender
423791a1cd Create system-settings.md 2015-12-15 17:21:46 +05:30
Martin Ender
9b09fea692 Create index.txt 2015-12-15 17:21:46 +05:30
Martin Ender
098cb65a54 Create index.md 2015-12-15 17:21:46 +05:30
Martin Ender
2cf2f48c02 Create sharing.md 2015-12-15 17:21:46 +05:30
Martin Ender
85febb969e Update user-permissions.md 2015-12-15 17:21:46 +05:30
Martin Ender
952e19a9bb Create user-permissions.md 2015-12-15 17:21:45 +05:30
Martin Ender
451ad3fe93 Update role-based-permissions.md 2015-12-15 17:21:45 +05:30
Martin Ender
cec0728bba Update role-based-permissions.md 2015-12-15 17:21:45 +05:30
Martin Ender
44838ea239 Update role-based-permissions.md 2015-12-15 17:21:45 +05:30
Martin Ender
3c29d6faa2 Update role-based-permissions.md 2015-12-15 17:21:45 +05:30
Martin Ender
5c4fdfce44 Create role-based-permissions.md 2015-12-15 17:21:45 +05:30
Martin Ender
19bed183b0 Update adding-users.md 2015-12-15 17:21:45 +05:30
Martin Ender
53523539f4 Create adding-users.md 2015-12-15 17:21:45 +05:30
Martin Ender
a5488e43ad Create index.md 2015-12-15 17:21:45 +05:30
Martin Ender
f8a2587cf4 Create index.txt 2015-12-15 17:21:45 +05:30
Martin Ender
337972eada Create step-10-item.md 2015-12-15 17:21:45 +05:30
Martin Ender
e5944e8866 Create step-9-suppliers.md 2015-12-15 17:21:45 +05:30
Martin Ender
ee17a60872 Create step-8-customer-names.md 2015-12-15 17:21:44 +05:30
Martin Ender
35ad87bb14 Create step-7-tax-details.md 2015-12-15 17:21:44 +05:30
Martin Ender
421bef2db4 Update step-6-add-users.md 2015-12-15 17:21:44 +05:30
Martin Ender
0048d29799 Create step-6-add-users.md 2015-12-15 17:21:44 +05:30
Martin Ender
5029670657 Update step-1-language.md 2015-12-15 17:21:44 +05:30
Martin Ender
d40ec15f1c Update step-2-currency-and-timezone.md 2015-12-15 17:21:44 +05:30
Martin Ender
9873c4029b Update step-3-user-details.md 2015-12-15 17:21:44 +05:30
Martin Ender
78b4ae02cb Update step-4-company-details.md 2015-12-15 17:21:44 +05:30
Martin Ender
9fa9b34930 Update step-5-letterhead-and-logo.md 2015-12-15 17:21:44 +05:30
Martin Ender
61b6918e73 Create step-5-letterhead-and-logo.md 2015-12-15 17:21:44 +05:30
Martin Ender
755d14b004 Create step-4-company-details.md 2015-12-15 17:21:44 +05:30
Martin Ender
2d3670b6a4 Create step-3-user-details.md 2015-12-15 17:21:44 +05:30
Martin Ender
8ff1c7b3e0 Create step-2-currency-and-timezone.md 2015-12-15 17:21:43 +05:30
Martin Ender
8df03c6e30 Create step-1-language.md 2015-12-15 17:21:43 +05:30
Martin Ender
cab2fc6e73 Create index.txt 2015-12-15 17:21:43 +05:30
Martin Ender
a5b9008088 Create index.md 2015-12-15 17:21:43 +05:30
Martin Ender
0a5ccb008a Create index.md 2015-12-15 17:21:43 +05:30
Martin Ender
83b8d33e78 Create index.txt 2015-12-15 17:21:43 +05:30
Martin Ender
9c2a20a67b Update the-champion.md 2015-12-15 17:21:43 +05:30
Martin Ender
a7465f8fd6 Update open-source.md 2015-12-15 17:21:43 +05:30
Martin Ender
49b476b9e5 Update key-workflows.md 2015-12-15 17:21:43 +05:30
Martin Ender
7f7f77f4d7 Create index.txt 2015-12-15 17:21:43 +05:30
Martin Ender
356c552b41 Update index.md 2015-12-15 17:21:43 +05:30
Martin Ender
1ccbd82b35 Update implementation-strategy.md 2015-12-15 17:21:43 +05:30
Martin Ender
e606678b8f Update getting-started-with-erpnext.md 2015-12-15 17:21:42 +05:30
Martin Ender
45db6156c7 Update getting-started-with-erpnext.md 2015-12-15 17:21:42 +05:30
Martin Ender
9d3da40351 Update getting-started-with-erpnext.md 2015-12-15 17:21:42 +05:30
Martin Ender
3f51a8aed4 Update do-i-need-an-erp.md 2015-12-15 17:21:42 +05:30
Martin Ender
e7d09edc0d Update do-i-need-an-erp.md 2015-12-15 17:21:42 +05:30
Martin Ender
94c7fa0141 Update concepts-and-terms.md 2015-12-15 17:21:42 +05:30
Martin Ender
abe9abc90b Update concepts-and-terms.md 2015-12-15 17:21:42 +05:30
Martin Ender
dbb25b67a5 Update concepts-and-terms.md 2015-12-15 17:21:42 +05:30
Martin Ender
d4e8e05749 Create concepts-and-terms.md 2015-12-15 17:21:42 +05:30
Martin Ender
02d28f1422 Create key-workflows.md 2015-12-15 17:21:42 +05:30
Martin Ender
a97265c8af Create implementation-strategy.md 2015-12-15 17:21:42 +05:30
Martin Ender
0480ad45f6 Create the-champion.md 2015-12-15 17:21:42 +05:30
Martin Ender
c8ea02d745 Update getting-started-with-erpnext.md 2015-12-15 17:21:41 +05:30
Martin Ender
028f246cae Update getting-started-with-erpnext.md 2015-12-15 17:21:41 +05:30
Martin Ender
f683bbee59 Create getting-started-with-erpnext.md 2015-12-15 17:21:41 +05:30
Martin Ender
e01309f07e Update open-source.md 2015-12-15 17:21:41 +05:30
Martin Ender
d7786190e6 Create open-source.md 2015-12-15 17:21:41 +05:30
Martin Ender
5bce109e8e Create do-i-need-an-erp.md 2015-12-15 17:21:41 +05:30
Martin Ender
a2531995f9 Create index.md 2015-12-15 17:21:41 +05:30
Martin Ender
98ccde84fb Create Beispiel.md 2015-12-15 17:21:41 +05:30
CWTGMBH
a12840f803 Create index.md 2015-12-15 17:21:41 +05:30
CWTGMBH
3e2f36034f Delete de 2015-12-15 17:21:41 +05:30
Martin Ender
d8c6213828 Create de 2015-12-15 17:21:41 +05:30
Anand Doshi
dd56b5f4ac Merge pull request #4503 from nabinhait/target_warehouse_patch 
[patch] Repost entries with wrongly selected target warehouse
 2015-12-15 17:01:37 +05:30
Nabin Hait
8444febbda [patch] Repost entries with wrongly selected target warehouse 2015-12-15 15:55:06 +05:30
Anand Doshi
b26c3f2263 Merge pull request #4502 from nabinhait/general_ledger_fix 
[fix][report] General Ledger
 2015-12-15 15:18:20 +05:30
Anand Doshi
03791fceee [translations] 2015-12-15 15:17:11 +05:30
Anand Doshi
542782e400 [fix] delete lead addresses in delete company transactions 2015-12-15 15:17:04 +05:30
Nabin Hait
8bdf8e675f [fix][report] General Ledger 2015-12-15 15:02:04 +05:30
Anand Doshi
2da81732eb Merge pull request #4500 from rmehta/fixes-to-tree 
[fix] rename tree item fixes #2524
 2015-12-15 14:38:26 +05:30
ShashaQin
81b8627250 Update serial_no.json 2015-12-15 14:14:51 +05:30
ShashaQin
79586775b2 Update serial_no.json 
change "delivery_document_type" to Link and ""delivery_document_no" to Dynamic link will be more convenient, like "purchase_document_type" and "purchase_document_no".
 2015-12-15 14:14:26 +05:30
Anand Doshi
8ee5498fe0 [fix] delete lead addresses in delete company transaction 2015-12-15 13:14:38 +05:30
Rushabh Mehta
e8ab320028 [fix] rename tree item fixes #2524 2015-12-15 12:06:37 +05:30
Chris Ian Fiel
c80796cdd5 Cash Flow Report 2015-12-12 11:26:54 +08:00
Chris Ian Fiel
fde03453e4 Cash Flow Report 2015-12-12 10:54:56 +08:00
Chris Ian Fiel
826e18a29f Cash Flow Report 2015-12-12 10:33:01 +08:00
Nabin Hait
660f479ec8 bumped to version 6.12.11 2015-12-11 15:36:29 +06:00
Nabin Hait
fa557f494b Merge pull request #4481 from nabinhait/develop 
[fix] Ignore user permission in target warehouse in SO
 2015-12-11 15:04:38 +05:30
Anand Doshi
695d09f9cd [fix] typo 2015-12-11 15:03:26 +05:30
Anand Doshi
66c9940d73 [fix] [validation] website url should be public 2015-12-11 15:02:58 +05:30
Nabin Hait
204af3ce90 [fix] Ignore user permission in target warehouse in SO 2015-12-11 15:01:02 +05:30
Nabin Hait
83f9f93015 bumped to version 6.12.10 2015-12-11 15:05:41 +06:00
Nabin Hait
53804c5bed Merge pull request #4472 from umairsy/develop 
[docs] Added new videos
 2015-12-11 14:31:35 +05:30
Nabin Hait
d3d4fe45c6 Merge pull request #4473 from nabinhait/sms_logs 
[fix] Ignore permissions while creating sms logs
 2015-12-11 14:31:26 +05:30
Nabin Hait
fc4eca5cc7 [fix] Website Image validation 2015-12-11 11:47:05 +05:30
Rushabh Mehta
a1a712b0c6 [minor] [fix] task close button condition 2015-12-11 11:16:03 +05:30
Nabin Hait
2164595933 [fix] Ignore permissions while creating sms logs 2015-12-10 18:09:57 +05:30
Umair Sayyed
8eaf5eee74 [docs] Added videos 2015-12-10 17:58:12 +05:30
Nabin Hait
9cca3494c0 bumped to version 6.12.9 2015-12-10 15:11:02 +06:00
Nabin Hait
360b057b0a [chnage-log] 2015-12-10 14:37:28 +05:30
Nabin Hait
56ae9481a0 Merge pull request #4466 from rmehta/task-notification-on-overdue 
[enhancement] task status will be set to overdue when it crosses expected end date
 2015-12-10 14:30:34 +05:30
Nabin Hait
12425e22a6 Merge pull request #4462 from nabinhait/sal_slip_fix 
[fix] Payment days calculation in salary slip
 2015-12-10 14:23:31 +05:30
Nabin Hait
da80a649fc Merge pull request #4465 from anandpdoshi/fix/validate-website-image-public 
[fix] validate that Item's website image is public
 2015-12-10 14:23:14 +05:30
Rushabh Mehta
13ec41abb2 [enhancement] task status will be set to overdue when it crosses expected end date 2015-12-10 12:59:02 +05:30
Anand Doshi
b3051ab84d [fix] validate that Item's website image is public 2015-12-10 11:46:20 +05:30
Nabin Hait
533aba02c5 [fix] Payment days calculation in salary slip 2015-12-10 10:50:42 +05:30
Rushabh Mehta
a5cf8a86c1 [minor] lang fixes for email digest 2015-12-10 10:38:46 +05:30
Rushabh Mehta
c819fd4ee8 [translations] for #4461 2015-12-10 10:34:32 +05:30
Anand Doshi
2af44ffd06 [fix] setup wizard is_private 2015-12-09 17:29:11 +05:30
Nabin Hait
5d39a9594d [fix] Reload SO Item in patch 2015-12-09 17:06:09 +05:30
Nabin Hait
7290c79fdf bumped to version 6.12.8 2015-12-09 16:02:30 +06:00
Nabin Hait
547e916b00 Merge pull request #4452 from saurabh6790/drop-ship-fixes-3 
[fixes] pull customer details only if drop shipping is marked
 2015-12-09 15:31:49 +05:30
Nabin Hait
783e63a8e6 suomalainen translation fixed for Extra Small and Large 2015-12-09 15:29:21 +05:30
Saurabh
f6891975d5 [fixes] pull customer details only if drop shipping is marked 2015-12-09 15:04:12 +05:30
Nabin Hait
1b0c797817 bumped to version 6.12.7 2015-12-09 15:29:44 +06:00
Nabin Hait
c119cbcb50 Merge pull request #4449 from nabinhait/coa_fix 
[fix] Stock account identified in COA of Guatamala
 2015-12-09 13:58:09 +05:30
Giovanni Lion
5de53eb0eb Voucher dynamic link fix to allow links to work if user language is not english 2015-12-09 15:45:40 +08:00
Nabin Hait
49fe7af6de [fix] Stock account identified in COA of Guatamala 2015-12-09 11:27:10 +05:30
Nabin Hait
3931a35e27 bumped to version 6.12.6 2015-12-08 18:36:25 +06:00
Nabin Hait
56595ecda0 Merge pull request #4445 from nabinhait/patch_fix1 
[patch][fix] Fixed drop ship status and tax rule patch
 2015-12-08 18:05:33 +05:30
Nabin Hait
61c6552434 [fix] Hungary translation for chart of accounts 2015-12-08 18:03:23 +05:30
Nabin Hait
4ad0963ee8 [patch][fix] Fixed drop ship status and tax rule patch 2015-12-08 16:51:04 +05:30
Nabin Hait
d56ec92682 bumped to version 6.12.5 2015-12-08 16:10:17 +06:00
Nabin Hait
694373d022 Fixed conflict 2015-12-08 15:30:15 +05:30
Nabin Hait
40d49ccf98 Merge pull request #4444 from nabinhait/get_incoming_rate_fix 
[fix] Get incoming rate if args as json
 2015-12-08 15:17:32 +05:30
Nabin Hait
4372ac559a Merge pull request #4443 from nabinhait/bank_reco_print 
[fix] Print format for bank reco statement
 2015-12-08 15:17:24 +05:30
Nabin Hait
41c8cf645a [fix] Get incoming rate if args as json 2015-12-08 14:50:24 +05:30
Saurabh
70ed6ede5c [fixes] patch to update delivery status for drop ship item 2015-12-08 14:48:19 +05:30
Nabin Hait
7af5c4aefc [fix] Print format for bank reco statement 2015-12-08 14:25:10 +05:30
Saurabh
01ca354d52 [fixes] Drop Shipping - Purchase Order Cancellation - Sales Order Status 2015-12-08 14:03:09 +05:30
Nabin Hait
a974ab3dc5 [fix][patch] Create Tax Rule based on default taxes and charges template in Customer and Supplier 2015-12-08 12:56:14 +05:30
Anand Doshi
cc24d28ddc [fix] address creation for new user 2015-12-08 12:34:13 +05:30
Rushabh Mehta
441b2c7657 [minor] limit pos search to 24 items at a time 2015-12-08 12:16:53 +05:30
Anand Doshi
51d07dfca2 [docs] rename perm level error article 2015-12-07 16:22:57 +05:30
Nabin Hait
6a8ff42a5a bumped to version 6.12.4 2015-12-07 14:54:59 +06:00
Nabin Hait
06db236aa0 [fix] Allow Production Order, by default unchecked in item 2015-12-07 14:19:13 +05:30
Nabin Hait
733680bc3f [translations] 2015-12-07 14:12:41 +05:30
Rushabh Mehta
14a0441b4b [fix] removed temp_highlight 2015-12-07 12:28:03 +05:30
Rushabh Mehta
a311e706b0 [docs] home.png 2015-12-07 12:13:17 +05:30
Rushabh Mehta
e6a16c29df [docs] index fix 2015-12-07 12:07:01 +05:30
Nabin Hait
92bb480fc3 Merge pull request #4432 from bohlian/develop 
Purchase Invoice - Show Payment Button when Outstanding Amount !=0
 2015-12-07 11:12:11 +05:30
Nabin Hait
7dc0da18b5 Merge pull request #4433 from nabinhait/expense_allow_import 
[fix] Allowed import for Expense Claim
 2015-12-07 11:11:35 +05:30
Nabin Hait
c8a2b94200 Merge pull request #4434 from nabinhait/whitelist_fix 
[fix] get_incoming_rate function whitelisted
 2015-12-07 11:11:21 +05:30
Nabin Hait
5eefff13a1 [fix] get_incoming_rate function whitelisted 2015-12-07 10:44:56 +05:30
Nabin Hait
9421e9873a [fix] Allowed import for Expense Claim 2015-12-07 10:40:13 +05:30
bohlian
5e4c8a52ee Payment To Be Shown When Outstanding Amount != 0 
Payment button should be shown when outstanding amount != 0.
 2015-12-07 12:06:08 +08:00
Saurabh
4f39fd243e [fixes] recreate print format, shipping address on po for drop ship, validate update stock 2015-12-06 10:09:06 +05:30
Nabin Hait
c43a11a313 Merge pull request #4431 from nabinhait/leave_fix 
[fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period
 2015-12-05 12:43:38 +05:30
Nabin Hait
1bffb42809 Merge pull request #4428 from nabinhait/get_exchange_rate 
[fix] Get exchange rate as 1 if same currency
 2015-12-05 12:43:13 +05:30
Nabin Hait
4660f820da Merge pull request #4427 from nabinhait/offer_letter_fix 
[fix] Offer letter print format fixed
 2015-12-05 12:42:39 +05:30
Nabin Hait
1a19c05ef0 Merge pull request #4425 from nabinhait/bank_reco_fix 
[fix] Fixed amounts not reflected in bank
 2015-12-05 12:42:20 +05:30
Nabin Hait
d53e780fb8 [fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period 2015-12-05 12:15:49 +05:30
Nabin Hait
0f5d97a156 [fix] Get exchange rate as 1 if same currency 2015-12-04 16:47:34 +05:30
Rushabh Mehta
2f273674e9 [docs] fixed links 2015-12-04 16:00:38 +05:30
Nabin Hait
734a40ad62 [fix] Offer letter print format fixed 2015-12-04 12:19:21 +05:30
Nabin Hait
9547b774f7 [fix] Fixed amounts not reflected in bank 2015-12-04 11:05:25 +05:30
Rushabh Mehta
e1f8b1d695 [minor] [production planning tool] include non production items without default BOM in multi-level BOM 2015-12-04 10:53:15 +05:30
Rushabh Mehta
7be2e985b0 [docs] updated generated docs 2015-12-03 18:28:19 +05:30
Rushabh Mehta
3b6287d849 [docs] updated generated docs 2015-12-03 18:27:13 +05:30
Rushabh Mehta
ab7021ce64 [docs] merged kb and cleanup. warning: don't see the commit 2015-12-03 17:59:34 +05:30
Rushabh Mehta
275b3eec0d bumped to version 6.12.3 2015-12-03 18:28:57 +06:00
Rushabh Mehta
acaef538c2 Merge pull request #4420 from rmehta/stock-entry-fix 
[minor] allow stock entry for manufacture without production order
 2015-12-03 17:58:07 +05:30
Rushabh Mehta
041b062014 Merge pull request #4419 from nabinhait/salary_payment_days 
[fix] Payment Days and holidays considering joining and relieving dates
 2015-12-03 17:57:24 +05:30
Rushabh Mehta
39e603a154 Merge pull request #4413 from nabinhait/bank_transfer_exchange_rate 
Bank transfer exchange rate and account balance in COA
 2015-12-03 17:56:03 +05:30
Nabin Hait
a4eeb919e6 [fix] Set payment days considering joinging date, reliving date and applicable holidays 2015-12-03 15:10:30 +05:30
Nabin Hait
c4d9554a05 [fix] Payment Days and holidays considering joining and relieving dates 2015-12-03 15:10:30 +05:30
Nabin Hait
4c7a32e446 [fix] Toggle required for sales and purchase tax template based on tax type 2015-12-03 11:47:38 +05:30
Rushabh Mehta
2c069a418a [minor] allow stock entry for manufacture without production order 2015-12-03 11:10:23 +05:30
Rushabh Mehta
ba2596a7e0 [minor] validate email id before inviting user 2015-12-03 10:35:11 +05:30
Rushabh Mehta
f7911687a0 [minor] fixes to patch 2015-12-03 08:09:42 +05:30
Rushabh Mehta
5dd1aa9f31 bumped to version 6.12.2 2015-12-02 15:24:45 +06:00
Nabin Hait
8df5900f98 [fix] Inactive salary structure validation 2015-12-02 14:50:08 +05:30
Nabin Hait
f58a3726a7 Balance in chart of accounts in both company and account currency 2015-12-02 12:28:06 +05:30
Nabin Hait
1c77506e80 [fix] Don't overwrite exchange rate on saving for bank transfer 2015-12-02 12:28:06 +05:30
Rushabh Mehta
f1f556c0ac Merge pull request #4409 from nabinhait/reorder_level 
[fix] Reorder Qty mandatory if reorder level entered
 2015-12-02 12:25:09 +05:30
Rushabh Mehta
4a1b9ac793 Merge pull request #4407 from nabinhait/develop 
[fix] Mapping allowed for negative quantity
 2015-12-02 12:24:49 +05:30
Nabin Hait
20abc2d0e8 [fix] Reorder Qty mandatory if reorder level entered 2015-12-01 19:01:19 +05:30
Rushabh Mehta
4496cc1e80 bumped to version 6.12.1 2015-12-01 18:48:28 +06:00
Rushabh Mehta
29cca2352c [hot] [fix] trial balance report 2015-12-01 18:17:33 +05:30
Nabin Hait
d793fc9446 [fix] Mapping allowed for negative quantity 2015-12-01 17:28:12 +05:30
Nabin Hait
5b73dea9f6 [fix] Get items in stock reconciliation based on default warehouse or existing bin 2015-12-01 16:47:17 +05:30
Nabin Hait
c4edcf1532 [fix] Recurring test case fixed for the 1st day of the month 2015-12-01 16:28:35 +05:30
Rushabh Mehta
48b1633ff5 bumped to version 6.12.0 2015-12-01 16:54:13 +06:00
Rushabh Mehta
4140fa59c5 [translations] 2015-12-01 16:02:15 +05:30
Rushabh Mehta
afacc3d779 [minor] catch illegal reference, via error report 2015-12-01 15:53:07 +05:30
Rushabh Mehta
29f9f6c147 [fixes] [ux] get product bundle items only on po, mr and button on toolbar 2015-12-01 11:36:22 +05:30
Rushabh Mehta
37d9d6fdea Merge pull request #4402 from nabinhait/allow_root_accounts 
[feature] Allowed custom root accounts in Chart of Accounts
 2015-12-01 10:59:44 +05:30
Rushabh Mehta
0cc177f73c Merge pull request #4400 from nabinhait/total_amount_in_jv 
[fix] Total Amount in Journal Entry in bank currency
 2015-12-01 10:58:34 +05:30
Nabin Hait
8c4e043747 [feature] Allowed custom root accounts in Chart of Accounts 2015-12-01 10:34:43 +05:30
Nabin Hait
ddc295b4b3 [minor] Set expense account as Stock RBNB for perpetual inventory after mapping 2015-11-30 18:40:28 +05:30
Nabin Hait
621f4cd7c9 [fix] Invoicing against drop-ship Purchase Order 2015-11-30 18:40:28 +05:30
Rushabh Mehta
4750b1fdb7 Merge pull request #4397 from rmehta/setup-wizard-fixes 
[minor] system settings in setup wizard moved to frappe
 2015-11-30 17:17:16 +05:30
Nabin Hait
72e348daf5 [fix] Show 'Make Purchase Receipt' button in PO even if all items are non-stock items 2015-11-30 16:26:49 +05:30
Nabin Hait
6c173e9730 [fix] Total Amount in Journal Entry in bank currency 2015-11-30 16:13:42 +05:30
Nabin Hait
ec1695dbe3 [fix] Bank Reconciliation in account currency 2015-11-30 15:23:46 +05:30
Rushabh Mehta
7909102edd [minor] system settings in setup wizard moved to frappe 2015-11-30 15:12:45 +05:30
Rushabh Mehta
9f7de868ef [fixes] stock reco, must always set qty and rate 2015-11-30 14:16:36 +05:30
Rushabh Mehta
d6c5235d58 [minor] [translation] fix #4343 2015-11-30 11:33:01 +05:30
Rushabh Mehta
32e55e174d [minor] fix error message 2015-11-30 10:51:29 +05:30
Anand Doshi
47e82d1a49 bumped to version 6.11.3 2015-11-27 18:08:46 +06:00
Anand Doshi
563c243ec6 Revert "[hotfix] total amount in journal entry" 
This reverts commit 5b03a75970.
 2015-11-27 17:38:17 +05:30
Anand Doshi
711e675987 bumped to version 6.11.2 2015-11-27 17:54:49 +06:00
Anand Doshi
5b03a75970 [hotfix] total amount in journal entry 2015-11-27 17:24:06 +05:30