Commit Graph

639 Commits

Author SHA1 Message Date
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
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
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
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
f4068fd6f1 Fixed merge conflict 2016-11-01 15:06:55 +05:30
Nabin Hait
22161566ed Update index.md 2016-11-01 12:36:03 +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