Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,452 Commits 3 Branches 0 Tags 1 GiB
41b457076d
Commit Graph

14427 Commits

Author SHA1 Message Date
Saurabh
ccd0617e19
Merge pull request #14017 from netchampfaris/apply-price-list-hotfix 
[fix] apply price list
 2018-05-15 11:25:08 +05:30
Saurabh
12f708d155
Merge pull request #14035 from saurabh6790/v11_patch_fix 
[fix] reload Leave Period and Staffing Plan doctypes
 2018-05-15 10:49:53 +05:30
Rohit Waghchaure
3f02820384 [Fix] Global name 'Approved' is not defined 2018-05-15 10:30:06 +05:30
Saurabh
d217fbaa45 [fix] reload Leave Period and Staffing Plan doctypes 2018-05-15 08:35:25 +05:30
Shreya
dbb67fb4fd Clear leave balance on changing leave type 2018-05-14 23:02:09 +05:30
Saurabh
99400bd958 remove duplicate fields occured due to merge conflicts 2018-05-14 22:11:17 +05:30
Rohit Waghchaure
9ba72f7897 [Fix] get_approved_leaves_for_period module import failed 2018-05-14 21:37:55 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Saurabh
1f1dd96f57
Merge branch 'enterprise_sprint' into jam_enterprise_sprint 2018-05-14 20:57:40 +05:30
rohitwaghchaure
3f0c735e53
Merge branch 'enterprise_sprint' into tax_exemption 2018-05-14 20:47:35 +05:30
Saurabh
4ae089d6a1 Provision to deduct TDS on Advance 2018-05-14 20:42:08 +05:30
Saurabh
f3f438ad18 tds fixed for PI 2018-05-14 20:42:08 +05:30
Saurabh
b9d3385fec calculate TDS on Sales Invoice Amount 2018-05-14 20:42:08 +05:30
Saurabh
3b4a6be4d0 Supplier Tax Withholding Config 2018-05-14 20:42:08 +05:30
Saurabh
2d8a7ee81f Bootstrap 'TDS' via fixture 2018-05-14 20:41:38 +05:30
rohitwaghchaure
7c6bef4905
Merge branch 'enterprise_sprint' into supplier-group 2018-05-14 20:39:01 +05:30
rohitwaghchaure
8137f0402a
Merge pull request #13984 from manassolanki/employee-boarding 
[feature] added the employee onboarding and separation doctype
 2018-05-14 20:35:49 +05:30
Manas Solanki
094e1841e0 minor changes and fixed the conflicts 2018-05-14 20:33:28 +05:30
rohitwaghchaure
67da5f7671
Merge pull request #14023 from mntechnique/accounting_period 
Accounting Period
 2018-05-14 20:33:09 +05:30
rohitwaghchaure
3282191aae
Merge pull request #14025 from shreyashah115/html-table 
Show pending leaves as an HTML table in leave application
 2018-05-14 20:32:26 +05:30
Manas Solanki
b698846c30 [feature] added the employee onboarding and separation doctype 2018-05-14 20:27:00 +05:30
rohitwaghchaure
48199842aa
Merge pull request #13750 from rohitwaghchaure/asset_purchase_link 
Asset linked to purchase and serial no
 2018-05-14 20:24:37 +05:30
rohitwaghchaure
8d626e6888
Merge pull request #14024 from ESS-LLP/jam_additional_sal_comp 
Additional Salary Component
 2018-05-14 20:24:10 +05:30
Shreya
4bd5583e11 Make Available Leave HTML Table 2018-05-14 19:32:59 +05:30
Jamsheer
75c53e5022 Fix - missing semicolon 2018-05-14 19:17:16 +05:30
Rohit Waghchaure
d644e6da16 Code cleanup 2018-05-14 19:09:44 +05:30
Rohit Waghchaure
11679884e4 Patch to move asset fields to Asset Finance Book table 2018-05-14 19:08:57 +05:30
Rohit Waghchaure
352df95976 Patch to make location 2018-05-14 19:08:56 +05:30
Rohit Waghchaure
16bc853f6a Reschedule for future depreciations and booked difference amount in accumulated depreciation account 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
aa7b434270 Create asset adjustment doctype, post gl entry for the asset 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
0ea6fe4397 Added new doctype Finance Book Detail in asset, asset category 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f2684ae83a Commonify get_asset_category_account and get_fixed_asset_account method 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f41e1ed191 Added default asset accounts in COA, CWIP account in asset category 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
255cd44aba Treeview for Location 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
af05995418 Asset accounting 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
c6deb13fb4 Added account fields in the company, fixes in auto creation of the asset from PR 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
ab84254188 Asset linked to purchase receipt and serial no 2018-05-14 19:07:39 +05:30
Jamsheer
47039e801e Remove unused import 2018-05-14 18:54:10 +05:30
Jamsheer
70a998d428 Remove unused variable 2018-05-14 18:51:04 +05:30
rohitwaghchaure
17aec2d16c
Merge pull request #13808 from mntechnique/cost-center-number 
Cost center number
 2018-05-14 18:35:38 +05:30
Jamsheer
f5e67213fd Attendance Request - half day check is enabled 2018-05-14 18:34:34 +05:30
rohitwaghchaure
044d6908cf
Merge pull request #13564 from sathishpy/develop 
Bank Statement Import
 2018-05-14 18:27:53 +05:30
Gaurav Naik
21b2df41ac [Fix] len() instead of .length 2018-05-14 18:15:47 +05:30
Gaurav Naik
caaebb9d2a [WIP] Accounting Period Test cases 2018-05-14 18:11:09 +05:30
Jamsheer
ead858b4de Compensatory Leave Request - fix 2018-05-14 18:08:31 +05:30
Gaurav Naik
52571a80da Bootstrap documents for closing (js) 2018-05-14 18:06:50 +05:30
Gaurav Naik
2fe38c3ff5 Bootstrap documents for closing 2018-05-14 18:06:34 +05:30
Gaurav Naik
32b3aa257c [Fix] Indentation for accounting_period overlap 2018-05-14 18:02:24 +05:30
Jamsheer
b848c51592 Compensatory Leave Request - leave allocation create and update - fix 2018-05-14 17:56:22 +05:30
Zlash65
06fd51bf69 patch fix for instructor 2018-05-14 17:16:27 +05:30
Zlash65
d25a264e5b create and update department records patch 2018-05-14 16:07:28 +05:30
Zlash65
03ad0f2f4a set query for department based on company 2018-05-14 16:07:28 +05:30
Zlash65
9a8f5bd6c7 set department name with company abbr 2018-05-14 16:07:27 +05:30
Zlash65
39668609ce improv department tree 2018-05-14 16:07:27 +05:30
Zlash65
366ca92ba7 move default_currency on top 2018-05-14 16:07:27 +05:30
Zlash65
513f13df27 patch fix 2018-05-14 16:05:16 +05:30
Faris Ansari
404f39d373 [fix] apply price list 
in_apply_price_list flag remains true if server exception occurs
 2018-05-14 15:46:45 +05:30
Zlash65
39097c7fbe codacy fix 2018-05-14 15:34:45 +05:30
Shreya Shah
bbee9b6cc4 [Enhancement] Monthly Attendance Report (#13970) 
* Update Attendance on Approval of Leave

* Separate out leaves on the basis of its type

* Remove commented code

* Make attendance records if not found

* Fix Codacy

* Replace bad code in attendance.py
 2018-05-14 14:30:58 +05:30
Manas Solanki
661332dab5 [fix] honour the shopping cart setting when showing the stock and non-stock item (#13988) 2018-05-14 14:30:30 +05:30
Zarrar
8646ed45bc button triggers not working in tasks table (#13973) 2018-05-14 14:29:01 +05:30
Faris Ansari
69b0535e10 [fix] Incorrect currency conversion in Itemised Tax Breakup (#14006) 2018-05-14 14:19:31 +05:30
Suraj Shetty
f93cc57e8a Ignore user permission for 'variant Of' in Item (#14013) 
- Since mostly variant of is null it gets filtered out if
user permission is applied.
And since variant is a link to item itself there is no need to check
user permission for it as user permission gets applied on Item anyways.
 2018-05-14 14:07:20 +05:30
Shreya Shah
ba6cb8ae4b [Healthcare] Fix UI (#14011) 
* Fix UI

* Fix Calendar View
 2018-05-14 14:06:31 +05:30
Faris Ansari
a7387b45ec [fix] Get items from BOM error in python 3 (#14012) 2018-05-14 14:05:52 +05:30
Jamsheer
236be22648 Payroll entry - get employee fix 2018-05-14 13:32:50 +05:30
Rohit Waghchaure
ebe1ebead2 [Fix] 'ProductionOrder' object has no attribute 'set_work_order_operations' 2018-05-14 13:21:45 +05:30
Jamsheer
d0b0c87f40 get additional salary component in salary slip 2018-05-14 12:16:46 +05:30
Jamsheer
08b60a1a62 New Doctype - Additional Salary Component 2018-05-14 12:16:46 +05:30
Jamsheer
a5028c8e54 Salary Structure - filter updated, Salary Component - fields re-arranged 2018-05-14 12:16:45 +05:30
Jamsheer
b5c5c471b4 Formula on Salary Component Master 2018-05-14 12:16:45 +05:30
Jamsheer
4bd7cdb018 Salary Structure Assignment - filters applied 2018-05-14 12:13:47 +05:30
Manas Solanki
a27d29b349 enable deferred revenue in the item master 2018-05-14 12:07:14 +05:30
Zlash65
f665189ab3 tree based changes 2018-05-14 11:45:38 +05:30
Zlash65
93d6b555d7 added fixtures for supplier-group, changed analytics report accordingly 2018-05-14 11:45:38 +05:30
Zlash65
c88ce364ce treeview implemented for supplier group 2018-05-14 11:45:38 +05:30
Zlash65
540d7aa635 patch to reload_doc and rename field 2018-05-14 11:45:38 +05:30
Zlash65
2e0809801d controller and other changes 2018-05-14 11:45:38 +05:30
Zlash65
890707854d config/utility level changes 2018-05-14 11:45:38 +05:30
Zlash65
0a50554417 doctype level changes 2018-05-14 11:45:38 +05:30
Zlash65
4437a5ed18 json level changes 2018-05-14 11:45:38 +05:30
Zlash65
3387a35fed rename supplier-type to supplier-group 2018-05-14 11:42:30 +05:30
rohitwaghchaure
a8c49f26d3
Merge pull request #14002 from rohitwaghchaure/search_item_spelling_issue 
Fixed spelling
 2018-05-14 00:44:29 +05:30
Rohit Waghchaure
eee830eafe Fixed spelling 2018-05-13 16:17:18 +05:30
Saurabh
c1acbdfb69 [fix] overlapping dates 2018-05-12 17:45:39 +05:30
Saurabh
a35dad7610 add get leave period method 2018-05-12 17:45:39 +05:30
Faris Ansari
f2b3307136 Remove escaped customer string (#13986) 
- no need to escape strings that are passed to the values parameter of the sql method
- this query was failing for inputs like "D'Arby" which have quotes
 2018-05-11 21:07:27 +05:30
Jamsheer
46b23f8e6e Salary Structure Refactor, Formula on Salary Component Master (#13967) 
* Salary structure refactor

* Salary Structure Assignment - filters applied

* Formula on Salary Component Master

* Salary Structure - filter updated, Salary Component - fields re-arranged

* Payroll Entry - get_employee_list fix

* Salary Structure Assignment - Validate Duplicate Assignment

* Salary Structure Assignment - filters for salary structure
 2018-05-11 21:05:24 +05:30
Pawan Mehta
c53e35368d Shift Management - Documentation and Tests (#13997) 
* [fix] #13996

* codacy fix
 2018-05-11 21:03:50 +05:30
Gaurav Naik
9502476c67 Accounting Period overlap validation 2018-05-11 07:53:12 +05:30
Gaurav Naik
6c92cff226 Accounting Period autoname 2018-05-11 07:52:50 +05:30
Ranjith
ded636097e Tax Declaration, Proof Submission tests 2018-05-10 15:42:04 +05:30
Ranjith
5a8e6427f4 Tax Declaration, Proof Submission, validation 2018-05-10 15:06:49 +05:30
Ranjith
85d2d571c5 update hr menu, field subcategory in child table 2018-05-10 15:04:32 +05:30
Ranjith
e1c556b7e0 Doctype Employee Tax Exemption Sub Category 2018-05-10 15:02:57 +05:30
Ranjith
96121c598e Tax Declaration, Proof Submission, field company 2018-05-10 15:02:00 +05:30
Kanchan Chauhan
d560da950d [Minor] Show only active driver in Delivery Trip 2018-05-10 10:42:56 +05:30
Jamsheer
9032c9d91d Documentation - updated 2018-05-09 19:19:34 +05:30
Nabin Hait
9d215c2d9b Set operations on production order while making from Material Request 2018-05-09 18:32:54 +05:30
Nabin Hait
b9fed2aa38 Removed company from Finance Book and related changes 2018-05-09 15:10:29 +05:30