Commit Graph

223 Commits

Author SHA1 Message Date
Rushabh Mehta
0fcf44e1a2 User Permissions Redesign (#10006)
* [fixes] for user permission

* [docs] updated docs for user permissions

* [docs] updated docs for user permissions

* [docs] updated docs for user permissions
2017-07-28 14:33:15 +05:30
Rohit Waghchaure
120b6c0b3c UI test cases and documentation 2017-07-28 01:52:10 +05:30
Saurabh
dc6e369172 Merge branch 'master' into develop 2017-07-25 16:42:28 +05:30
Frappe PR Bot
3b128cabb2 [Translation] Updated Translations (#10047) 2017-07-25 11:46:16 +05:30
ci2014
13abada526 Update email-account.md (#10066)
* Update email-account.md

Add information to conditional import

* Add files via upload
2017-07-25 11:06:03 +05:30
bcornwellmott
96381da547 Supplier Scorecard (#9294)
* Initial start of scorecard docs

* Got basic functionality working

* Fixed doc names and added key functions

* Basic functional version minus Actions

* Hide scorecard docs until functional

* Created supplier scorecard documentation

* Added default variables and standings. Added restrictions for PO + RFQ

* Automatic daily scorecard creation + on save

* Added warning for PO nd RFQs

* Minor fixes for codepy, automatically add variables for criteria, fix hooks.py typo

* Added tests, fixed codacy formatting, small improvements

* Fixed test bug w/ criteria. Codacy cleanup

* Fixed codacy issues. Fixed sticky criteria

* Fixed bug with period search. Remove blank variable child.

* Updated docs, automatically add criteria and standings, clean up period create message

* Uncommented test, set docs to beta

* Fix for nabinhait review

* Fix codacy issue. Fix dict assignment for records
2017-07-24 22:42:30 +05:30
Nabin Hait
8e0f23efc7 Multiple delivery dates in Sales Order and make DN based on selected delivery dates (#9933)
* Multiple delivery dates in Sales Order and make DN based on selected delivery dates

* Test case and some other minor fixes

* Updated docs for multi delivery date

* removed the trailing whitespace

* removed the trailing whitespace

* removed trailing whitespace
2017-07-20 10:30:59 +05:30
Prateeksha Singh
e012e24423 Sales Goal by Company (#9723)
* [sales goal] in company; dashboard, graph, notifs, wiz

* [test] target notifications

* cache past year monthly sales of every company daily, patch

* [minor] query fixes

* update sales goal docs
2017-07-18 10:35:12 +05:30
Nabin Hait
b962fc1573 Show hsn code in tax breakup for India and render via template (#9866)
* Show hsn code in tax breakup for India and render via template

* tax breakup if gst_tax_field does not exists

* Fixed tax-breakup test cases
2017-07-17 18:02:31 +05:30
rohitwaghchaure
ea4497c8d2 Renamed the report Support Hours to Support Hours Distribution (#9874) 2017-07-17 14:55:42 +05:30
mbauskar
a52e726b6b [docs] corrected the filename from sms_setting2 -> sms_settings2 2017-07-10 18:11:32 +05:30
Nabin Hait
7773ee8960 Sales invoice dashboard, multiple letter head in report and email alert docs 2017-07-07 12:49:05 +05:30
Nabin Hait
f3f0dfef2a Invoice copy, state code in gst print format, hsn code in other sales/purchase docs (#9658)
* Invoice copy, state code in gst print format, hsn code in other sales/purchase docs

* Formatted Net Amount in item-tax-breakup

* GST print format fixes

* removed trailing whitespace

* removed trailing whitespace
2017-07-06 14:49:34 +05:30
Nabin Hait
02c8607d04 Production Order Documentation for Required Items table (#9647) 2017-07-06 11:28:07 +05:30
Nabin Hait
852cb64e4f GST tax invoice print format and more (#9616)
* GST Tax Invoice print format and more. Fixes #9545 #9566 #9608

* Reload gst print format only for Indian users

* Fixes as Codacy
2017-07-05 12:58:19 +05:30
Frappe PR Bot
3ceab64bfa [translation] translation updates (#9611) 2017-07-04 16:08:14 +05:30
Frappe
79918c66c2 Deleted old Images and added Global Search Help page 2017-07-03 15:58:14 +05:30
Makarand Bauskar
24ab20fe11 Merge pull request #9467 from rohitwaghchaure/support_hours_report
[enhance] Report for analysis of support hours count
2017-06-29 11:19:41 +05:30
mbauskar
3b0e6cecd6 [minor] fixed broken image url in gst documentation 2017-06-28 12:29:19 +05:30
Makarand Bauskar
eef3f62ff7 Merge pull request #9488 from rmehta/gst-reminder
[regional] ability to send gst reminders to all parties
2017-06-27 19:33:05 +05:30
Rushabh Mehta
00ae424cac [regional] ability to send gst reminders to all parties 2017-06-27 17:31:41 +05:30
Makarand Bauskar
90a3e60de7 Merge pull request #9372 from pratu16x7/serial-batch-entry
Serial no/batch entry dialog
2017-06-27 16:12:30 +05:30
Makarand Bauskar
5d8803b23e Merge pull request #9435 from rmehta/gst
GST (India) Setup and Invoices #8711
2017-06-27 11:44:33 +05:30
pratu16x7
f970ca4d35 Update docs 2017-06-27 10:12:58 +05:30
Rohit Waghchaure
67526f244e [enhance] Report for analysis of support hours count 2017-06-26 17:04:52 +05:30
Makarand Bauskar
ebaea08225 Merge pull request #9437 from Arundhatii/20Jun
Added help pages and deleted old images links to #9241
2017-06-23 18:54:45 +05:30
rohitwaghchaure
8f51a5e527 In POS on click of delete button, remove the selected item from the cart (#9428) 2017-06-23 18:17:04 +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
Rushabh Mehta
210b6f8f7e [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
Rohit Waghchaure
65ccb42f95 fixed document 2017-06-20 10:21:34 +05:30
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
Gaurav Naik
7f02714c26 Documentation for Allow Login using Mobile Number (#8918) 2017-05-19 16:03:05 +05:30
Saurabh
aa1be1ce92 [documentaion] stripe documentation (#8780) 2017-05-16 09:30:07 +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
Rushabh Mehta
e385b5b97b [enhance] automatic batch creation, move and split 2017-04-24 10:28:38 +05:30
Rohit Waghchaure
6681b0d2aa Documentation 2017-04-14 17:14:03 +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
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
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
1e7f739c84 Add new screenshots for Workflows documentation 2017-03-22 17:48:51 +05:30
Rushabh Mehta
a07c43fd68 [feature] ability to have variants based on manufacturer 2017-03-21 17:48:34 +01:00
pratu16x7
4e71337f3d fix lead, customer, opportunity pages 2017-03-01 04:02:50 +05:30
mbauskar
edaa43d9b8 [docs] manual feedback request and minor fixes 2017-02-10 11:28:45 +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
Kanchan Chauhan
ce116417e1 New screenshots for Calendar user manual 2017-01-25 15:38:35 +05:30
Kanchan Chauhan
f80c2b9606 Fleet management moved to HR 2017-01-16 14:38:24 +05:30
Neil Trini Lasrado
fef568ecfa Documentation for Training Module 2016-12-13 16:48:50 +05:30
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
d849093dff CRM: Customer page fixes 2016-11-30 15:41:30 +05:30
Faris Ansari
8da43fe074 add selling-flow 2016-11-29 11:22:57 +05:30
Rohit Waghchaure
59844a12aa [fix] documentation 2016-11-28 15:51:05 +05:30
Faris Ansari
64d1c95afe add taxes gif 2016-11-28 13:15:29 +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
Umair Sayyed
829e00c2e6 [Fixed] Documentation #6892 2016-11-24 17:41:29 +05:30
Saurabh
8cd1918a3c [documentaion] Documentaion for setting up Integration Service 2016-11-23 19:09:43 +05:30
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
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
shreyas
2cb294c8b4 [Docs] Updated docs for supplier quotation and purchase order 2016-11-10 18:14:33 +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
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
pawan
03a77b1b65 [fix] 6363 2016-10-24 11:18:29 +05:30
pawan
8d187def12 [fix] #6363 2016-10-24 11:18:29 +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