Marica
|
fb9fc944c5
|
Merge branch 'develop' into coa-importer-validate-fix
|
2021-04-08 13:46:42 +05:30 |
|
Rohit Waghchaure
|
fa8bb87a86
|
fix: bom cost test case
|
2021-04-08 13:38:22 +05:30 |
|
rohitwaghchaure
|
5d3f665cc5
|
Merge pull request #25240 from ankush/job_card_rounding
fix: round total quantity in job card
|
2021-04-08 13:10:09 +05:30 |
|
Ankush Menat
|
cb625d868c
|
fix: round total quantity in job card
|
2021-04-08 12:05:52 +05:30 |
|
Saqib
|
f10d107a0a
|
Merge branch 'develop' into coa-importer-validate-fix
|
2021-04-08 11:25:29 +05:30 |
|
Anupam Kumar
|
dfdf72cbb2
|
Merge branch 'develop' into planning
|
2021-04-08 10:58:05 +05:30 |
|
Anupam Kumar
|
8edf9d23c0
|
Merge branch 'develop' into se-add-to-transit
|
2021-04-08 10:57:50 +05:30 |
|
Ankush Menat
|
76c8521010
|
fix: remove gst name validation for purch Invoice
|
2021-04-07 16:28:13 +05:30 |
|
Afshan
|
e2da3cbc28
|
fix: payroll issues (#24540)
* fix: payroll issues
* fix: enhancements
* fix: rename variables and refactor
* fix: slider
* fix: added missing arguments
* fix: test cases
* fix: slider
* fix: slider
fix: slider
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
|
2021-04-07 15:13:44 +05:30 |
|
Saqib Ansari
|
5541aeaa82
|
fix: keyerror while validating coa file
|
2021-04-07 12:34:20 +05:30 |
|
Walstan Baptista
|
c39720db50
|
fix: frappe.whitelist for doc methods (#25231)
|
2021-04-07 11:51:22 +05:30 |
|
Walstan Baptista
|
90e240c3e6
|
fix: frappe.whitelist for doc methods (#25230)
|
2021-04-07 11:32:51 +05:30 |
|
Saurabh
|
e0222723f0
|
Merge branch 'version-13-pre-release' into version-13
|
2021-04-07 11:13:40 +05:30 |
|
Saurabh
|
547fd31a37
|
bumped to version 13.0.1
|
2021-04-07 11:33:40 +05:50 |
|
Nabin Hait
|
aa809ceffe
|
fix: Patch fixes for v13 upgrade (#25220)
|
2021-04-07 10:57:46 +05:30 |
|
Deepesh Garg
|
3d5a4ffd66
|
Merge pull request #24879 from deepeshgarg007/loan_fixes_phase_2
fix: Loan Repayment entry cancellation on salary slip cancel
|
2021-04-07 10:33:46 +05:30 |
|
Deepesh Garg
|
5af6aea9f9
|
fix: Posting Date check
|
2021-04-07 09:46:13 +05:30 |
|
Deepesh Garg
|
d551940dc5
|
fix: Remove comments
|
2021-04-06 23:55:48 +05:30 |
|
Deepesh Garg
|
a42194f3d5
|
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_fixes_phase_2
|
2021-04-06 23:53:34 +05:30 |
|
Rucha Mahabal
|
d77ea7c88b
|
Merge pull request #25190 from ruchamahabal/approver-perms
feat(HR): share doc with employee approvers if they don't have access
|
2021-04-06 14:32:34 +05:30 |
|
Rucha Mahabal
|
0bcd3c45ed
|
fix: leave approver perms test
|
2021-04-06 13:46:53 +05:30 |
|
Deepesh Garg
|
dfe91b5df3
|
Merge pull request #25212 from deepeshgarg007/loan_shortfall_preference
fix: Give first preference to loan security on repayment
|
2021-04-06 11:06:03 +05:30 |
|
Anupam Kumar
|
7b6c8bb3ab
|
fix: error message compensatory leave request (#25206)
|
2021-04-06 10:20:10 +05:30 |
|
Rucha Mahabal
|
d1970d3c38
|
Merge branch 'develop' into approver-perms
|
2021-04-06 10:09:18 +05:30 |
|
Rucha Mahabal
|
084e90e5d3
|
fix(test): set user as Administrator
|
2021-04-06 10:07:50 +05:30 |
|
Deepesh Garg
|
015fd681ec
|
fix: Give first preference to loan security on repayment
|
2021-04-06 00:49:46 +05:30 |
|
Sagar Vora
|
c9cdf74dc5
|
test: remove print() (#25205)
|
2021-04-05 16:38:10 +05:30 |
|
Marica
|
4440ff7a0d
|
Merge branch 'develop' into item-dashboard-fixes
|
2021-04-05 16:25:57 +05:30 |
|
Marica
|
bc50193702
|
Merge branch 'develop' into fix_picked_qty_in_DN
|
2021-04-05 16:24:53 +05:30 |
|
Sagar Vora
|
9967a7ce02
|
test: clear all existing quotations to avoid AssertionError (#25202)
|
2021-04-05 15:35:52 +05:30 |
|
Rucha Mahabal
|
9948525dd3
|
Merge branch 'develop' into approver-perms
|
2021-04-05 14:54:11 +05:30 |
|
Sagar Vora
|
9a0907131a
|
test: create tax rule if it doesnt exist (#25199)
|
2021-04-05 14:50:09 +05:30 |
|
Walstan Baptista
|
8789ef16a1
|
test: uses _Test Item instead of _Test Item Home Desktop 100 (#25198)
|
2021-04-05 13:18:03 +05:30 |
|
Anoop
|
b27441b40c
|
fix: failing patch - reload_doc new doctypes added in v13 (#25194)
|
2021-04-05 10:41:28 +05:30 |
|
Ankush Menat
|
36ff0748bf
|
fix: broken type check in stock ageing report
|
2021-04-05 10:18:44 +05:30 |
|
Rucha Mahabal
|
b7436a04c3
|
fix: Ignore Permission for Leave Ledger Entry (#25172)
|
2021-04-04 20:09:00 +05:30 |
|
Rucha Mahabal
|
57ab3a5a88
|
Merge branch 'develop' into approver-perms
|
2021-04-04 19:57:58 +05:30 |
|
Rucha Mahabal
|
19c3286b06
|
fix: linter and sider issues
|
2021-04-04 19:54:00 +05:30 |
|
Rucha Mahabal
|
8c055b5469
|
fix: ignore share permission while sharing doc with approver
|
2021-04-04 18:45:06 +05:30 |
|
Rucha Mahabal
|
13c0a350af
|
test: leave, expense, shift request approver permissions
|
2021-04-04 18:37:46 +05:30 |
|
Rucha Mahabal
|
ba10ef4403
|
feat(HR): share doc with employee approvers if they don't have access
|
2021-04-04 17:16:48 +05:30 |
|
Rohit Waghchaure
|
8b829711fc
|
fix: incorrect batch picked in subcontracted purchase receipt
|
2021-04-04 12:43:38 +05:30 |
|
Sagar Vora
|
8aacd341c7
|
test: disable shopping cart before running Tax Rule tests (#25183)
|
2021-04-03 23:01:16 +05:30 |
|
Sagar Vora
|
993cf8c2cd
|
test: cleanup BOM in test_routing and prevent overlap in test_job_card (#25180)
|
2021-04-03 20:25:19 +05:30 |
|
Walstan Baptista
|
37b826b988
|
fix: correct calculation for discount amount when margin is set (#25179)
|
2021-04-03 19:48:46 +05:30 |
|
Sagar Vora
|
cce3efe0c1
|
test: specify warehouse list to avoid error (#25174)
* test: specify warehouse list to avoid error
* test: get_all_warehouses of BOM company
|
2021-04-03 19:46:44 +05:30 |
|
Walstan Baptista
|
b7481633b1
|
test: adds role after setting user to Administrator (#25177)
|
2021-04-03 17:37:59 +05:30 |
|
Sagar Vora
|
f68f41d7a7
|
test: fix multiple tests in Leave Application (#25173)
|
2021-04-03 17:34:57 +05:30 |
|
Deepesh Garg
|
232c127295
|
Merge pull request #25107 from deepeshgarg007/stock_entry_serial_batch_selector
fix: Hide serial and batch selector in Stock Entry
|
2021-04-03 17:15:22 +05:30 |
|
Deepesh Garg
|
b7e7eeaf8d
|
Merge pull request #25138 from deepeshgarg007/loan_shortfall_percentage
fix: Add shortfall ratio in Loan Security Shortfall
|
2021-04-03 17:13:27 +05:30 |
|