Frappe PR Bot
6a71955b99
chore: change location of backport action ( #26705 ) ( #26707 )
...
(cherry picked from commit e906acdc49
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-07-29 14:28:13 +05:30
Jannat Patel
285463b031
Merge pull request #23129 from anupamvs/email-digest
...
fix: multiselect recipients in Email Digest
2021-07-29 12:36:49 +05:30
Ankush
8859574aab
feat: don't recompute taxes ( #26694 )
2021-07-29 11:09:22 +05:30
Anupam
e5fea372af
fix: frappe linter
2021-07-29 11:05:38 +05:30
Anupam
b1350af1f6
fix: setup wizard
2021-07-28 23:54:46 +05:30
Anupam Kumar
89f2138fbc
Merge branch 'version-13-hotfix' into email-digest
2021-07-28 18:24:29 +05:30
Frappe PR Bot
1b6dd84c0a
fix(bom): remove manual permission checking ( #26689 ) ( #26690 )
...
get_list does the permission checking.
(cherry picked from commit d95f16ac8f
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-07-28 18:11:11 +05:30
Deepesh Garg
4c0dfdb398
Merge pull request #26687 from deepeshgarg007/fieldtype_fix
...
fix: Change fieldtype from data to check
2021-07-28 15:59:08 +05:30
Deepesh Garg
fa8e6ac7cd
fix: Patch
2021-07-28 15:30:05 +05:30
Afshan
90c5cb0a31
fix: documentation link for E Invoicing ( #26685 )
2021-07-28 13:42:33 +05:30
Deepesh Garg
9350249941
fix: Chnage fieldtype from data to check
2021-07-28 12:57:59 +05:30
Deepesh Garg
7365e9704f
Merge pull request #26683 from deepeshgarg007/tds_194q_fix
...
fix(minor): Consider grand total for threshold check
2021-07-28 11:56:29 +05:30
Deepesh Garg
1c9e516092
fix: GL Entries for discount amount with item qty greater than 1
2021-07-28 11:38:44 +05:30
Deepesh Garg
64af124f88
fix(minor): Consider grand total for threshold check
2021-07-28 10:43:02 +05:30
Raffael Meyer
ac2e139d5b
fix: force reload of Opportunity in patch ( #26668 )
2021-07-28 00:14:59 +05:30
Rohit Waghchaure
56b81565fa
fix: added progress bar in repost item valuation
2021-07-27 22:11:30 +05:30
rohitwaghchaure
965b1fe4a0
Merge pull request #26675 from rohitwaghchaure/fixed-dict-object-has-no-attr
...
fix: not able to add employee in the job card
2021-07-27 18:47:45 +05:30
Rohit Waghchaure
af58ac9e10
fix: not able to add employee in the job card
2021-07-27 18:43:20 +05:30
Nabin Hait
11a1610781
Merge pull request #26661 from deepeshgarg007/tds_enhancements
...
feat: Enhancements in Tax Withholding Category
2021-07-27 18:26:00 +05:30
Frappe PR Bot
b122a1eaa0
fix: reload manufacturing setting before patch ( #26641 ) ( #26670 )
...
(cherry picked from commit c8d7a8c781
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-07-27 16:59:06 +05:30
Deepesh Garg
f28595cad0
Merge pull request #26650 from deepeshgarg007/exchange_rate_reval_fixes_v13
...
fix: Exchange rate revaluation posting date and precision fixes
2021-07-27 16:41:23 +05:30
Deepesh Garg
6e6823c3aa
feat: Enhancements in TDS
2021-07-27 10:59:25 +05:30
Jannat Patel
5448aa25e7
chore: code owners updated ( #26659 )
2021-07-27 10:18:53 +05:30
Deepesh Garg
3fae0db8d9
Merge pull request #26550 from nemesis189/ignore-mandatory-in-payment-reconcilitation-v13
...
fix: Ignore mandatory fields while creating payment reconciliation Journal Entry
2021-07-27 10:15:39 +05:30
Deepesh Garg
2922fb52cc
Merge pull request #26616 from deepeshgarg007/gst_sales_register_fix
...
fix(India): Default value for export type
2021-07-27 10:12:02 +05:30
Jannat Patel
6c48a2ed79
fix: Removed set_status after cancel from Expense Claim and Employee Advance ( #25901 )
...
* fix: removed set_status after cancel from hr doctypes
* fix: semgrep on_submit issue
* fix: sider
* fix: spaces
* fix: update flag for db_set
2021-07-27 09:41:55 +05:30
Jannat Patel
aaea5edbdb
fix: Salary component account filter ( #26605 )
...
* fix: salary component account filter
* fix: cleanup
2021-07-27 09:39:33 +05:30
Frappe PR Bot
cfd73ed554
ci: auto backport squashed commits based on labels ( #26622 ) ( #26640 )
...
(cherry picked from commit 057a0a9842
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-07-26 19:42:19 +05:30
Deepesh Garg
23776600f3
Merge pull request #26544 from deepeshgarg007/gstr_3b_missing_cess
...
fix: Add missing cess amount in GSTR-3B report
2021-07-26 19:20:42 +05:30
Deepesh Garg
6330318381
Merge pull request #26575 from deepeshgarg007/gst_reports_timeout
...
fix: GST Reports timeout issue
2021-07-26 19:19:16 +05:30
Deepesh Garg
dc2cd35b93
fix: Convert null values to empty string on grouping
2021-07-26 19:07:02 +05:30
Deepesh Garg
5749e52bf6
fix: Ignore GL Entry on cancel
2021-07-26 19:06:51 +05:30
Deepesh Garg
fb72df7dce
fix: Exchange rate revaluation posting date and precision fixes
2021-07-26 19:06:40 +05:30
Deepesh Garg
8d52a22709
fix: Additional discount calculations in Invoices ( #26553 )
...
* fix: Additional discount calculations in Invoices
* revert: Client side handling for Dynamic GST Rates
* fix: Add update item tax template method back
* fix: Revert refresh field
* fix: add company change trigger
2021-07-26 19:00:57 +05:30
Deepesh Garg
d066eab6cd
fix: Test case for GSTR-3b report
2021-07-26 18:38:50 +05:30
Deepesh Garg
0011585415
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_sales_register_fix
2021-07-26 17:21:13 +05:30
Subin Tom
06fb0b93b5
fix: Supplier invoice importer fix v13 ( #26633 )
...
* fix: Supplier Invoice Importer fix
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
2021-07-26 16:46:47 +05:30
Frappe PR Bot
4209b3bda9
fix: included company in Link Document Type filters for contact ( #26576 ) ( #26634 )
...
(cherry picked from commit cbddedab7b
)
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-07-26 13:00:32 +05:30
Rucha Mahabal
017ed3f5c1
fix: employee status server-side validation ( #26615 )
2021-07-24 00:08:02 +05:30
rohitwaghchaure
9052a3b1a8
Merge pull request #26614 from rohitwaghchaure/fixed-serial-no-not-link-to-batch-error
...
fix: serial no and batch validation
2021-07-23 23:38:02 +05:30
rohitwaghchaure
9ef157b23b
fix: wrong operation time in Work Order ( #26613 )
...
* fix: wrong operation time in Work Order
Top level item time operation was not considering the BOM.quantity
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-07-23 20:44:34 +05:30
Deepesh Garg
328444b530
fix(India): Default value for export type
2021-07-23 20:28:02 +05:30
Rohit Waghchaure
45d506c489
fix: serial no and batch validation
2021-07-23 16:40:45 +05:30
rohitwaghchaure
56c67743ab
fix: incorrect bom name ( #26600 )
2021-07-22 16:10:06 +05:30
Ankush
5b32fa5ccd
fix: SQL error on fetching RM in production plan (bp #26592 )
...
* fix: SQL error on fetching RM in production plan
* refactor: avoid passing by reference and mutations
2021-07-22 14:00:01 +05:30
Deepesh Garg
2ff0d3e0eb
fix: Test Cases
2021-07-22 10:43:16 +05:30
rohitwaghchaure
49c5cd66f3
Merge pull request #26586 from rohitwaghchaure/removed-remarks-field-from-ar-ap-report
...
fix: removed Remarks column from AR/AP report
2021-07-22 10:27:15 +05:30
Deepesh Garg
c765073c2a
fix: Tests
2021-07-21 22:28:32 +05:30
Ankush Menat
6928fc17c6
chore: remove warning rules
...
semgrep-action doesn't consider severity, hence ignoring these rules for now.
2021-07-21 19:56:15 +05:30
Rohit Waghchaure
f3158ea448
fix: removed Remarks column from AR/AP report
2021-07-21 19:47:41 +05:30