Julian Robbins
361e7f6ddc
Remove typos and use better English
2017-04-17 13:56:53 +05:30
Rohit Waghchaure
6681b0d2aa
Documentation
2017-04-14 17:14:03 +05:30
Julian Robbins
8037a0e3d5
Update assignment.md
...
A typo and improvement tom English
2017-04-11 18:51:34 +05:30
Nabin Hait
04ab7dfd2f
Update role-permisison-for-page-and-report.md
2017-03-31 18:04:15 +05:30
Rohit Waghchaure
67a3e65f08
[Documentation] Added for custom roles for page and report, fixed some broken images
2017-03-31 17:22:58 +05:30
addymuliady
0dd00eb418
Update accounts-settings.md
2017-03-29 17:40:01 +05:30
Saurabh
a5ddeb44e7
[fix] remove integraton service reference from documentation
2017-03-29 17:32:04 +05:30
Nabin Hait
5168286ea0
Merge pull request #8072 from lb-/patch-1
...
Update the-champion.md - grammar
2017-03-23 16:58:19 +05:30
Nabin Hait
46bccb55c5
Merge pull request #8080 from rmehta/item-variants-by-mfg
...
[feature] ability to have variants based on manufacturer
2017-03-23 16:29:41 +05:30
Faris Ansari
7fbc1c2161
Update Workflows
...
Add new images
2017-03-22 17:45:52 +05:30
Rushabh Mehta
a07c43fd68
[feature] ability to have variants based on manufacturer
2017-03-21 17:48:34 +01:00
LB (Ben Johnston)
71f4fbf467
Update the-champion.md - grammar
2017-03-21 12:50:17 +07:00
S. Vigneux
ff2d5d8ad9
Update batch.md
...
The practice=> The practice
2017-03-05 12:44:03 -05:00
pratu16x7
4e71337f3d
fix lead, customer, opportunity pages
2017-03-01 04:02:50 +05:30
Nabin Hait
6fd8cca135
Merge pull request #7587 from noussh/develop
...
updated missing navigation links in Docs - Accounts
2017-02-20 19:33:55 +05:30
Nabin Hait
29dfb9479b
Merge pull request #7710 from joolsr/patch-1
...
Update customer.md
2017-02-10 13:23:06 +05:30
mbauskar
edaa43d9b8
[docs] manual feedback request and minor fixes
2017-02-10 11:28:45 +05:30
joolsr
f9fdbe2853
Update customer.md
2017-02-09 23:10:39 +00:00
mbauskar
1df0b9bfed
[minor] minor fixes in feedback index.md
2017-02-07 15:20:08 +05:30
mbauskar
298acd3d1a
[docs] Feedback triggers
2017-02-07 15:20:08 +05:30
rohitwaghchaure
ea092a7b24
[Enhancement] Booking of an employee's expense claim ( #7267 )
...
* [Enhancement] Auto book of an employee's expense claim
* test cases
* documentation
* fixes and changes
* removed payable from employee and added into the company
* Added party in account, patch to update party type for customer and supplier accounts
* added party type in erpnext, fix patch
* fixed travis
2017-02-01 12:02:08 +05:30
KanchanChauhan
fbaa6197f9
Employee Loan Management ( #7126 )
...
* [WIP] Employee Loan Management
* EMI calculation
* Fixing PR
2017-01-30 15:15:58 +05:30
noussh
425d7adcdd
Update recurring-orders-and-invoices.md
2017-01-26 15:38:57 +04:00
noussh
0350db6a4e
added next link
2017-01-26 15:35:01 +04:00
noussh
1e86546e2c
added the link
2017-01-26 12:53:45 +04:00
noussh
6396c90956
Update multi-currency-accounting.md
2017-01-26 12:52:29 +04:00
noussh
47fbc7efa5
adde the next page link
2017-01-26 12:50:34 +04:00
noussh
8b62626cec
Wrong path updated
2017-01-25 19:44:32 +04:00
Nabin Hait
57e4ab70be
Merge pull request #7580 from KanchanChauhan/calendar-manual-screenshots
...
New screenshots for Calendar user manual
2017-01-25 17:35:01 +05:30
Kanchan Chauhan
ce116417e1
New screenshots for Calendar user manual
2017-01-25 15:38:35 +05:30
vrms
1f1f56225c
Update warehouse.md ( #7544 )
...
added some detail about link between Warehouse & Warehouse account & machanics of sub-warehousese (Warehouse >Room >Row > Shelf >box
2017-01-24 11:29:27 +05:30
Kanchan Chauhan
f80c2b9606
Fleet management moved to HR
2017-01-16 14:38:24 +05:30
Arvind Subramanian
efc9372f46
Update step-8-customer-names.md
2017-01-05 08:34:58 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Muhammad Huzaifah Bin Ismail
465da8ce09
Fixed spelling errors on Production Planning Tool and manual.
2016-12-28 18:15:45 +08:00
Nabin Hait
db4cfeed0e
Merge pull request #7211 from frappe/shachiTakalkar-patch-1
...
Update adding-margin.md
2016-12-14 12:54:58 +05:30
Nabin Hait
aba470f1e6
Merge pull request #7206 from strixaluco/develop
...
[docs] mention UID in LDAP instruction
2016-12-14 12:53:33 +05:30
Shachi Takalkar
41d4e33682
Update adding-margin.md
2016-12-14 12:41:07 +05:30
Neil Trini Lasrado
6a2fa29b4a
Fixes for training Module
2016-12-14 12:08:28 +05:30
Neil Trini Lasrado
fef568ecfa
Documentation for Training Module
2016-12-13 16:48:50 +05:30
strixaluco
757d127844
[docs] mention UID in LDAP instruction
2016-12-13 17:54:41 +08:00
James Robertson
e4b9473f83
Fixes erpnext issue 6891 ( #7128 )
...
* Fixes erpnext issue 6891
Updated all 4 items listed on the issue. Removed old out of date image
files and created new ones. Fixed broken links.
* Update to Pull Request #7128
Changes to images to comply with guidelines.
2016-12-07 12:14:51 +05:30
Nabin Hait
6c44d259ca
Merge pull request #7106 from pratu16x7/doc-fixes
...
CRM: Customer page fixes
2016-12-01 18:09:02 +05:30
Nabin Hait
1ab446a810
Merge pull request #7086 from frappe/netchampfaris-documentation
...
Update quotation.md
2016-12-01 18:08:36 +05:30
Nabin Hait
cd43d3aa20
Merge pull request #7088 from rohitwaghchaure/documentation_november
...
[fix] Documentation
2016-12-01 18:08:05 +05:30
pratu16x7
9dd34427ef
Change alt text and German page image link
2016-11-30 15:48:14 +05:30
pratu16x7
d849093dff
CRM: Customer page fixes
2016-11-30 15:41:30 +05:30
Ishan Loya
a40cefeaeb
Update merging-documents.md
...
Fixed some typos
2016-11-29 16:07:33 +05:30
Faris Ansari
a2ea2ca990
Update sales-order.md
2016-11-29 11:32:11 +05:30
Faris Ansari
d0654912c4
Update quotation.md
2016-11-29 11:21:40 +05:30
Rohit Waghchaure
59844a12aa
[fix] documentation
2016-11-28 15:51:05 +05:30
Faris Ansari
834a3c990e
fix image link
2016-11-28 13:16:57 +05:30
Faris Ansari
a9b34edef0
Update quotation.md
2016-11-28 13:08:49 +05:30
Nabin Hait
ac3ad62164
Merge pull request #7052 from saurabh6790/integration_service_document
...
[documentaion] Documentaion for setting up Integration Service
2016-11-28 12:43:21 +05:30
Nabin Hait
8020b5ceb7
Merge pull request #7063 from umairsy/conf
...
[Fixed] Documentation #6892
2016-11-28 12:40:55 +05:30
Yashodhan K
7b090312d5
[Docs] Fixed type and renamed file
...
Fixed typo and renamed file to correct url link.
2016-11-26 20:08:02 +05:30
Umair Sayyed
829e00c2e6
[Fixed] Documentation #6892
2016-11-24 17:41:29 +05:30
Nabin Hait
926d72424d
Merge pull request #6699 from rohitwaghchaure/bom_price_list_issue
...
[Enhancement] Currency added in the BOM
2016-11-24 13:27:17 +05:30
Saurabh
8cd1918a3c
[documentaion] Documentaion for setting up Integration Service
2016-11-23 19:09:43 +05:30
strixaluco
fc6a3aa42c
[docs] URL fixes
2016-11-22 16:25:20 +08:00
Rohit Waghchaure
b1b328865e
[Enhancement] Currency added in the BOM
2016-11-22 12:52:20 +05:30
Nabin Hait
d855167b9b
Fixed merge conflict
2016-11-21 19:13:22 +05:30
Rushabh Mehta
1df70cedc1
[fix] remove feature setup docs
2016-11-21 16:38:13 +05:30
Nabin Hait
5f166c11fc
Merge pull request #6971 from ShraddhaRanjane/patch-2
...
Update naming-series.md
2016-11-21 14:52:22 +05:30
Nabin Hait
2d5b48c4f2
Update naming-series.md
2016-11-21 14:52:10 +05:30
Rushabh Mehta
8042aa4b52
[minor] fixes to docs
2016-11-21 13:53:02 +05:30
Rushabh Mehta
557e7f787b
[minor] UX fixes for Daily Work Summary
2016-11-21 12:10:44 +05:30
KanchanChauhan
dc2195c52a
[Documentation] Shopping Cart ( #6911 )
2016-11-18 13:56:06 +05:30
ShraddhaRanjane
045bfe641e
Update naming-series.md
2016-11-17 11:22:58 +05:30
shreyas
2cb294c8b4
[Docs] Updated docs for supplier quotation and purchase order
2016-11-10 18:14:33 +05:30
Nabin Hait
bac447137a
Merge pull request #6833 from KanchanChauhan/jv-documentation
...
Credit Note, Debit Note, Excise Entry info added
2016-11-09 11:42:27 +05:30
Kanchan Chauhan
b5574d3571
Credit Note, Debit Note, Excise Entry info added
2016-11-07 23:10:20 +05:30
Nagarajan
7b7b5bd340
Update getting-started-with-erpnext.md ( #6832 )
2016-11-07 17:09:41 +05:30
nagarajannxweb
a420c20bf9
Update salary-and-payroll.md
2016-11-04 12:30:14 +05:30
nagarajannxweb
4d100ac08b
Update salary-and-payroll.md
2016-11-04 12:17:21 +05:30
Nabin Hait
eab38cd4eb
Merge branch 'master' into develop
2016-11-03 15:17:39 +05:30
Nabin Hait
4c5bd43ec0
Merge pull request #6794 from neilLasrado/hotfix
...
Documentation Cleanup
2016-11-03 10:41:23 +05:30
Neil Trini Lasrado
f905ee9f0f
Updated documentation for warehouse
2016-11-01 18:58:29 +05:30
Neil Trini Lasrado
8b99a06477
Projected qty image cleanup in documentation
2016-11-01 18:48:52 +05:30
Rohit Waghchaure
c84072b16f
[Fix] jinja syntax issue
2016-11-01 17:58:10 +05:30
Nabin Hait
df01b5770b
Merge branch 'master' into develop
2016-11-01 17:44:43 +05:30
Rohit Waghchaure
2647c9a6ea
article for adjust withhold amount using payment entry
2016-11-01 16:04:00 +05:30
Nabin Hait
eb2a98faca
Merge pull request #6776 from shreyasp/coa-docs
...
[Documentation] Updated Chart of acccounts page to show new reports instead of financial analytics report
2016-11-01 11:07:39 +05:30
shreyas
9cffdba940
[Documentation] Updated Chart of acccounts page to show new reports instead of financial analytics report
2016-10-31 23:25:10 +05:30
Nabin Hait
551360ae30
Fixed merge conflict
2016-10-31 16:38:09 +05:30
Rohit Waghchaure
4fe4f267f4
[Fix] Documentation
2016-10-31 15:40:59 +05:30
Faris Ansari
8dbcbcf0f4
[documentation] Update Sales Invoice #6507 ( #6748 )
...
* [documentation] Update Sales Invoice
* add screenshot
* delete screenshot
* add correct screenshot
2016-10-29 14:38:03 +05:30
Revant Nandgaonkar
0bb92ab7a0
[docs] Email and Phone validation on Custom Fields ( #6703 )
2016-10-26 11:05:12 +05:30
pawan
8d187def12
[fix] #6363
2016-10-24 11:18:29 +05:30
Rohit Waghchaure
8055bd39ba
[Feature] Provision to allow unlink the payment against the invoice
2016-10-20 16:11:22 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
Pawan Mehta
1a96cc1e8d
Fixes 6171 ( #6417 )
...
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
2016-10-17 17:02:12 +05:30
Nabin Hait
395d757c5a
Fixed merge conflict
2016-10-17 16:42:49 +05:30
Faris Ansari
e1416c3dda
Update sales-invoice.md frappe/erpnext#6507 ( #6629 )
...
* Update sales-invoice.md
* add pos-invoice screenshot
2016-10-17 16:22:43 +05:30
Nabin Hait
401be3f49b
Merge pull request #6577 from PawanMeh/fixes_6566
...
[fix #6566 ]
2016-10-16 14:28:26 +05:30
vrms
e4e8bfae9f
Update managing-fixed-assets.md
...
Sale an asset > Sell and Asset
2016-10-10 15:33:27 +08:00
Pawan Mehta
8d62af627a
Update fiscal-year.md
2016-10-09 09:20:12 +05:30
pawan
1c0ecede06
[fix] #6567
2016-10-09 09:06:49 +05:30
pawan
05790d1b38
[fix] #6566
2016-10-09 08:30:29 +05:30
pawan
5655ce936b
[fix] #6567
2016-10-08 08:02:08 +05:30
pawan
361739ffb6
[ fix #6566 ]
2016-10-07 19:00:30 +05:30
Nabin Hait
cd9c45f816
Fixed merge conflict
2016-10-07 16:53:07 +05:30
Rohit Waghchaure
7d5298997b
Documentation for payments
2016-10-06 16:49:39 +05:30
vrms
bbe7a1062e
Update product-bundle.md
...
tried to work out the mechanics of Parent and Child items a little clearer
2016-10-06 07:40:21 +08:00
Umair Sayed
06b88a464d
Update supplier.md
2016-10-04 12:10:08 +05:30
Kanchan Chauhan
b40c0a917d
[WIP] Process Payroll Changes
2016-09-28 15:14:41 +05:30
strixaluco
71073e1730
Update stock-entry.md
...
Stock Reconciliation hyperlink added
2016-09-19 15:38:38 +08:00
Nabin Hait
5bab04fead
Merge pull request #6381 from rmehta/lead-source
...
[enhance] added Lead Source master, fixes #6231
2016-09-16 16:58:40 +05:30
Rushabh Mehta
39b5d39df6
[fix] remove campaign depends on
2016-09-16 15:55:34 +05:30
Nabin Hait
86e660f6c3
Article on maximum number of fields
2016-09-16 14:51:45 +05:30
Nabin Hait
b267673b8e
Merge pull request #6373 from vrms/patch-2
...
Patch 2
2016-09-15 16:11:56 +05:30
Nabin Hait
756467c872
Merge pull request #6372 from vrms/patch-1
...
Patch 1
2016-09-15 16:11:45 +05:30
Rushabh Mehta
33d18dbc9a
[docs] for auto email
2016-09-15 13:57:43 +05:30
vrms
05e33789aa
Update index.md
2016-09-15 14:11:06 +08:00
vrms
6d34033c3f
Update item-variants.md
...
tried to bring out the implications and meaning of Variants (compared to a regular item) a little more detailed
2016-09-15 14:05:13 +08:00
Rohit Waghchaure
4eb908fc76
Doc updated for timesheet
2016-09-12 13:27:28 +05:30
Nabin Hait
c0c2f75159
fixed conflict
2016-08-31 12:36:03 +05:30
Nabin Hait
88e3487f03
Merge pull request #6206 from neilLasrado/docs
...
Updated Docs for Schools Module
2016-08-31 12:12:17 +05:30
Nabin Hait
c97f7cac80
Merge pull request #6162 from strixaluco/patch-1
...
[minor] docs typo fix
2016-08-26 11:59:11 +05:30
joopdorresteijn
8da1e9eeb8
Update user-restriction.md
...
Sales user also doesn't exist
2016-08-25 15:46:24 +08:00
strixaluco
5380a1c56a
Update price-lists.md
...
Repetitive sentence removed.
2016-08-25 10:40:42 +08:00
strixaluco
7d60dd7e21
Update price-lists.md
2016-08-24 09:42:07 +08:00
strixaluco
a623a59f9e
[minor] docs typo fix
...
availale → available
2016-08-24 09:36:17 +08:00
Rushabh Mehta
3d93ddc606
[fix] docs links
2016-08-22 18:48:04 +05:30
Faris Ansari
3a6155b1b9
add help_links.js
2016-08-22 14:37:22 +05:30
Kanchan Chauhan
bccf0fa041
[WIP] Formula based Salary Structure and multiple employees for same Salary Structure
2016-08-18 13:02:39 +05:30
Umair Sayyed
1bd9f22add
updated docsgd
2016-08-16 18:08:24 +05:30
Umair Sayyed
f369b5951e
updated docs
2016-08-16 18:08:00 +05:30
Umair Sayyed
81995389ac
updated docs
2016-08-16 18:08:00 +05:30
Neil Trini Lasrado
999f34a568
Updated Docs for Schools Module
2016-08-16 17:50:08 +05:30
Neil Trini Lasrado
acf85dffc5
Merged docs for schools to erpnext docs
2016-08-08 18:59:15 +05:30
Umair Sayyed
3962cded76
updated docs
2016-08-04 19:01:02 +05:30
Umair Sayyed
66360f694e
updated docs
2016-08-04 19:01:02 +05:30
Umair Sayyed
5dba950afa
docs update
2016-08-04 19:01:02 +05:30
Umair Sayyed
6a3f51bee2
updated docs
2016-08-04 19:01:02 +05:30
Rushabh Mehta
efe1ab742f
[minor] fixes for demo
2016-08-04 17:29:46 +05:30
Umair Sayyed
e96b3ce725
added documentation for the new features
2016-08-01 17:42:30 +05:30
Revant Nandgaonkar
cc8fb1a8d6
changed path to login
...
frappe.templates.pages.login.login_via_google changed to frappe.www.login.login_via_google
2016-07-28 19:50:15 +05:30
Umair Sayyed
6fcfc87d60
Documentation of Timesheet, Budgeting and Payment Entry
2016-07-22 15:22:56 +05:30
Dony Sukardi
84c9e6bb4a
[fix] Documentation Fixes
...
Fixes for the following issues:
- Render code block
- Fix ordered-list numbering
2016-07-12 04:01:06 +08:00
Rohit Sharma
c4fcd1996a
Update index.md
...
I have added few points and enhanced some of the existing text. Please accept the changes.
2016-06-30 16:44:59 +05:30
Rohit Waghchaure
d6c986da8f
[Enhancement] Time log wages and multiple active salary structure
2016-06-27 16:46:39 +05:30
Nabin Hait
2efecac823
Merge pull request #5522 from cgpurbaugh/patch-2
...
Some minor grammatical and spelling changes
2016-06-25 13:54:19 +05:30
Rushabh Mehta
a334062b03
[redesign] website routing system
2016-06-24 16:18:07 +05:30
Rushabh Mehta
4d54fb258c
Merge pull request #5514 from cgpurbaugh/patch-1
...
Update tasks.md
2016-06-22 12:09:21 +05:30
Christopher G. Purbaugh
01d4d30e8a
Some minor grammatical and spelling changes
2016-06-21 15:42:20 -04:00
Christopher G. Purbaugh
55990efe29
Update index.md
...
Removed some repetitive text, changed some of the wording.
2016-06-20 15:08:08 -04:00
Christopher G. Purbaugh
22e0489ac7
Update tasks.md
2016-06-20 14:36:28 -04:00
Christopher G. Purbaugh
7f89c1aec0
Update tasks.md
...
Just some small grammatical corrections
2016-06-20 14:28:44 -04:00
Umair Sayyed
5918dc87f3
small fixes
2016-06-17 12:28:21 +05:30
