Nabin Hait
a943ec8ff5
Merge pull request #6642 from neilLasrado/develop
...
Fixes to Schools Module
2016-10-18 18:16:29 +05:30
Neil Trini Lasrado
377da58378
Set Student Name in Program Enrollment
2016-10-18 18:11:52 +05:30
Nabin Hait
6cb44133c3
Fixed version conflict
2016-10-18 16:18:34 +05:30
Nabin Hait
170b0cc83c
bumped to version 7.0.60
2016-10-18 16:48:17 +06:00
Nabin Hait
d5c4a5c802
Hotfix
2016-10-18 16:17:37 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
Nabin Hait
7b9e8368ea
bumped to version 7.0.59
2016-10-18 15:55:31 +06:00
Nabin Hait
f32547a414
Merge pull request #6637 from nabinhait/cost_center_fix
...
Set cost center while creating invoice from SO/PO
2016-10-18 15:18:16 +05:30
Rushabh Mehta
17f6874450
[minor] [fix] doctype_dasboard.py files, move data to get_data
2016-10-18 14:54:39 +05:30
Nabin Hait
55a8797919
Set cost center while creating invoice from SO/PO
2016-10-18 14:54:17 +05:30
Neil Trini Lasrado
8b3dd8fdf2
Changed nationality in student master from link to data field
2016-10-18 12:55:38 +05:30
Kanchan Chauhan
dc86964e91
Patch fixed for Employee
2016-10-18 11:29:41 +05:30
Nabin Hait
b3b1219109
Fixed merge conflict
2016-10-17 17:42:53 +05:30
Nabin Hait
fcd10f2e08
Merge pull request #6335 from RobertSchouten/stock_entry
...
[fix] warning for creating stock entry after sales invoice (causing missing gl entries)
2016-10-17 17:39:57 +05:30
Nabin Hait
e5eed00aa5
Update stock_entry.py
2016-10-17 17:37:35 +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
KanchanChauhan
81581c669f
No Leave allocation for Leave Type for which Leave Without Pay is checked ( #6626 )
2016-10-17 17:01:29 +05:30
Nabin Hait
437b32d32c
Added filter to show unclosed fiscal year's P&L balances in trail balance
2016-10-17 16:57:52 +05:30
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
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
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
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
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
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
