Faris Ansari
|
5df63e36d4
|
Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix
|
2018-05-01 10:52:15 +05:30 |
|
Faris Ansari
|
bd99606a14
|
Change msgprint to unobtrusive alert
|
2018-05-01 10:52:02 +05:30 |
|
Zarrar
|
b0a46f397a
|
display customer's name while printing receivable report (#13830)
|
2018-04-30 19:40:18 +05:30 |
|
Nabin Hait
|
48c0b3b328
|
Merge branch 'tundebabzy-new-subscription' into develop
|
2018-04-30 19:33:15 +05:30 |
|
Nabin Hait
|
3652a62b55
|
minor fixes
|
2018-04-30 19:32:29 +05:30 |
|
Prateeksha Singh
|
53c9b63c0b
|
Merge pull request #13842 from pratu16x7/hotfix
[fix] setup_website, fixes #11143
|
2018-04-30 18:21:53 +05:30 |
|
Prateeksha Singh
|
9b2078feab
|
[fix] setup_website, fixes #11143
|
2018-04-30 18:11:20 +05:30 |
|
Nabin Hait
|
d39386bd55
|
Renamed some salary related fields
|
2018-04-30 16:21:37 +05:30 |
|
Shreya
|
96e45902fd
|
codacy
|
2018-04-30 15:54:34 +05:30 |
|
Faris Ansari
|
30304e68ff
|
[fix] Current stock qty calculation in case of different UOM
|
2018-04-30 15:44:49 +05:30 |
|
Shreya
|
14bd43d5eb
|
minor changes
|
2018-04-30 15:30:42 +05:30 |
|
Ameya Shenoy
|
da33b14f78
|
removed bad code and made compatible with pip 10 (#13805)
|
2018-04-30 11:17:12 +05:30 |
|
Shreya Shah
|
05ad2802c6
|
Travis test fixes for leave application (#13790)
* test fix
* expense claim test fix
* fix payroll entry test case
|
2018-04-30 11:14:56 +05:30 |
|
Zarrar
|
6bc500bffa
|
[Minor] Validate dates in Salary Structure (#13807)
* validate date
* fix date trigger issue
|
2018-04-30 11:14:09 +05:30 |
|
Adam Dawoodjee
|
3cd4fce710
|
Typo fix (#13809)
|
2018-04-30 11:13:18 +05:30 |
|
Faris Ansari
|
8be895091e
|
Set is_pos to 0 in Opening Invoice Tool (#13810)
|
2018-04-30 11:13:06 +05:30 |
|
Ameya Shenoy
|
f5f8a1f288
|
i still don't know why we're still using travis (#13817)
|
2018-04-30 11:10:39 +05:30 |
|
Gaurav Naik
|
c925a38f79
|
Ignore mandatory for default warehouses (#13812)
|
2018-04-27 15:31:11 +05:30 |
|
Manas Solanki
|
5cc41907a4
|
Merge pull request #13811 from frappe/manassolanki-patch-5
Remove the duplicate description
|
2018-04-27 12:47:24 +05:30 |
|
Manas Solanki
|
0536baacc2
|
Remove the duplicate description
|
2018-04-27 12:46:56 +05:30 |
|
Faris Ansari
|
9f739fe87d
|
Handle item_wise_tax_detail invalid value while item renaming (#13778)
|
2018-04-26 18:48:01 +05:30 |
|
Kenneth Sequeira
|
b01f998b49
|
Update tracking-project-profitability-using-cost-center.md (#13792)
Fixed typo in the title.
|
2018-04-26 18:40:14 +05:30 |
|
AravindPranera
|
805f09a3fe
|
Accounts receivable aging based on supplier due date (#13801)
|
2018-04-26 18:02:37 +05:30 |
|
deepak-mnt
|
b712d1905d
|
Override after_rename method to fetch cost center number on changing from title
|
2018-04-26 17:04:06 +05:30 |
|
deepak-mnt
|
b379998961
|
Added Update Cost Center Number button and it's functionality
|
2018-04-26 17:00:08 +05:30 |
|
Nabin Hait
|
2f82bce387
|
minor fix
|
2018-04-26 16:32:17 +05:30 |
|
rohitwaghchaure
|
7e8a7ac6ee
|
Provision to select opening stock in stock reconciliation (#13802)
|
2018-04-26 16:30:35 +05:30 |
|
Shreya
|
a20157af17
|
on item, warehouse and batch triggers, fetch serial nos based on batch
|
2018-04-26 14:39:21 +05:30 |
|
Shreya
|
7461d28ae0
|
add batch when creating serial nos
|
2018-04-26 14:39:21 +05:30 |
|
Shreya
|
4a2fe605b3
|
batch no field in serial no doctype
|
2018-04-26 14:39:21 +05:30 |
|
Nabin Hait
|
25ccd1acbb
|
minor fix in asset
|
2018-04-26 12:16:38 +05:30 |
|
Nabin Hait
|
dc75be8b6c
|
Show company column in order in consolidated financial statement
|
2018-04-26 12:16:38 +05:30 |
|
Siddhi Sawant
|
a16c8d0a2b
|
Establishment / Effective Date field in the Company master (#13723)
|
2018-04-26 12:16:38 +05:30 |
|
Rohit Waghchaure
|
4110e00b2d
|
[Fix] general ledger group by validation
|
2018-04-26 12:16:38 +05:30 |
|
Rohit Waghchaure
|
26decaad6c
|
[Fix] Profit and loss statment
|
2018-04-26 12:16:38 +05:30 |
|
Nabin Hait
|
074928cf6c
|
Company field added in department
|
2018-04-26 12:16:38 +05:30 |
|
Nabin Hait
|
f164203520
|
Fixed merge conflict
|
2018-04-26 12:16:18 +05:30 |
|
Nabin Hait
|
ee09408dcc
|
Minor fixes
|
2018-04-26 12:16:18 +05:30 |
|
Pawan Mehta
|
2215d4c593
|
Shift Management (#13667)
* [fix] #13634
* review_changes
* rename function
* rename function
|
2018-04-26 12:16:18 +05:30 |
|
rohitwaghchaure
|
efff6e53de
|
Consolidated financial statement (#13678)
* added fields to support treeview
* tree file added, nestedset implemented
* patch added to reload doc and configure lft rgt
* Added consolidated financial statement report
|
2018-04-26 12:16:18 +05:30 |
|
rohitwaghchaure
|
fb9af38106
|
Group by party in general ledger report (#13649)
* Group wise Ledger for Customer and Supplier
* commonify group by fields
|
2018-04-26 12:16:18 +05:30 |
|
Pawan Mehta
|
0a17f8d51b
|
remove shift schedule tool (#13658)
|
2018-04-26 12:16:18 +05:30 |
|
Nabin Hait
|
8076d6ddc8
|
Renamed Health Insurance to Employee Health Insurance
|
2018-04-26 12:16:17 +05:30 |
|
Nabin Hait
|
265426a5a6
|
Minor fixes
|
2018-04-26 12:14:02 +05:30 |
|
Nabin Hait
|
81706fdb46
|
Update rename_field_max_days_allowed.py
|
2018-04-26 12:14:02 +05:30 |
|
Nabin Hait
|
551844881b
|
Removed employee table from Salary Structure and added employee name in all forms
|
2018-04-26 12:14:01 +05:30 |
|
Nabin Hait
|
fcdca7f2a0
|
Documents order in hr page
|
2018-04-26 12:13:46 +05:30 |
|
Nabin Hait
|
f914bd374d
|
Added links in HR module
|
2018-04-26 12:13:24 +05:30 |
|
Shreya Shah
|
b15ef8450f
|
[Enterprise] Patch and child table changes (#13656)
* [patch] rename field
* Employee Property History child table
* remove child tables
|
2018-04-26 12:13:06 +05:30 |
|
Pawan Mehta
|
8f14cb590c
|
Add grade to employee master (#13654)
|
2018-04-26 12:12:45 +05:30 |
|