Commit Graph

9122 Commits

Author SHA1 Message Date
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
Rushabh Mehta
b62ed7a603 [fix] install issue 2016-10-13 11:00:00 +05:30
Rushabh Mehta
257bbbe588 [refactor] has_website_permission parameters 2016-10-12 10:53:34 +05:30
RobertSchouten
bb7308bbc1 [fix] email digest date range starting with opening balance of day one not closing (#6524)
ie monthly currently get's balance at the end of 1st of september to the 30th of september instead of the beginning of the 1st aka the end of the 31st fo august
2016-10-10 17:17:39 +05:30
Saurabh
afa14fc402 [fix][minor] (#6449) 2016-10-10 17:17:17 +05:30
Nabin Hait
1765259043 Merge pull request #6591 from vrms/patch-4
Update managing-fixed-assets.md
2016-10-10 17:12:58 +05:30
Rushabh Mehta
2757d8ef03 [minor] [perm] allow owner to read student applicant 2016-10-10 16:46:24 +05:30
Faris Ansari
a0608d463a [gantt] Gantt fixes (#6490)
* [gantt] fix Gantt Chart link in Modules

* [gantt] added field for Task dependent
2016-10-10 14:32:35 +05:30
vrms
e4e8bfae9f Update managing-fixed-assets.md
Sale an asset > Sell and Asset
2016-10-10 15:33:27 +08:00
Rushabh Mehta
ac5b193100 [minor] direct student admission to the list page 2016-10-09 15:19:23 +05:30
Nabin Hait
fc2a9e64fc Fixed version conflict 2016-10-07 17:09:28 +05:30
Nabin Hait
89326b366d bumped to version 7.0.58 2016-10-07 17:38:57 +06:00
Nabin Hait
6aaa7d7742 Added missing file extension 2016-10-07 17:08:03 +05:30
Nabin Hait
df61513037 Fixed merge conflict 2016-10-07 17:05:00 +05:30
Nabin Hait
d17bbdeb4d bumped to version 7.0.57 2016-10-07 17:34:35 +06:00
Nabin Hait
2f3a68b8d6 Added missing file extension 2016-10-07 17:03:37 +05:30
Nabin Hait
cd9c45f816 Fixed merge conflict 2016-10-07 16:53:07 +05:30
Nabin Hait
06195de812 bumped to version 7.0.56 2016-10-07 17:17:17 +06:00
Nabin Hait
ad8218e5ac minor fix 2016-10-07 16:39:30 +05:30
Nabin Hait
9bfef84545 Merge branch 'notification-center' of https://github.com/shreyasp/erpnext into shreyasp-notification-center 2016-10-07 16:37:10 +05:30
Nabin Hait
81754954cb Update update_timesheet_communications 2016-10-07 16:08:44 +05:30
Nabin Hait
2907881dfb Update update_timesheet_communications 2016-10-07 16:07:11 +05:30
Nabin Hait
0799969063 Update set_portal_settings.py 2016-10-07 14:55:17 +05:30
Nabin Hait
20e96b77bd Update set_portal_settings.py 2016-10-07 14:54:28 +05:30
shreyas
c1b7104126 [Fix] Minor changes to logic 2016-10-07 14:20:51 +05:30
Nabin Hait
2f75b7b42e Fixed merge conflict 2016-10-07 14:16:17 +05:30
Rohit Waghchaure
770d04e633 [Fix] sales order status showing completed, while it's status was to bill 2016-10-07 13:55:48 +05:30
Rohit Waghchaure
022d87969d [Fix] Issue in merging duplicate item 2016-10-07 13:40:45 +05:30
shreyas
a1d7646e70 [Fix] Allow user to save Notification Control without selecting transaction 2016-10-07 12:58:58 +05:30
Nabin Hait
16f3f378f6 Update patches.txt 2016-10-07 12:54:27 +05:30
Nabin Hait
1885207eca Update and rename update_timesheet_modified_created to update_timesheet_communications 2016-10-07 12:54:04 +05:30
RobertSchouten
e0a636c081 [fix] update timestamps and relink communication for timesheet 2016-10-07 11:03:04 +08:00
RobertSchouten
ef4e41380b [fix] update timestamps and relink communication for timesheet 2016-10-07 11:01:12 +08:00
Saurabh
a2a25abfa5 [fix] warehouse account rename fix #6526 2016-10-06 18:20:53 +05:30
Nabin Hait
77ede941b0 Merge pull request #6550 from rohitwaghchaure/make_payment_using_journal_entry
[Enhancement] Option to make payment via Journal Entry
2016-10-06 17:07:11 +05:30
Rohit Waghchaure
7d5298997b Documentation for payments 2016-10-06 16:49:39 +05:30
Nabin Hait
1397159bc1 Merge pull request #6561 from rohitwaghchaure/remove_sales_invoice_from_scheduler_log
removed sales invoice from scheduler log
2016-10-06 15:32:55 +05:30
Nabin Hait
ec08a50af1 Merge pull request #6564 from rohitwaghchaure/expense_claim_issue
[Fix] Expense Claim, sanctioned amount not auto-populated from claim amount
2016-10-06 15:32:37 +05:30
Rohit Waghchaure
370e711f48 [Fix] Expense Claim, sanctioned amount not auto-populated from claim amount 2016-10-06 15:19:53 +05:30
Saurabh
3ae5672e27 [fix] sales order translation for language code: fr 2016-10-06 12:57:21 +05:30
Rohit Waghchaure
297fbcd388 removed sales invoice from scheduler log 2016-10-06 12:40:09 +05:30
Rohit Waghchaure
b7a5502b97 [Enhancement] Option to make payment via Journal Entry 2016-10-06 12:04:52 +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
Rushabh Mehta
4dacaa103c [minor] do not submit after accpeting payment 2016-10-05 19:20:37 +05:30
Rushabh Mehta
a47652624a [minor] student applicant fixes 2016-10-05 18:04:35 +05:30
Nabin Hait
558f526a68 Fixed version conflict 2016-10-05 17:18:36 +05:30
Nabin Hait
7dcab89321 Merge branch 'hotfix' 2016-10-05 17:18:11 +05:30
Nabin Hait
a162b3f0cd bumped to version 7.0.55 2016-10-05 17:48:11 +06:00
Nabin Hait
cccc45edc5 Don't throw expense account validation on fetching item details 2016-10-05 17:15:53 +05:30
Nabin Hait
33fafb7728 Set warranty claim resolution date as today only if it is not set 2016-10-05 16:43:20 +05:30