barredterra
ea0fd31f60
Merge branch 'datev_fixes' of https://github.com/alyf-de/erpnext into datev_fixes
2021-04-08 17:25:54 +02:00
Raffael Meyer
3b4b17476a
Merge branch 'develop' into datev_fixes
2021-04-08 17:25:12 +02:00
Deepesh Garg
edb4663258
Merge pull request #25251 from nextchamp-saqib/einv-ack-no-fix
...
fix(india): set correct ack no. on irn generation
2021-04-08 20:48:01 +05:30
barredterra
c6e13ac218
fix: patch to fill Debtor/Creditor Number
2021-04-08 16:57:55 +02:00
barredterra
ed36fb2073
docs: doctring for patch
2021-04-08 16:57:20 +02:00
barredterra
03425071e7
fix: patch to add custom fields
2021-04-08 16:31:00 +02:00
barredterra
368a6541e9
fix: Debtor/Creditor Number is not translatable
2021-04-08 16:26:56 +02:00
Saqib Ansari
30720d2139
fix: set correct ack no. on irn generation
2021-04-08 19:06:44 +05:30
Rucha Mahabal
b7aa658a51
refactor(HR): Add missing reports and doctypes to the Workspace ( #24994 )
...
* refactor(HR): Add missing reports and doctypes to the Workspace
* refactor: remove Employee Tax and Benefits from HR Workspace
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2021-04-08 18:13:21 +05:30
Jannat Patel
d9fa79de99
fix: serial no refresh issue ( #25127 )
...
* fix: serial no refresh issue
* fix: sider
2021-04-08 16:04:57 +05:30
rohitwaghchaure
f9fde054e1
Merge pull request #25242 from rohitwaghchaure/fixed-test-case-for-bom-cost
...
fix: bom cost test case
2021-04-08 14:39:08 +05:30
HENRY Florian
e286750a0f
fix: UOM length unit in global setup list is empty ( #24855 )
...
* When ERPNext is installed in localized language the category of UOM Conversion Factor is tranlasted into installed languaes. Filter must be locallized
* fix
* fix
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-04-08 13:56:29 +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
barredterra
94f293940c
fix: better party export
2021-04-07 20:06:16 +02:00
barredterra
4fe2d35b2e
feat: more infos for transactions
2021-04-07 20:05:41 +02:00
barredterra
b39608a02e
fix: handle encoding errors
...
replace unknown characters by '?'
2021-04-07 20:04:38 +02:00
barredterra
6b2e4f2b5d
feat: add custom field debtor_creditor_number to Party Account
2021-04-07 20:03:59 +02:00
barredterra
09c7598a67
fix: make account field non-mandatory
2021-04-07 20:03:33 +02:00
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
Walstan Baptista
90e240c3e6
fix: frappe.whitelist for doc methods ( #25230 )
2021-04-07 11:32:51 +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
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
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
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
