Commit Graph

698 Commits

Author SHA1 Message Date
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
3769996dfd Images for redesigned salary docs 2016-08-18 23:06:16 +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
Nabin Hait
595d3c03ef updated docs for fixed asset 2016-04-20 18:17:05 +05:30
Nabin Hait
cd0e8ce8ad Fixes and modification in fixed asset 2016-04-20 17:57:12 +05:30
Nabin Hait
3d9c5c0c20 Fixed Asset module cleanup and fixes 2016-04-20 17:57:11 +05:30
Agus Syahputra
155edfc43e Update quotation.md 2016-04-08 17:55:04 +07:00
Agus Syahputra
34f6145e9d Update opening-stock.md 2016-04-08 16:35:59 +07:00
Rushabh Mehta
87736b7fc3 Merge pull request #5109 from agusputra/patch-27
Update managing-batch-wise-inventory.md
2016-04-01 11:44:27 +05:30
Agus Syahputra
623f9f6bef Update managing-batch-wise-inventory.md 2016-04-01 12:21:26 +07:00
Agus Syahputra
c30dc6d2e6 Update managing-assets.md 2016-03-31 17:12:41 +07:00
Rushabh Mehta
1d05ada5e9 Merge pull request #4950 from nabinhait/fixed_asset_depreciation
Fixed asset depreciation
2016-03-29 16:39:31 +05:30
Umair Sayyed
d6d283b424 edited perpetual inventory system 2016-03-29 11:57:38 +05:30
Umair Sayyed
cf3c371367 update in the Accounts manual 2016-03-29 11:57:38 +05:30
Nabin Hait
fb03b96992 fixed asset fixes 2016-03-29 11:54:38 +05:30
Nabin Hait
7de15321c9 [docs] Managing fixed assets 2016-03-29 11:54:38 +05:30
Nabin Hait
fc937ee370 [docs] managing fixed assets 2016-03-29 11:54:37 +05:30
Rushabh Mehta
e1b20a0b29 Merge pull request #5044 from rohitwaghchaure/add_margin_feature
[Enhancement] Add margin in sales flow.
2016-03-28 18:27:05 +05:30
rohitwaghchaure
44d0449895 [enhancement] request for quotation 2016-03-28 12:13:07 +05:30
mbauskar
a720c89535 [docs] documentation for adding margin in Quoation and SO 2016-03-24 14:07:51 +05:30
Agus Syahputra
383b13cdb5 Update allow-over-delivery-billing-against-sales-order-upto-certain-limit.md 2016-03-19 08:31:50 +07:00
Nabin Hait
fc827b329e Merge pull request #4932 from ci2014/patch-2
Update purchase-return.md
2016-03-16 12:33:33 +05:30
Nabin Hait
1f11b96533 Merge pull request #4931 from ci2014/patch-1
Update sales-return.md
2016-03-16 12:32:42 +05:30
Umair Sayyed
d3ed3638cf updated manual 2016-03-14 19:28:53 +05:30
Anand Doshi
01a8473996 [fix] [docs] removed contents.md 2016-03-12 00:08:38 +05:30
ci2014
73db44d0b9 Update purchase-return.md
Added back {next}
2016-03-11 11:27:17 +01:00
ci2014
1e735a87aa Update purchase-return.md
Fixed the images.
2016-03-08 17:13:18 +01:00
ci2014
6dd7e682af Update sales-return.md
Fixed the images.
2016-03-08 15:13:04 +01:00
strixaluco
184f0fa264 Minor typo fix in bulk-rename.md 2016-03-08 16:57:04 +08:00
ci2014
fde7bfec31 Update purchase-return.md
You swapped sales return and purchase return in the german documentation, see https://github.com/frappe/erpnext/pull/4931
2016-03-07 00:45:15 +01:00
ci2014
943d707021 Update sales-return.md
You swapped sales return and purchase return in the german documentation.
2016-03-07 00:42:55 +01:00
frehu01
eb5ad3f793 Update journal-entry.md 2016-03-06 17:52:29 +01:00
Rushabh Mehta
c72267b98b Merge pull request #4919 from agusputra/patch-24
Update item-price.md
2016-03-03 11:30:01 +05:30
Agus Syahputra
32362f14f4 Update item-price.md 2016-03-03 08:03:59 +07:00
Jesús Ayala
18bfad5a66 Update concepts-and-terms.md 2016-03-02 10:05:45 -03:00
Rushabh Mehta
cbed331047 Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test
Multilingual print format test
2016-03-01 17:10:50 +05:30
rohitwaghchaure
4151e3dc92 [enhancement] Multi-lingual print format 2016-03-01 16:33:08 +05:30
Rushabh Mehta
6020e9ceb3 Merge pull request #4906 from smorele/doc_fixes
fixe broken links
2016-03-01 16:15:56 +05:30
smorele
0a58d9e0f4 fixe broken links 2016-03-01 09:53:23 +01:00
Rushabh Mehta
45fd073094 Merge pull request #4897 from agusputra/patch-23
Update withdrawing-salary-from-owners-equity-account.md
2016-02-29 17:35:18 +05:30
Rushabh Mehta
980a00d9d7 Merge pull request #4892 from agusputra/patch-22
Update update-stock-option-in-sales-invoice.md
2016-02-29 17:34:54 +05:30
Rushabh Mehta
95ffe3bc7b [docs] added work-in-progress for Spanish manual 2016-02-29 17:22:25 +05:30
paulocoronado
18d465dc0d Adding WORK IN PROGRESS 2016-02-29 17:22:25 +05:30
paulocoronado
23ef60a467 work in progress
Spanish Transalation
2016-02-29 17:22:24 +05:30
paulocoronado
8f6b1e0549 Páginas de inicio de la traducción al español.
First commit of Spanish translation
2016-02-29 17:22:24 +05:30
Agus Syahputra
1b28f58829 Update withdrawing-salary-from-owners-equity-account.md 2016-02-29 08:04:02 +07:00
Agus Syahputra
034fcb3410 Update update-stock-option-in-sales-invoice.md 2016-02-28 11:49:00 +07:00
Nabin Hait
f34e63123f Merge pull request #4877 from agusputra/patch-18
Update period-closing-voucher.md
2016-02-27 10:11:20 +05:30
Nabin Hait
598c9c4679 Merge pull request #4884 from umairsy/feb-2nd
updated manual
2016-02-27 10:10:34 +05:30
Nabin Hait
e0cc597f70 Merge pull request #4888 from agusputra/patch-19
Update freeze-accounting-entries.md
2016-02-27 10:02:24 +05:30
Agus Syahputra
8fa6f79f7e Update managing-transactions-in-multiple-currency.md 2016-02-27 07:22:50 +07:00
Agus Syahputra
f7face6384 Update freeze-accounting-entries.md 2016-02-27 07:08:20 +07:00
Umair Sayyed
d1029b54c2 updated manual 2016-02-26 17:32:44 +05:30
Agus Syahputra
91bd4ce3e1 Update period-closing-voucher.md 2016-02-26 07:45:14 +07:00
Nabin Hait
57b30430e4 Merge pull request #4695 from neilLasrado/develop
Material Request of type Manufcture
2016-02-24 12:30:53 +05:30
Nabin Hait
1a16a4f394 Merge pull request #4863 from agusputra/patch-17
Update opening-accounts.md
2016-02-24 11:11:06 +05:30
Agus Syahputra
6338f407d9 Update opening-accounts.md 2016-02-24 07:28:46 +07:00
Agus Syahputra
eeda0460d4 Update multi-currency-accounting.md 2016-02-24 07:26:06 +07:00
Neil Trini Lasrado
0dd8500393 Fixed Documentation 2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
d5e15eaadf Added test cases 2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
abd9248ba6 Rename sales_order_no to sales_order in Material Request Item 2016-02-23 18:35:43 +05:30
saurabh
2e2dd0fb42 Documentation of multilingual print format and minor fixes 2016-02-23 02:17:04 +05:30
sbkolate
b17d4035c1 better validation example for developer
throw "past date selected" will freeze the form and user can not correct value of  from_date.
but validated false will just throw the pop-up and user can correct value of from_date and save the form.

Example changed from Event to Task because same is available in Custom Script Help for desk user
2016-02-22 17:16:34 +05:30
Agus Syahputra
e9a1f1c5d8 Update payment-request.md 2016-02-13 10:35:42 +07:00
Umair Sayyed
4715df1518 Removed current directory 2016-02-10 15:19:35 +05:30
Umair Sayyed
fc8d0f6ac7 help on manufacturing module 2016-02-10 15:19:35 +05:30
Agus Syahputra
cb7337f466 Update search-record-by-specific-field.md 2016-02-09 09:20:26 +07:00
Agus Syahputra
68e6919d41 Update managing-dynamic-link-fields.md 2016-02-09 01:04:01 +07:00
Agus Syahputra
451ee87e9f Update allow-fields-to-be-changed-after-submit.md 2016-02-08 15:16:42 +07:00
Rushabh Mehta
467f5c7a75 Merge pull request #4751 from agusputra/patch-11
Update calendar.md
2016-02-08 10:59:06 +05:30
Rushabh Mehta
e881b40ab2 Merge pull request #4759 from Tropicalrambler/patch-2
Corrected typo while translating
2016-02-08 10:10:57 +05:30
Tropicalrambler
3ebd956090 Duplicate last line delete
Deleted the last line which was duplicated. Both read exactly the same.  Only one line is necessary.
2016-02-07 18:56:44 -06:00
Tropicalrambler
b01f1d2486 Corrected typo while translating
Found a switch of letters:  "wrokstation" instead of "workstation".  Corrected the item appropriately.  Found this while translating my fork of this page to spanish.
2016-02-07 16:39:12 -06:00
Agus Syahputra
4c0c69b388 Update calendar.md 2016-02-07 11:45:10 +07:00
Rushabh Mehta
16d58560a0 Merge pull request #4750 from agusputra/patch-10
Update wesite-home-page.md
2016-02-06 09:40:05 +05:30
Agus Syahputra
12acd11814 Update wesite-home-page.md 2016-02-06 08:13:29 +07:00
Agus Syahputra
c4d3283879 Update blogger.md 2016-02-06 07:21:42 +07:00
Agus Syahputra
e24cfdc556 Update overwriting-data-from-data-import-tool.md 2016-02-05 08:27:20 +07:00
Rushabh Mehta
d50356dbab [docs] remove /docs/current from repo, they are re-built anyways 2016-02-04 17:10:24 +05:30
Nabin Hait
31619f0a83 [docs] 2016-02-03 15:13:55 +05:30
Valmik Jangla
0ec9b90113 Updated documentation 2016-02-02 18:29:09 +05:30
Nabin Hait
fcd4f2b86b Merge pull request #4706 from vrms/vrms-patch-1
Update implementation-strategy.md
2016-02-01 15:47:57 +05:30
Nabin Hait
1277a61dad Merge pull request #4720 from agusputra/patch-7
Update delete-a-company-and-all-related-transactions.md
2016-02-01 15:47:07 +05:30
Anand Doshi
43cdf792f9 Merge pull request #4715 from agusputra/patch-6
Update stock-reconciliation-for-non-serialized-item.md
2016-02-01 14:17:24 +05:30
Agus Syahputra
e0825aaea9 Update delete-a-company-and-all-related-transactions.md 2016-02-01 08:20:36 +07:00
Agus Syahputra
0277dbc6b6 Update stock-reconciliation-for-non-serialized-item.md 2016-01-30 07:28:28 +07:00
Agus Syahputra
93a69e9485 Update authorization-rule.md 2016-01-29 23:41:46 +07:00
Anand Doshi
95760a7db6 Merge pull request #4680 from shyjuk/patch-1
Update index.md
2016-01-29 12:19:14 +05:30
Umair Sayyed
bf225c11b4 fixed articles 2016-01-27 18:19:31 +05:30
Umair Sayyed
694edbc89a updated articles 2016-01-27 18:19:31 +05:30
Umair Sayyed
6406f8bda0 discount article 2016-01-27 18:19:30 +05:30
Umair Sayyed
2901e14c59 articles 2016-01-27 18:19:30 +05:30