shreyas
|
1cfe2d7b45
|
[Minor] Validate purchase price against selling price
|
2016-10-20 15:57:45 +05:30 |
|
Nabin Hait
|
6fb7b162e8
|
Create tax template based on country
|
2016-10-20 15:56:07 +05:30 |
|
Rohit Waghchaure
|
d23835be84
|
[Feature] Countrywise sales tax template
|
2016-10-20 15:56:07 +05:30 |
|
Kanchan Chauhan
|
cce16b29b0
|
Group similar items in PO
|
2016-10-20 14:31:34 +05:30 |
|
Saurabh
|
bc0783b527
|
[fix] duplicate columns in monthly salary report #6623
|
2016-10-20 12:55:23 +05:30 |
|
Kanchan Chauhan
|
025fbd8f14
|
Customer group added to Gross Profit report
|
2016-10-20 12:54:06 +05:30 |
|
Nabin Hait
|
3126c88da2
|
Merge pull request #6658 from nabinhait/develop
Set prefered contact email in Employee
|
2016-10-20 12:40:03 +05:30 |
|
Nabin Hait
|
97fa119b37
|
Set prefered contact email in Employee
|
2016-10-19 18:26:01 +05:30 |
|
Nabin Hait
|
0702fa2fc6
|
Fixed version conflict
|
2016-10-19 16:49:36 +05:30 |
|
Nabin Hait
|
d5e52bc251
|
Merge branch 'hotfix'
|
2016-10-19 16:48:05 +05:30 |
|
Nabin Hait
|
13a07c2029
|
bumped to version 7.0.62
|
2016-10-19 17:18:04 +06:00 |
|
Nabin Hait
|
9ef4f0dc30
|
Merge pull request #6640 from rohitwaghchaure/item_projected_qty_issue
[Fix] total projected qty in item master
|
2016-10-19 16:45:28 +05:30 |
|
Rohit Waghchaure
|
aa8abfa5b3
|
Test cases added in sales order to check total projected qty
|
2016-10-19 15:26:10 +05:30 |
|
Rohit Waghchaure
|
ac9172f6df
|
[Fix] total projected qty
|
2016-10-19 15:06:30 +05:30 |
|
Nabin Hait
|
44b4e5eef3
|
Merge pull request #6648 from saurabh6790/hotfix
[fix] calculate variance only for submitted budgets
|
2016-10-19 15:05:11 +05:30 |
|
Nabin Hait
|
ff183eedb9
|
Fixes for testcases
|
2016-10-19 14:23:02 +05:30 |
|
Nabin Hait
|
184f6d42cc
|
Merge pull request #6647 from netchampfaris/hotfix
[hotfix] print format image size
|
2016-10-19 13:05:04 +05:30 |
|
Saurabh
|
afceac620c
|
[fix] calculate variance only for submitted budgets
|
2016-10-19 12:49:48 +05:30 |
|
Faris Ansari
|
2acbb11923
|
[fix] print format image size
|
2016-10-19 12:08:00 +05:30 |
|
Nabin Hait
|
2b03d8f696
|
Merge pull request #6641 from JayVora-SerpentCS/develop
Pythonic corrections
|
2016-10-19 10:47:01 +05:30 |
|
Nabin Hait
|
a7a3a497d5
|
Fixed version conflict
|
2016-10-18 18:35:42 +05:30 |
|
Nabin Hait
|
b33695138c
|
Merge branch 'hotfix'
|
2016-10-18 18:35:18 +05:30 |
|
Nabin Hait
|
8872842edf
|
bumped to version 7.0.61
|
2016-10-18 19:05:18 +06:00 |
|
Rushabh Mehta
|
7791ed845f
|
[hot] [fix] student_dashboard.py
|
2016-10-18 18:33:19 +05:30 |
|
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 |
|
Serpent Consulting Services Pvt Ltd
|
8b231f7256
|
Pythonic corrections
|
2016-10-18 17:30:24 +05:30 |
|
Nabin Hait
|
6cb44133c3
|
Fixed version conflict
|
2016-10-18 16:18:34 +05:30 |
|
Nabin Hait
|
498cc1b7e1
|
Merge branch 'hotfix'
|
2016-10-18 16:18:17 +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
|
a1099d28b8
|
Merge branch 'hotfix'
|
2016-10-18 15:25:31 +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 |
|
Nabin Hait
|
2dcee15e50
|
Merge pull request #6634 from KanchanChauhan/employee-patch-fixed
Patch fixed for Employee
|
2016-10-18 12:14:16 +05:30 |
|
Kanchan Chauhan
|
dc86964e91
|
Patch fixed for Employee
|
2016-10-18 11:29:41 +05:30 |
|
Nabin Hait
|
f5be103d57
|
Merge branch 'RobertSchouten-pref_email' into develop
|
2016-10-17 17:43:10 +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
|
5ea16640fe
|
Merge branch 'RobertSchouten-unclosed_finance1' into develop
|
2016-10-17 16:58:25 +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
|
c48ad8430f
|
Merge branch 'KanchanChauhan-process-payroll-changes' into develop
|
2016-10-17 16:43:06 +05:30 |
|