Commit Graph

885 Commits

Author SHA1 Message Date
Makarand Bauskar
1d962dd3f7 removed conflicts 2017-06-23 18:11:58 +05:30
Makarand Bauskar
bbf81aa3a4 image title translation 2017-06-23 18:11:00 +05:30
Makarand Bauskar
862302f02d image title translation 2017-06-23 18:10:06 +05:30
Makarand Bauskar
408336e7ad image title translation 2017-06-23 18:08:45 +05:30
Makarand Bauskar
ab49c3100d corrected image title 2017-06-23 18:04:56 +05:30
Frappe
a951e56f9c Modified help pages 2017-06-23 16:49:35 +05:30
Frappe
1f8e5fbcb1 Edited help page 2017-06-23 16:48:46 +05:30
Frappe
ca6fed359b Added help pages for Subcontracting and deleted old images 2017-06-23 16:48:17 +05:30
Frappe
9a8f33f855 Replaced screenshot in help pages, links to #9241 2017-06-23 11:30:26 +05:30
Frappe
8181a7463e added help page for Kanban Board, links to #9241 2017-06-23 11:30:26 +05:30
Frappe
ac08fbd438 added test documentation 2017-06-23 11:30:26 +05:30
Rushabh Mehta
210b6f8f7e [docs] 2017-06-22 22:32:08 +05:30
Rushabh Mehta
919a74ad88 [gst] adde reports + docs 2017-06-22 22:32:08 +05:30
Makarand Bauskar
e995371b08 Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings
[Enhance] Company wise perpetual inventory settings
2017-06-22 12:35:41 +05:30
Makarand Bauskar
1b6746e3bc Merge pull request #9388 from saurabh6790/dropbox_doc_fix
[update] dropbox documentation to show how to set redirect url to create access token
2017-06-21 19:10:45 +05:30
Umair Sayyed
5057098a19 Updated help pages and removed old images, links to #9262 2017-06-21 17:54:39 +05:30
Saurabh
88b642637b update dropbox documentation to show how to set redirect url to create access token 2017-06-20 19:01:16 +05:30
Umair Sayyed
357cd6df90 added new images, links #9262 2017-06-20 18:19:50 +05:30
Umair Sayyed
3292e59dcd Replaced old images with new, links to #9262 2017-06-20 18:17:40 +05:30
frappe-pr-bot
db4bb720b8 [translation] translation updates 2017-06-20 11:22:36 +02:00
Makarand Bauskar
22773a29f7 Merge pull request #9356 from tundebabzy/issue_6510
adds information about "Is Paid" and "Update Stock"
2017-06-20 12:04:16 +05:30
Rohit Waghchaure
65ccb42f95 fixed document 2017-06-20 10:21:34 +05:30
tunde
4961072b51 adds the corrected breadcrumbs trail 2017-06-19 13:51:27 +01:00
tunde
46db749d62 adds information about "Is Paid" and "Update Stock" 2017-06-19 09:18:57 +01:00
Umair Sayed
ac2e32a511 replaced some old images with new, #9262 (#9335) 2017-06-19 09:23:04 +05:30
Umair Sayed
5dadb0e19a created help page for email inbox, fixes #9262 (#9315) 2017-06-16 11:57:44 +05:30
Nabin Hait
6d7b0ce794 Warehouse Account Linking (#9292)
* [enhance] Added account in the warehouse

* documentation

* patch to move account head from account to warehouse

* fixed test cases

* Fixes in warehouse-account linking

* minor fix in test case
2017-06-15 11:09:27 +05:30
Umair Sayed
0b8e19b5d8 Added new help pages as per OKR - DO NOT MERGE (#9291)
* added help pages on Assessment, delete and restore documents and Document versioning, fixed #9262

* some fixes in help docs
2017-06-14 19:40:08 +05:30
Makarand Bauskar
a7a7c835cc Merge pull request #9196 from msiddiq0/patch-2
Fix incorrect youtube link on Video Tutorials
2017-06-13 17:05:50 +05:30
Makarand Bauskar
f339f6d69f Merge pull request #9195 from msiddiq0/patch-1
Fixed wrong YouTube video link
2017-06-13 17:05:36 +05:30
Makarand Bauskar
65f5cf3fc1 Merge pull request #9197 from msiddiq0/patch-3
Fix incorrect YouTube link on Video Tutorials
2017-06-13 17:05:19 +05:30
Makarand Bauskar
0c5d732cd8 Merge pull request #9208 from mbauskar/docs
removed {next} from documentation and removed the globals from custom scripts
2017-06-13 16:32:26 +05:30
mbauskar
828804fab0 [minor] removed the {next} from the last articles 2017-06-09 17:30:36 +05:30
mbauskar
11f0ee3cac [docs] removed the globals from documentation 2017-06-09 17:23:06 +05:30
msiddiq0
a05c168808 Fix incorrect YouTube link on Video Tutorials
The original YouTube video is private and not viewable by anyone. I linked the publicly viewable YouTube video for "Report Builder" now.
2017-06-08 21:02:45 -04:00
msiddiq0
a095d6e04b Fixing youtube link
Wrong youtube video linked here: "Managing Advance Payments". Linked to correct video now: "Bulk Update"
2017-06-08 20:51:50 -04:00
msiddiq0
03183332b4 Fixed wrong YouTube video link
The original link here led to video on "Bulk Update" not "Budgeting". I went and found the Budgeting video and linked it here now.
2017-06-08 20:10:18 -04:00
Nabil Kadimi
41f6f4c200 Fix type (entrys) (#9131) 2017-06-07 20:08:11 +05:30
Nabil Kadimi
347a79db5a Fix typo (#9133) 2017-06-07 12:06:05 +05:30
Makarand Bauskar
2f17e70793 [minor] removed the {next} for last page (#9002) 2017-05-24 18:35:35 +05:30
Gaurav Naik
7f02714c26 Documentation for Allow Login using Mobile Number (#8918) 2017-05-19 16:03:05 +05:30
Julian Robbins
3d6567411d Spelling improvmement (#8866) 2017-05-17 19:36:15 +05:30
tundebabzy
cf7df5d106 fixes #8883 (#8885) 2017-05-17 19:17:04 +05:30
Saurabh
aa1be1ce92 [documentaion] stripe documentation (#8780) 2017-05-16 09:30:07 +05:30
Julian Robbins
62e3e75555 Addition of Imap to description of usable mail accounts (#8806) 2017-05-13 09:55:23 +05:30
Umair Sayyed
175646572a updated help pages 2017-04-25 16:27:50 +05:30
Ishan Loya
0dbe8547e7 Add screenshot to documentation, change naming series to BG-#####, make Bank Guarantee number unique 2017-04-25 16:08:22 +05:30
Ishan Loya
c7a72684fd Add bank guarantee doctype with documentation 2017-04-25 16:08:22 +05:30
Ishan Loya
04c69fb46d Minor fix 2017-04-24 10:44:36 +05:30
Ishan Loya
f04ef8dfe0 Update documentation for Production Order skipping material transfer entry option 2017-04-24 10:44:36 +05:30
Rushabh Mehta
e385b5b97b [enhance] automatic batch creation, move and split 2017-04-24 10:28:38 +05:30
Julian Robbins
2e6f12b850 Update purchase-details.md 2017-04-19 20:55:04 +05:30
Nabin Hait
310d238d17 Merge pull request #8460 from rohitwaghchaure/client_followup_report
Client followup report
2017-04-17 14:13:38 +05:30
Nabin Hait
5e25731188 Update crm_reports.md 2017-04-17 14:13:20 +05:30
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
mbauskar
b9d0e7622a [translation] translation updates for - erpnext on 2017-04-04 2017-04-11 18:57:48 +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
Faris Ansari
49a3d6d8f6 Update POS screenshot 2017-03-28 16:17:30 +05:30
Nabin Hait
4a8a62a202 Merge pull request #8053 from umairsy/video-pages
updated erpnext-learn pages
2017-03-23 17:02:34 +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
3011006ff2 Merge pull request #8097 from frappe/netchampfaris-documentation-1
Add new screenshots for Workflows documentation
2017-03-22 17:50:17 +05:30
Faris Ansari
1e7f739c84 Add new screenshots for Workflows documentation 2017-03-22 17:48:51 +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
Umair Sayyed
024896d806 updated erpnext-learn pages 2017-03-17 12:55:01 +05:30
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
KanchanChauhan
993358d5d7 Update install.md 2017-02-14 15:12:07 +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
c13dbd408f [Enhancement] POS Redesign (#7639)
* item group, discount

* POS Redesign

* offline customer

* removed offline records from modal view
2017-02-01 18:07:22 +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
Kanchan Chauhan
f7b25cbb6b [WIP] Payroll Updates 2016-12-08 12:20:20 +05:30
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
8da43fe074 add selling-flow 2016-11-29 11:22:57 +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
64d1c95afe add taxes gif 2016-11-28 13:15:29 +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
Nabin Hait
09f7a7a977 Merge pull request #7013 from rmehta/remove-features-setup-docs
[fix] remove feature setup docs
2016-11-21 19:05:04 +05:30
Rushabh Mehta
0d5d4aefe5 [docs] added style 2016-11-21 18:47:00 +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
f4068fd6f1 Fixed merge conflict 2016-11-01 15:06:55 +05:30