Commit Graph

652 Commits

Author SHA1 Message Date
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
Rushabh Mehta
528e145a54 [docs] fixes #5697 2016-07-14 17:00:05 +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
Rushabh Mehta
eb1e0673e2 Merge pull request #5354 from saurabh6790/cheque_print
Cheque print
2016-06-02 17:48:58 +05:30
Michael Kressibucher
f96ec0950d [doc] fixed typo 2016-05-29 17:57:37 +02:00
Saurabh
e450490bfb [document] document for cheque print 2016-05-24 10:28:16 +05:30
Saurabh
81501ddc6d [fixes] add setting to mark cheque account pay only 2016-05-24 10:28:14 +05:30
Nabin Hait
ca90963d5b Redesigned budgets 2016-05-23 13:04:26 +05:30
François
dfc0a30e69 minor edits 2016-05-22 14:22:02 +02:00
Rushabh Mehta
dc997dc426 Merge pull request #5352 from fderyckel/patch-2
Update multi-currency-accounting.md
2016-05-16 12:02:23 +05:30
Rushabh Mehta
03578620e0 Merge pull request #5338 from fderyckel/patch-1
Update make-field-visible-in-print-format.md
2016-05-16 12:00:15 +05:30
Rushabh Mehta
a9e3936b20 Merge pull request #5335 from neilLasrado/patch-1
Update manufacturing-settings.md
2016-05-16 11:57:48 +05:30
Rushabh Mehta
6471e178f6 Merge pull request #5321 from rohitwaghchaure/rfq_fixes
[Fixes] RFQ minor fixes
2016-05-16 11:57:35 +05:30
François
0802c56625 Update multi-currency-accounting.md 2016-05-15 20:21:08 +02:00
kressi
472a84ab13 fixed broken links and links to content in different language 2016-05-13 15:22:22 +02:00
kressi
28737b6808 fixed formatting and punctuation 2016-05-13 14:37:42 +02:00
kressi
e7c773310b fixed typos and inconsistencies 2016-05-13 13:20:25 +02:00
Michael Kressibucher
c53df03262 fixed typo 2016-05-12 15:14:52 +02:00
François
d9f7364289 Update make-field-visible-in-print-format.md
Change a few typo
2016-05-12 06:32:40 +02:00
Rohit Waghchaure
29c7876e87 [Fixes] RFQ minor fixes 2016-05-11 19:38:29 +05:30
Neil Trini Lasrado
0b1d7c032a Update manufacturing-settings.md 2016-05-11 16:47:55 +05:30
IAGAdmin
63b33d0478 Update concepts-and-terms.md 2016-05-11 09:43:10 +08:00
Valmik
5fb86ce570 Minor link fix 2016-05-06 12:06:40 +05:30
Anand Doshi
b114f73cfe Merge pull request #5299 from vjFaLk/alert-docs
Updated Email Alert docs
2016-05-04 16:14:28 +05:30
Valmik Jangla
f3c203ba2c Updated Email Alert docs 2016-05-02 18:24:17 +05:30
Rushabh Mehta
764aa92da4 [minor] added remember_selected in hooks and doc update 2016-05-02 13:28:59 +05:30
Nabin Hait
f2008b95e8 [docs] Fixed asset movement 2016-04-28 18:40:58 +05:30