Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,141 Commits 3 Branches 0 Tags 1 GiB
5d134e0465
Commit Graph

15045 Commits

Author SHA1 Message Date
rohitwaghchaure
cae945e743 Added validation and fixes UX for asset (#14727) 2018-06-28 23:04:25 +05:30
Ranjith Kurungadam
6ceed038e6 Fix benefits (#14735) 
* Employee Benefit Application - fix typo

* Employee Benefits - fix field renamed
 2018-06-28 23:02:58 +05:30
Rohit Waghchaure
ed71c36748 [Fix] Not able to save subcontracted purchase receipt 2018-06-28 18:36:35 +05:30
Ranjith Kurungadam
b66bde32f8 Payroll Entry - fix only one employee fetched (#14718) 2018-06-28 14:40:29 +05:30
Charles-Henri Decultot
8b22310d66 Allow auto repeat update (#14706) 
* Allow auto repeat update

* Allow auto-repeat reference update
 2018-06-28 14:27:58 +05:30
Zarrar
254ce645b1 [ Enhance ] Setup Wizard - Chart of Accounts (#14698) 
* enable selection of coa for user
Give user option to select coa that's been verified along with standard and standard with numbers. Also added a button that opens a dialog and renders the selected chart

* read chart from file and make a tree render-able dict of it

* tree method to return node data for coa setup wizard
 2018-06-28 14:15:34 +05:30
Pawan Mehta
c7897e491d [fix] #14714 (#14715) 2018-06-28 14:13:56 +05:30
KanchanChauhan
168e66b107 Blanket Order translation fix for DE (#14711) 2018-06-28 14:13:24 +05:30
rohitwaghchaure
e27b85de4f Added test cases for Overproduction against Work Order / Sales Order (#14704) 2018-06-28 12:48:28 +05:30
rohitwaghchaure
4c23be1821 Added test cases for subcontract (#14702) 2018-06-28 11:18:37 +05:30
Prateeksha Singh
5d227c9028
Revert "[hub] add link in modules" 2018-06-28 09:59:46 +05:30
Prateeksha Singh
84d358bd0a
Merge pull request #14708 from pratu16x7/hub-fixes 
[hub] add link in modules
 2018-06-28 03:23:03 +05:30
Prateeksha Singh
2e0b5140e7 [hub] add link in modules 2018-06-28 03:17:39 +05:30
Manas Solanki
4933e6bfeb Update test_finance_book.py (#14703) 2018-06-27 17:30:09 +05:30
Ranjith Kurungadam
23e235395e Salary Slip - remove check query limited to one (#14699) 2018-06-27 17:29:40 +05:30
Shreya Shah
f2f54e741b
Merge pull request #14701 from shreyashah115/testing-1 
[minor] Blanket order
 2018-06-27 16:00:02 +05:30
Shreya
32b57da335 Make supplier_name and customer_name fields read only 2018-06-27 15:20:33 +05:30
Shreya
18bed504dc Set target qty 0 
If the ordered qty exceeds the quantity in blanket order items, on routing to a new Purchase order or Sales order, set target qty as 0 to avoid negative qty.
 2018-06-27 15:14:43 +05:30
Manas Solanki
b912374b96 [test] check the finance book via the journal entry 2018-06-27 15:07:15 +05:30
Ranjith Kurungadam
53cdbe960e Salary Slip - fix query (#14693) 2018-06-27 11:15:39 +05:30
Jamsheer
86aed90a5c [Fix] - Get payroll period days (#14686) 
* Fix - get_payroll_period_days

* Fix - get_payroll_period_days
 2018-06-27 11:13:20 +05:30
Nabin Hait
e2a8120ef8 ignore user permissions for some fields 2018-06-26 15:27:34 +05:30
Manas Solanki
7707cee6b7
Merge pull request #14676 from KanchanChauhan/allow-only-submitted-bo 
Allow only submitted Blanket Order in PO/SO
 2018-06-26 11:46:23 +05:30
Manas Solanki
860e169081
Update sales_order.js 2018-06-26 11:45:04 +05:30
Manas Solanki
0ebd0f0d62
Update purchase_order.js 2018-06-26 11:44:29 +05:30
Kanchan Chauhan
bddebb52d6 Allow only submitted Blanket Order in PO/SO 2018-06-26 09:31:27 +05:30
Rushabh Mehta
096b943b0c [minor] fixes to moment.defaultDateFormat and daily work summary eplies 2018-06-25 22:38:20 +05:30
Frappe PR Bot
5c13cb3221 [Translation] Updated Translations (#14669) 2018-06-25 15:08:15 +05:30
mnaim-cloude8
56e4346ead To fixed if if no schedule and disposal is NOT within the period. (#14637) 
* To fixed if if no schedule and disposal is NOT within the period, then opening accumulated depreciation not included.
If no schedule, and disposal is within period, accumulated dep is the amount eliminated.

* Update asset_depreciations_and_balances.py
 2018-06-25 15:05:26 +05:30
Jamsheer
4f8deb92cc [Fix] - Leave Perid - Grant Allocations (#14668) 
* Leave Perid - Grant Allocations - Fix

* Codacy - string statement has no effect
 2018-06-25 14:49:54 +05:30
rohitwaghchaure
34c187706d [Enhance] Added Budget exception approver role in company (#14645) 
* [Enhance] Added Budget exception approver role in company

* Added test cases for budget
 2018-06-25 10:31:08 +05:30
Ranjith Kurungadam
b4ad3c3f77 Salary Structure Assignment - remove to_date (#14642) 
* Salary Structure Assignment - remove to_date

* fix Salary Assignment - remove to_date

* Salary Slip - fix codacy remove sting based query, add end_date to condition
 2018-06-25 10:29:54 +05:30
Jamsheer
8044d09d50 [Enhance] Refactor (#14647) 
* Payroll Entry - Make Bank Entry button routes to Journal Entry list view

* Salary Component - additional component and flexi not comes in same component

* Salary Structure - refactor validation messages
 2018-06-25 10:29:06 +05:30
rohitwaghchaure
3a595d07d0 [Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases (#14649) 
* [Fix] POS Closing Voucher, on save collected amount becomes zero

* Added test cases for the POS Closing Voucher
 2018-06-25 10:10:29 +05:30
Jamsheer
648728f330 Fix - depends on lwp - employee benefit (#14644) 2018-06-22 17:28:29 +05:30
Jamsheer
b64161a389 Employee benefit - Last payroll period benefit (#14634) 
* Employee benefit - Last payroll period benefit

* Method name refactor
 2018-06-22 17:27:54 +05:30
Sushant Nadkar
00f0f0f5fc Added adational filters to Tax Rule doctype (#14639) 2018-06-22 15:57:19 +05:30
Shreya Shah
5b64e98c5b Fetch company on employee selection (#14633) 2018-06-22 15:41:57 +05:30
rohitwaghchaure
d3fb0fbb20 Added test cases for asset accounting, asset value adjustment (#14572) 
* Added test cases for asset accounting, asset value adjustment

* Accounting entry for the asset created manually

* Added asset movement test cases and validation

* Added validation to make asset from purchase receupt, invoice only
 2018-06-22 15:40:59 +05:30
Ranjith Kurungadam
ce26610d39 Fix tax calculation (#14635) 
* Salary Detail - field is_additional_component

* TDS fix - exclude additional component from monthly salary, but add to annual income to calculate tax

* fix indentation
 2018-06-22 15:39:49 +05:30
Ameya Shenoy
4e96f55eff
Merge branch 'master' into develop 2018-06-22 05:10:29 +00:00
Ameya Shenoy
774f676a25 bumped to version 10.1.40 2018-06-22 05:10:27 +00:00
Prateeksha Singh
c92bbcb9fa
Merge pull request #14629 from pratu16x7/css-fixes 
[portal] fix item-preview column #13077
 2018-06-21 22:47:41 +05:30
Prateeksha Singh
9a138f07f7 [portal] fix item-preview column #13077 2018-06-21 22:42:03 +05:30
Nabin Hait
3ebc15cc8f test fixes 2018-06-21 17:55:32 +05:30
Nabin Hait
e5b3a56cea Test case fixes 2018-06-21 15:21:17 +05:30
Zlash65
4cf46edabc expense_claim related fix in payment entry 
outstanding amount calculation fix, manual entry of expense trigger calculation of allocation added
 2018-06-21 15:18:13 +05:30
rohitwaghchaure
ae276bcaa1 Don't allow to sale asset item from POS (#14623) 2018-06-21 13:18:01 +05:30
Shreya Shah
c8a40f3ef0 [Tests] Employee Onboarding & Separation (#14606) 
* Set query on department

* Add test for Employee Onboarding

* Add fetch for Employee Separation fields

* Add test for Employee Separation

* Fix Staffing Plan test case
 2018-06-21 13:06:47 +05:30
Sachin Mane
19a5a5dcf4 improve performance of stock_value retrieval using tabBin instead of … (#14584) 
* improve performance of stock_value retrieval using tabBin instead of stock ledger

* rename fn

* rename fn

* Update warehouse.py
 2018-06-21 13:01:48 +05:30
rohitwaghchaure
79e5b07e62 [Fix] Subscription method (#14604) 
* [Fix] Subscription method path

* [Fix] Condition
 2018-06-21 12:58:14 +05:30
rohitwaghchaure
4d80c05125 [Fix] Deferred account must be liability account (#14612) 2018-06-21 11:55:49 +05:30
Shreya Shah
22bb61b58c
Merge pull request #14608 from shreyashah115/fix-onboard 
[Enhance] Employee Onboarding & Separation
 2018-06-21 11:51:39 +05:30
Jamsheer
f76dbbae68 Compensatory Leave Request (#14611) 
* Compensatory Leave Request - Validate Holidays and Attendance

* Compensatory Leave Request - Cancel

* Half Day in Compensatory Leave Request

* Leave allocation on Compensatory Leave Request - Fix

* Unused import
 2018-06-21 11:38:38 +05:30
Nabin Hait
227489193b Test case fixes 2018-06-21 11:36:13 +05:30
umaepoch
0484547150 BOM Stock Calculation Report (#14561) 
* BOM Stock Calculated

* BOM Stock Calculated

* BOM Stock Calculated

* BOM Stock Calculated

* BOM Stock Calculated

* Update bom_stock_calculated.json
 2018-06-21 11:27:54 +05:30
Zarrar
e25dcd2737 [Minor] Report related fixes (#14620) 
* fix in query incase list is empty

* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated

* unset currency filter to apply default currency or so

* python 2 - 3 fix
 2018-06-21 10:53:12 +05:30
Siddhi Sawant
51e4d641c8 Job Applicant Source (#14543) 
* New doctype - Job Applicant Source

* Source and source name field in job applicant

* Updated install_fixtures with default options

* Update install_fixtures.py

* Fixes codacy
 2018-06-21 10:47:54 +05:30
Frappe PR Bot
748c0240db [Translation] Updated Translations (#14615) 2018-06-21 10:34:28 +05:30
Charles-Henri Decultot
fc2292f08c Email alert renamed to Notification (#14618) 2018-06-21 09:17:52 +05:30
Nabin Hait
3946b77555 changed fieldname of inventory section break in Item 2018-06-20 22:33:34 +05:30
Shreya Shah
b125ba9ed8 Update status if tasks have been completed (#14601) 2018-06-20 17:52:21 +05:30
Manas Solanki
616a6d2bc2 Test leave management (#14587) 
* test max allowed days in leave policy

* test the leave period

* test leave encashment
 2018-06-20 17:47:45 +05:30
Suraj Shetty
be3ce16352 Daily work summary reply report (#14583) 
* Add daily work summary reply report

* Show user name instead of email

* Remove print statement

* Change field datatype

* ReRun Travis
 2018-06-20 17:46:03 +05:30
Nabin Hait
7aae0e66df minor fix 2018-06-20 17:45:39 +05:30
Bassam Ramadan
45725c2c7b add missing brand filter to stock balance report (#14597) 
add missing brand filter to stock balance report
 2018-06-20 17:41:29 +05:30
Shreya
3fd21d4273 Fix codacy 2018-06-20 16:09:16 +05:30
Shreya
5c6ade4bd8 Update and set status on the basis of project completion 2018-06-20 15:55:27 +05:30
Shreya
a5afd96019 Employee Onboarding and Separation lists 2018-06-20 15:55:14 +05:30
Saurabh
59798b4e88 resolved merge conflict 2018-06-20 15:23:25 +05:30
Saurabh
98b7bb5679 bumped to version 10.1.39 2018-06-20 15:51:40 +06:00
Zarrar
99017b173d naming for asset maintenance task should be task name (#14607) 2018-06-20 14:53:13 +05:30
Ranjith Kurungadam
c1030a3958 fix - Employee Transfer, Promotion (#14603) 2018-06-20 12:42:58 +05:30
Jamsheer
a1bb94e59d Pro-rata component consistency for monthly Salary slip (#14595) 
* Pro-rata component consistency for monthly Salary slip

* Resolve merge conflict
 2018-06-20 12:41:32 +05:30
Ranjith Kurungadam
05d00397d0 Update tax calculation (#14564) 
* Tax Slab remove to_amt mandatory, condition data type Code

* Salary Slip - consider condition in tax slab

* Payroll Period - help text for tax slab condition
 2018-06-20 12:33:02 +05:30
Ranjith Kurungadam
4f9744a56d HRA fix (#14589) 
* hra - fix var ref before assignment

* Tax Exemption Category - remove deduction component
 2018-06-20 11:10:56 +05:30
Jamsheer
55a2f4da71 Employee Benefit (#14571) 
* Rename - filed is_pro_rata_applicable to pay_against_benefit_claim

* Employee Benefit Application - Validate previous benefit claim

* Employee Benefit Claim - Code refactor

* Salary Slip - additional salary - fix
 2018-06-20 11:04:21 +05:30
Jamsheer
c526cad183 [Fix] Additional Salary Component and tax calculation (#14581) 
* Additional salary not include in tax calculation

* Additional salary get doubled in salary slip via Payroll Entry - Fix

* Salary Component - if is_additional_component hide flexi
 2018-06-20 10:52:20 +05:30
Shreya Shah
222c550c29 Parse left out time (#14586) 2018-06-20 10:51:32 +05:30
Shreya Shah
0cb0c0b642 [Tests] Staffing Plan (#14585) 
* Add test case for Staffing Plan

* Fix codacy
 2018-06-20 10:50:54 +05:30
Zarrar
42f2d1a7a8 fix incase no customer fetched (#14596) 2018-06-20 10:50:11 +05:30
Ranjith Kurungadam
f972e7b259 Staffing Plan - remove department filter, query by dates (#14590) 2018-06-20 10:48:40 +05:30
rohitwaghchaure
fd5ac45775 [Fix] Not able to make invoice in the subscription (#14594) 2018-06-20 10:47:55 +05:30
Nabin Hait
a125a6199c Allowed paid amount against debit/credit note 2018-06-19 12:07:02 +05:30
Shreya Shah
b0575265fb Test case for Attendance Request (#14566) 
* Add test case for Attendance Request

* Add a message if attendance not submitted

* Add test for cancelled document
 2018-06-19 10:47:40 +05:30
Shreya Shah
97124e92fa [Fixes] Tax withholding category and Bank Guarantee (#14576) 
* Fetch withheld percentage

* Set query for accounts on the basis of company

* Fix bank guarantee error on submit

* Remove errors caused by fields which are removed
 2018-06-19 10:46:41 +05:30
Zarrar
ba1cdc6c57 fix opening invoice related authorization control - item=None (#14567) 2018-06-19 10:45:47 +05:30
Shreya Shah
cbff30f718 [Tests] Shift Planning (#14570) 
* Cancel shift assignment on cancellation of shift request

* [minor] Fix shift type test

* Modify test for shift request

* Add test case for shift assignment

* Fix syntax

* Fix codacy
 2018-06-19 10:45:33 +05:30
asbasawaraj
b0fafa9774 Additional fields in Certified Consultant DocType (#14573) 2018-06-19 10:43:55 +05:30
Shreya Shah
77de8dc102 Change Restaurant icon type to module (#14578) 2018-06-19 10:43:08 +05:30
Nabin Hait
875c941f3d fixes in setting itemised tax breakup 2018-06-18 17:41:27 +05:30
Nabin Hait
8eeb5694ba Fixed qty in item-wise sales history report 2018-06-18 17:41:27 +05:30
Nabin Hait
0bef91c241 minor fix in item type validation 2018-06-18 17:41:27 +05:30
Nabin Hait
ae02209b6a Removed autoname of child table 2018-06-18 17:41:27 +05:30
Shreya Shah
5c3929c5ea Fix positioning of fields (#14562) 2018-06-18 15:49:59 +05:30
Zarrar
e0adb6bbd6 cost_center overridden by company's default fix in SI (#14560) 2018-06-18 15:49:12 +05:30
Shreya Shah
1ac5585151 Bug - Add batch while creating serial nos (#14559) 2018-06-18 15:44:10 +05:30
Ranjith Kurungadam
5f7c7bfc78 remove patch to add hra fields (#14552) 2018-06-18 15:43:45 +05:30
Ranjith Kurungadam
6cca03195f fix- Salary Structure filter (#14558) 2018-06-18 15:42:38 +05:30
Ranjith Kurungadam
28f49a5a8e fix - link validation error (#14547) 2018-06-18 10:40:23 +05:30