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

23299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles-Henri Decultot
97fa94e77d Journal and Entry number correction (#14720) 2018-06-28 23:05:58 +05:30
Cadmandata
d673afccf2 Updated comment in make_stock_entry() function (#14726) 
Purpose flag is used in make_stock_entry(**args) function, but it was not included in the comment inside the function.
 2018-06-28 23:05:32 +05:30
Ranjith Kurungadam
f6e654eccc Payroll Entry - fix deduct taxes (#14730) 2018-06-28 23:04:51 +05:30
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
Manas Solanki
3ff7f79cc7
Merge pull request #14740 from manassolanki/fix-20 
[minor] fix for the args in the frm.call
 2018-06-28 20:47:25 +05:30
Manas Solanki
89e7f8b387 [minor] fix for the args in the frm.call 2018-06-28 20:44:53 +05:30
rohitwaghchaure
631cc30a8b
Merge pull request #14736 from rohitwaghchaure/subcontracted_pr_issue 
[Fix] Not able to save subcontracted purchase receipt
 2018-06-28 18:38:32 +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
Shreya Shah
2fbc8509f5 Fix error message (#14716) 2018-06-28 14:14:28 +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
4bd6547de8
Merge pull request #14710 from frappe/revert-14708-hub-fixes 
Revert "[hub] add link in modules"
 2018-06-28 09:59:56 +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
Manas Solanki
1b52a94e8c
Merge pull request #14700 from manassolanki/test_finance_book 
[test] check the finance book via the journal entry
 2018-06-27 15:16:58 +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
rohitwaghchaure
67d87e29e3 [Fix] Wrong rate calculation in Itemwise sales register report for multi uom (#14690) 2018-06-27 11:22:03 +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
Deepak kumar
55cf6c5f7e Membership (#14688) 
* Correct the label and field name

* Update membership.json
 2018-06-27 09:17:33 +05:30
rohitwaghchaure
f3cf15fa0d [Fix] While saving project getting timeout error (#14672) 2018-06-26 17:06:00 +05:30
Nabin Hait
e2a8120ef8 ignore user permissions for some fields 2018-06-26 15:27:34 +05:30
Prateeksha Singh
d53d2ed791
Merge pull request #14679 from pratu16x7/hotfix 
[fix] yet another python attribute fetch
 2018-06-26 12:20:26 +05:30
Prateeksha Singh
34aeefc0a1 [fix] yet another python attribute fetch 2018-06-26 12:18:29 +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
Prateeksha Singh
f845e749f2
Update stale-bot config 2018-06-25 11:06:32 +05:30
Shreya Shah
d8031d1a53 Clear child table before appending (#14648) 2018-06-25 10:34:55 +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