Nabin Hait
425bdee0ec
Merge branch 'unclosed_finance' of https://github.com/RobertSchouten/erpnext into RobertSchouten-unclosed_finance1
2016-10-17 16:46:54 +05:30
Nabin Hait
c48ad8430f
Merge branch 'KanchanChauhan-process-payroll-changes' into develop
2016-10-17 16:43:06 +05:30
Nabin Hait
395d757c5a
Fixed merge conflict
2016-10-17 16:42:49 +05:30
KanchanChauhan
9cb69ca0e3
Posting Date cannot be future date ( #6628 )
2016-10-17 16:40:16 +05:30
Saurabh
048ee48475
[fix] #6573 Material Request Required Date auto set ( #6627 )
2016-10-17 16:24:20 +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
Nabin Hait
a9ce406c48
Merge pull request #6579 from PawanMeh/fixes_6567
...
[fix] #6567
2016-10-16 14:28:00 +05:30
Nabin Hait
0b1b8afc3c
Merge pull request #6611 from nabinhait/hotfix
...
Always calculate additional discount amount if percentage is mentioned
2016-10-16 14:25:28 +05:30
Nabin Hait
e040510545
Always calculate additional discount amount if percentage is mentioned
2016-10-13 12:14:47 +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
Nabin Hait
efd7c3e22b
Merge pull request #6592 from rohitwaghchaure/production_planning_issue
...
[Fix] making of production order from material request with sales order, restirct validation validate_production_order_against_so in production order
2016-10-10 17:10:49 +05:30
Rushabh Mehta
2757d8ef03
[minor] [perm] allow owner to read student applicant
2016-10-10 16:46:24 +05:30
Rohit Waghchaure
8e881cc7b9
[Fix] making of production order from material request with sales order, restirct validation validate_production_order_against_so in production order
2016-10-10 14:58:33 +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
Nabin Hait
fc90758932
Merge pull request #6589 from rohitwaghchaure/purchase_invoice_validation_issue
...
[Fix] Purchase invoice validation issue
2016-10-10 11:51:00 +05:30
Nabin Hait
1ca7a27b2f
Merge pull request #6587 from rohitwaghchaure/pos_wildcard_search_issue
...
[Fix] wildcard search for pos not working
2016-10-10 11:50:01 +05:30
Rohit Waghchaure
3485d2467a
[Fix] Purchase invoice validation issue
2016-10-09 18:05:17 +05:30
Rohit Waghchaure
6f33dfbc56
[Fix] wildcard search for pos not working
2016-10-09 15:32:56 +05:30
Rushabh Mehta
ac5b193100
[minor] direct student admission to the list page
2016-10-09 15:19:23 +05:30
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
896c731a46
[fix] #6566
2016-10-09 08:44:40 +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
fc2a9e64fc
Fixed version conflict
2016-10-07 17:09:28 +05:30
Nabin Hait
8fa2a04024
Merge branch 'hotfix'
2016-10-07 17:08:57 +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
05ba967a45
Merge branch 'hotfix'
2016-10-07 17:04:36 +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
f69edb3fa3
Merge branch 'hotfix'
2016-10-07 16:47:17 +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
cf8438d153
Delete patches.txt
2016-10-07 16:11:21 +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
