Rohit Waghchaure
b9aa775f3b
fix: pricing_rule test cases
2021-04-10 10:45:28 +05:30
Rohit Waghchaure
1358443cdb
fix: patch
2021-04-10 10:42:08 +05:30
Deepesh Garg
c85c243f9c
Merge pull request #25255 from nextchamp-saqib/issue-condition-fix
...
fix: condition for setting agreement status
2021-04-09 21:40:14 +05:30
Deepesh Garg
df9388aa8e
Merge pull request #25086 from deepeshgarg007/advance_amount_precision
...
fix: Precision issues while allocating advance amount
2021-04-09 21:39:02 +05:30
Saqib
14b98c1737
Merge branch 'develop' into issue-condition-fix
2021-04-09 18:29:01 +05:30
Anupam Kumar
986452107b
fix: Lead Source's module ( #24583 )
...
* fix: Lead Source's module
* fix: patch fix
2021-04-09 18:15:51 +05:30
rohitwaghchaure
526f76c27d
Merge pull request #25257 from rohitwaghchaure/travis-fix-for-project
...
fix: travis
2021-04-09 17:07:22 +05:30
Rohit Waghchaure
ca5e10892c
fix: travis
2021-04-09 16:23:45 +05:30
Marica
d38618fc34
Merge branch 'develop' into item-dashboard-fixes
2021-04-09 11:57:56 +05:30
Marica
5467d7c3e3
fix: Use system precision instead of SLE precision
2021-04-09 11:56:49 +05:30
Marica
a7ac01153e
fix: Remove redundant import and import cint
2021-04-09 11:55:44 +05:30
Saqib Ansari
e7813b69c4
fix: condition for setting agreement status
2021-04-09 11:46:16 +05:30
Marica
b89a40aa3c
Merge branch 'develop' into fix_picked_qty_in_DN
2021-04-09 11:45:39 +05:30
Marica
7f0e92c9b9
Merge pull request #25232 from nextchamp-saqib/coa-importer-validate-fix
...
fix: keyerror while validating coa file
2021-04-09 11:44:40 +05:30
Deepesh Garg
63e6036d12
Merge pull request #25235 from ankush/remove_purch_inv_validation
...
fix: remove gst name validation for purchase Invoice
2021-04-09 10:48:34 +05:30
Saqib
4191e7999d
chore: add error title
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-04-08 21:04:56 +05:30
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
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
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
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
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
90e240c3e6
fix: frappe.whitelist for doc methods ( #25230 )
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 #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
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