pateljannat
55e7c5644c
fix:rfq contact email set
2021-01-28 12:00:18 +05:30
Jannat Patel
5f9a219429
Merge pull request #4 from frappe/develop
...
sync fork
2021-01-04 12:18:54 +05:30
Afshan
a245f667d0
fix: pos error pop up ( #24237 )
2021-01-02 10:30:22 +05:30
Deepesh Garg
ffca52a348
Merge pull request #24254 from nextchamp-saqib/loan-patch-fix
...
fix: update old loan patch
2021-01-01 13:50:52 +05:30
Anurag Mishra
b901d4002a
Merge pull request #24264 from AfshanKhan/fix-sal-struc-assign-payroll-acc
...
fix: setting correct account for sal struct assignment if not specified.
2020-12-31 18:26:46 +05:30
Anurag Mishra
f5e566a29c
Merge pull request #24265 from AfshanKhan/allow-cancel-leave-policy
...
fix: allow leave policy assignment to be canceled.
2020-12-31 18:26:08 +05:30
Afshan
47bc42740b
Merge branch 'develop' into fix-sal-struc-assign-payroll-acc
2020-12-31 17:41:44 +05:30
Afshan
4edcf813e7
Merge branch 'develop' into allow-cancel-leave-policy
2020-12-31 17:41:34 +05:30
Anurag Mishra
d7ea2bd705
Merge pull request #24177 from AfshanKhan/fix-perm-empl-sal-slip
...
fix: error popup for submitted doc
2020-12-31 17:07:30 +05:30
Afshan
e69148c266
fix: allow leave policy assignment to be cancelled.
2020-12-31 16:45:00 +05:30
Afshan
8b60fe6125
fix: setting correct account for sal struct assignment if not specified.
2020-12-31 16:10:39 +05:30
Saqib
2b67d57480
fix: cannot submit e-invoice if legal name not found
2020-12-31 13:26:05 +05:30
Saqib Ansari
d5d571ab9d
fix: update old loan patch
2020-12-31 12:55:35 +05:30
Deepesh Garg
f57089532a
Merge pull request #24252 from deepeshgarg007/partial_security_unpledge
...
fix: Partial loan security unpledging
2020-12-30 21:37:52 +05:30
Deepesh Garg
9716216632
fix: check for string types
2020-12-30 20:33:35 +05:30
Deepesh Garg
a60707873c
fix: Partial loan security unpledging
2020-12-30 20:24:15 +05:30
Karthikeyan S
aa44c754de
fix(GST E Invoice): update live URLs for adaequare GSP ( #24248 )
2020-12-30 19:22:37 +05:30
Deepesh Garg
5891b48cf6
Merge pull request #24176 from GangaManoj/Year-to-Date
...
feat: Add year_to_date field (cumulative salary for a fiscal year)
2020-12-30 16:53:47 +05:30
rohitwaghchaure
bb0fd33ac5
Merge pull request #24169 from Anurag810/payroll-entry-fixes
...
fix: allow addition and removal of employee in payroll Entry
2020-12-30 16:50:02 +05:30
Deepesh Garg
66dcaf3ab2
fix: Salary structure assignment in tests
2020-12-30 15:47:22 +05:30
Saqib
f946bbd032
fix: minor e-invoicing issues ( #24239 )
...
* fix: invoice value set to zero if rounded total disabled
* fix: unit rate & gross amount calculation
* fix: e-invoice-setup patch
* chore: no need to re-run the patch
* fix: item value & invoice value calculations
2020-12-30 14:43:42 +05:30
Deepesh Garg
97d055dfc3
fix: Test Case
2020-12-30 14:06:13 +05:30
Anurag Mishra
b7631af741
Merge branch 'develop' into payroll-entry-fixes
2020-12-30 13:22:13 +05:30
Deepesh Garg
8b7ebe5044
fix: Test Case cleanup and fixes
2020-12-30 12:45:46 +05:30
Deepesh Garg
20133bd1df
fix: Remove comments
2020-12-29 22:19:12 +05:30
Deepesh Garg
7e4eacba8d
Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date
2020-12-29 22:13:55 +05:30
Deepesh Garg
353f8f4d85
fix: Add test case for YTD
2020-12-29 22:13:40 +05:30
Anurag Mishra
15af7a4afc
Merge pull request #24226 from AfshanKhan/asset-report
...
fix: asset depreciation ledger
2020-12-29 18:58:56 +05:30
Deepesh Garg
60b77f9865
Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date
2020-12-29 18:26:32 +05:30
rohitwaghchaure
b09ddc4672
Merge pull request #24233 from rohitwaghchaure/back-dates-allow-field-issue
...
fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'
2020-12-29 17:52:43 +05:30
Rohit Waghchaure
81285204dc
fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'
2020-12-29 16:25:45 +05:30
rohitwaghchaure
25bc9851f0
Merge pull request #24220 from rohitwaghchaure/fixed-finished-product-qty
...
fix: finished good produced qty validation
2020-12-29 13:41:03 +05:30
Anurag Mishra
5af8d2b883
Merge branch 'develop' into payroll-entry-fixes
2020-12-29 13:09:42 +05:30
Afshan
91e3c07d77
fix: assest depreciation ledger
2020-12-28 19:42:46 +05:30
Deepesh Garg
b75f198648
Merge pull request #24223 from frappe/revert-24087-batch-wise-pricing
...
Revert "feat: Batch wise item selling pricing"
2020-12-28 15:42:42 +05:30
rohitwaghchaure
527b7e16e5
Revert "feat: Batch wise item selling pricing"
2020-12-28 15:29:30 +05:30
rohitwaghchaure
72e8ec5eee
Merge pull request #24087 from deepeshgarg007/batch-wise-pricing
...
feat: Batch wise item selling pricing
2020-12-28 14:37:33 +05:30
Rohit Waghchaure
40d2c6a0cc
fix: finished good produced qty validation
2020-12-28 14:08:45 +05:30
Rucha Mahabal
e1b9707ec1
Merge pull request #24152 from ruchamahabal/fix-therapy-type-filter
...
fix: filter Therapy Types and Therapy Plan in Patient Appointment
2020-12-28 11:36:34 +05:30
Deepesh Garg
d3814b2676
Merge branch develop into batch-wise-pricing
2020-12-28 10:48:29 +05:30
Deepesh Garg
d4fc451c2a
Merge pull request #24191 from nextchamp-saqib/accounting-entries-for-asset
...
fix: accounting entries of asset when submitting purchase receipt
2020-12-26 19:14:32 +05:30
Saqib
60a1d25196
fix: cancelling of asset value adjustement ( #24193 )
2020-12-26 13:01:49 +05:30
rohitwaghchaure
9f1e1f6c23
Merge pull request #24207 from rohitwaghchaure/fixed-serial-no-return-issue
...
fix: partial serial no return issue
2020-12-26 12:12:04 +05:30
Nabin Hait
0788df412c
fix: Removed permissions from UAE VAT Settings
2020-12-25 20:54:01 +05:30
Nabin Hait
b99c77b753
Reposting fixes ( #24202 )
...
* fix: finished item validation and rate
* fix: Check if stock and account balance in sync after reposting
* fix: validate stock accounts in journal entry
* fix: validate expense against budget
2020-12-25 18:12:35 +05:30
rohitwaghchaure
fa0a075e95
Merge pull request #24196 from scmmishra/fix-file-url-employee
...
fix: use file_url to save file and not file name
2020-12-25 16:22:15 +05:30
rohitwaghchaure
ebcd4c454e
Merge pull request #24209 from rohitwaghchaure/added-shipment-link-in-delivery-note
...
fix: added shipment link in delivery note dashboard
2020-12-25 16:07:35 +05:30
Rohit Waghchaure
dab1ab990d
fix: partial serial no return issue
2020-12-25 15:25:16 +05:30
rohitwaghchaure
de10d7dcf2
Update shipment.py
2020-12-25 15:15:55 +05:30
Rohit Waghchaure
5bcc6c6b15
fix: added shipment link in delivery note dashboard
2020-12-25 15:02:53 +05:30
