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
Mohammad Hasnain Mohsin Rajan
11176852eb
Merge branch 'develop' into bugfix_typo_update
2020-12-30 20:59:38 +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
a25cb9a563
fix(GST E Invoice): update live URLs for adaequare GSP ( #24251 )
2020-12-30 19:41:00 +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
Deepesh Garg
ff51540eed
Merge branch 'accounting_dimension_filters' of github.com:deepeshgarg007/erpnext into accounting_dimension_filters
2020-12-29 17:02:07 +05:30
Deepesh Garg
e061004956
fix: Improve validation message
2020-12-29 17:00:39 +05:30
Raffael Meyer
a3462f6b0c
Merge branch 'develop' into validate_regional_germany
2020-12-29 11:58:57 +01:00
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
Deepesh Garg
4a8c2c4cb5
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-29 15:10:36 +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
Deepesh Garg
39ba31e68f
fix: Set batch values
2020-12-28 23:35:03 +05:30
Deepesh Garg
6d3e843f07
fix: Price not getting set for first row
2020-12-28 23:22:09 +05:30
Deepesh Garg
a679d43722
fix: Item Price using batch selector
2020-12-28 21:14:13 +05:30
Deepesh Garg
2466c3214a
fix: Add missing semicolon
2020-12-28 21:13:54 +05:30
Deepesh Garg
646ead65d8
fix: Sider issues
2020-12-28 21:13:43 +05:30
Deepesh Garg
7b282d253f
fix: Move item price link to batch
2020-12-28 21:13:36 +05:30
Deepesh Garg
37320074b2
fix: Sider Issues
2020-12-28 21:13:27 +05:30
Deepesh Garg
a5353c7d2d
fix: Add test case for batch pricing
2020-12-28 21:13:17 +05:30
Deepesh Garg
e85050c190
fix: Rate for items with no batch
2020-12-28 21:13:09 +05:30
Deepesh Garg
c3b22c6e5c
feat: Batch wise item pricing
2020-12-28 21:12:58 +05:30
Afshan
91e3c07d77
fix: assest depreciation ledger
2020-12-28 19:42:46 +05:30
marination
a69e81a151
chore: Made 'Parameter' a link field in QI and QI Template
...
- Added doctype Quality Inspection Parameter
- Made 'Parameter' a link field in QI and QI Template
- Added patch to create Quality Inspection Parameter records for every parameter in the system
2020-12-28 18:07:22 +05:30
Deepesh Garg
73cef56df7
fix: Debug travis
2020-12-28 17:44:00 +05:30
Deepesh Garg
a0f6381d6e
fix: Debugging
2020-12-28 17:43:21 +05:30
Deepesh Garg
b7b3944cef
fix: Internal sales item link in Purchase Invoice
2020-12-28 17:43:11 +05:30
Deepesh Garg
9d4bf040e9
fix: Fixes in flow
2020-12-28 17:11:10 +05:30
Deepesh Garg
afef92a88b
fix: Add validations and other fixes
2020-12-28 17:10:53 +05:30
Deepesh Garg
a9f4508cd1
fix: Add missing set warehouse fields
2020-12-28 17:06:14 +05:30
Deepesh Garg
dac19cbca5
fix: Consider conversion factor for invoices
2020-12-28 17:05:25 +05:30
Deepesh Garg
573d9094bb
fix: Item valuation for internal stocktransfers
2020-12-28 17:05:16 +05:30
Deepesh Garg
0413e34f0d
Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into enconnex_erpnext
2020-12-28 17:04:35 +05:30
marination
29a03bd5a1
feat: Add 'Manual Inspection' checkbox
...
- fix merge conflict in js file
- Dont auto set status if manual inspection is checked
- Added 'Manual Inspection' checkbox in QI readings table
2020-12-28 16:59:13 +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
pateljannat
88471854d5
fix: sider
2020-12-28 15:40:23 +05:30
