Commit Graph

25826 Commits

Author SHA1 Message Date
Anupam Kumar
281eade019
Merge branch 'develop' into email-digest 2021-04-08 10:58:33 +05:30
Afshan
e2da3cbc28
fix: payroll issues ()
* 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
Walstan Baptista
90e240c3e6
fix: frappe.whitelist for doc methods () 2021-04-07 11:32:51 +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 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 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 () 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
Anupam
e711b30f66 fix: resolved conflicts 2021-04-05 17:06:59 +05:30
Sagar Vora
c9cdf74dc5
test: remove print() () 2021-04-05 16:38:10 +05:30
Sagar Vora
9967a7ce02
test: clear all existing quotations to avoid AssertionError () 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 () 2021-04-05 14:50:09 +05:30
Walstan Baptista
8789ef16a1
test: uses _Test Item instead of _Test Item Home Desktop 100 () 2021-04-05 13:18:03 +05:30
Anoop
b27441b40c
fix: failing patch - reload_doc new doctypes added in v13 () 2021-04-05 10:41:28 +05:30
Rucha Mahabal
b7436a04c3
fix: Ignore Permission for Leave Ledger Entry () 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
Sagar Vora
8aacd341c7
test: disable shopping cart before running Tax Rule tests () 2021-04-03 23:01:16 +05:30
Sagar Vora
993cf8c2cd
test: cleanup BOM in test_routing and prevent overlap in test_job_card () 2021-04-03 20:25:19 +05:30
Walstan Baptista
37b826b988
fix: correct calculation for discount amount when margin is set () 2021-04-03 19:48:46 +05:30
Sagar Vora
cce3efe0c1
test: specify warehouse list to avoid error ()
* 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 () 2021-04-03 17:37:59 +05:30
Sagar Vora
f68f41d7a7
test: fix multiple tests in Leave Application () 2021-04-03 17:34:57 +05:30
Deepesh Garg
232c127295
Merge pull request 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 from deepeshgarg007/loan_shortfall_percentage
fix: Add shortfall ratio in Loan Security Shortfall
2021-04-03 17:13:27 +05:30
rohitwaghchaure
fe72e17a7b
Merge pull request from ankush/po_to_pr_fixes
fix: incorrect status creating PR from PO after creating PI
2021-04-03 17:11:14 +05:30
Sagar Vora
f6b1fa0a1c
test: clear tax rules before making POS Invoices () 2021-04-03 16:06:41 +05:30
Walstan Baptista
5d77f10baa
test: docs are not deleted in tearDown ()
* test: docs are not deleted in tearDown
2021-04-03 13:38:55 +05:30
Kaviya Periyasamy
2cef23d4c9
fix: object referencing the same address issue ()
* fix: variable reference to same address

* fix: object referencing same address issue

* fix: value error
2021-04-03 11:30:49 +05:30
Rucha Mahabal
2453b0cf6a
fix: component amount calculation based on formula with abbr not working () 2021-04-02 17:00:28 +05:30
bhavesh95863
7535341016
fix(regional): remove shipping address GSTIN validation for e-invoice () 2021-04-02 15:04:48 +05:30
Saqib
5447b250fe
fix: place of supply of e-invoicing () 2021-04-02 12:16:19 +05:30
Deepesh Garg
7f10044195 fix: Typo 2021-04-02 12:04:42 +05:30
Afshan
ace4ce64a0
fix: validation msg for TransDocNo e-invoicing () 2021-04-01 20:28:12 +05:30
Suraj Shetty
7b97d49a58
Merge pull request from surajshetty3416/fix-get_route_options_for_new_doc
fix: get_route_options_for_new_doc for Project
2021-04-01 19:58:01 +05:30
Suraj Shetty
67169ba2d3 fix: get_route_options_for_new_doc for project 2021-04-01 19:52:07 +05:30
Marica
f46fbcc1ad
Merge pull request from marination/qc-back-update
fix: Query values incorrectly escaped while back updating Quality Inspection
2021-04-01 18:30:58 +05:30
Sagar Vora
d3ee8c7731
fix: customer creation from shopping cart () 2021-04-01 18:18:19 +05:30
Deepesh Garg
eea20f83ab fix: Add shortfall ratio in Loan Security Shortfall 2021-04-01 18:13:54 +05:30
Marica
913e7254cb
Merge branch 'develop' into qc-back-update 2021-04-01 17:40:46 +05:30
Walstan Baptista
446a6df662
test: set opening stock to fix NegativeStock errors ()
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-04-01 16:54:26 +05:30