Jannat Patel
|
1ec7ccd749
|
Merge pull request #26272 from anupamvs/campaign-module
fix: moving campaign from selling to CRM
|
2021-07-27 17:34:31 +05:30 |
|
rohitwaghchaure
|
a07423ebb5
|
Merge pull request #26672 from frappe-pr-bot/backport/version-13-pre-release/26641
fix: reload manufacturing setting before patch
|
2021-07-27 17:28:53 +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 |
|
Anupam
|
6a89b9e267
|
Merge branch 'campaign-module' of https://github.com/anupamvs/erpnext into campaign-module
|
2021-07-27 16:53:08 +05:30 |
|
Ankush
|
7a97b6d6a8
|
fix: reload manufacturing setting before patch (#26641)
(cherry picked from commit c8d7a8c781)
|
2021-07-27 11:19:33 +00:00 |
|
Anupam
|
ee1089ca4f
|
Merge branch 'develop' of https://github.com/frappe/erpnext into campaign-module
|
2021-07-27 16:49:24 +05:30 |
|
Anupam
|
f1c697ca75
|
fix: sider issue
|
2021-07-27 16:49:04 +05:30 |
|
Deepesh Garg
|
9d8efbe1db
|
Merge pull request #26651 from deepeshgarg007/exchange_rate_reval_fixes_v13_pre_release
fix: Exchange rate revaluation posting date and precision fixes
|
2021-07-27 16:41:59 +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
|
3ee61af676
|
Merge pull request #26628 from deepeshgarg007/exchange_rate_reval_fixes
fix: Exchange rate revaluation posting date and precision fixes
|
2021-07-27 16:41:04 +05:30 |
|
Ankush
|
c8d7a8c781
|
fix: reload manufacturing setting before patch (#26641)
|
2021-07-27 16:39:38 +05:30 |
|
Ankush Menat
|
dfdd1c6e02
|
feat: don't recompute taxes
|
2021-07-27 14:49:44 +05:30 |
|
rohitwaghchaure
|
801ca6528a
|
Merge pull request #26663 from rohitwaghchaure/develop-fixed-serial-no-not-link-to-batch-error
fix: serial no and batch validation
|
2021-07-27 13:45:37 +05:30 |
|
Rohit Waghchaure
|
6b482ebb0f
|
fix: serial no and batch validation
|
2021-07-27 13:42:37 +05:30 |
|
Deepesh Garg
|
6e6823c3aa
|
feat: Enhancements in TDS
|
2021-07-27 10:59:25 +05:30 |
|
Deepesh Garg
|
2dbfb932b4
|
Merge pull request #26618 from nemesis189/supplier-invoice-importer-fix
fix: Supplier invoice importer fix
|
2021-07-27 10:27:07 +05:30 |
|
Anuja Pawar
|
9302e0b6c5
|
Merge branch 'develop' into sa-vat-report
|
2021-07-27 10:18:53 +05:30 |
|
Jannat Patel
|
5448aa25e7
|
chore: code owners updated (#26659)
|
2021-07-27 10:18:53 +05:30 |
|
Deepesh Garg
|
831ce88d1c
|
Merge pull request #26643 from nemesis189/ignore-mandatory-in-payment-reconcilitation-pre-release
fix:Ignore mandatory fields while creating payment reconciliation Journal Entry
|
2021-07-27 10:16:04 +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
|
59f87a3c95
|
Merge branch 'develop' into ignore-mandatory-in-payment-reconcilitation
|
2021-07-27 10:15:14 +05:30 |
|
Deepesh Garg
|
af84ce9216
|
Merge pull request #26647 from deepeshgarg007/gst_sales_register_fix_v13
fix(India): Default value for export type
|
2021-07-27 10:12:33 +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 |
|
Anupam Kumar
|
34353df48c
|
fix: sales pipeline graph issue (#26626)
|
2021-07-27 09:47:44 +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
|
ae9d1d9617
|
fix: Salary component account filter (#26604)
* fix: salary component account filter
* fix: cleanup
|
2021-07-27 09:40:12 +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 |
|
Ankush Menat
|
03a6c38f06
|
test: fix test due to rename change
|
2021-07-26 22:24:25 +05:30 |
|
marination
|
77f9f048b6
|
chore: test case for missing default warehouse on mapping
|
2021-07-26 21:33:17 +05:30 |
|
Marica
|
a4bafe2dbf
|
Merge branch 'develop' into pi-expense-account
|
2021-07-26 20:15:20 +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 |
|
marination
|
5c82af50f9
|
fix: Set Expense account from warehouse only if warehouse exists
|
2021-07-26 19:41:53 +05:30 |
|
Deepesh Garg
|
1b6c75bbb1
|
Merge pull request #26642 from deepeshgarg007/gstr_3b_missing_cess_develop
fix: Add missing cess amount in GSTR-3B report
|
2021-07-26 19:21:29 +05:30 |
|
Deepesh Garg
|
61d014d249
|
Merge pull request #26644 from deepeshgarg007/gstr_3b_missing_cess_v13
fix: Add missing cess amount in GSTR-3B report
|
2021-07-26 19:20:50 +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
|
8a6aa0d788
|
Merge pull request #26645 from deepeshgarg007/gst_reports_timeout_develop
fix: GST Reports timeout issue
|
2021-07-26 19:20:12 +05:30 |
|
Deepesh Garg
|
93dd238577
|
Merge pull request #26646 from deepeshgarg007/gst_reports_timeout_v13
fix: GST Reports timeout issue
|
2021-07-26 19:19:34 +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
|
3fcc5e3134
|
fix: Convert null values to empty string on grouping
|
2021-07-26 19:09:09 +05:30 |
|
Deepesh Garg
|
19a0ca1980
|
fix: Ignore GL Entry on cancel
|
2021-07-26 19:08:56 +05:30 |
|
Deepesh Garg
|
356a55258e
|
fix: Exchange rate revaluation posting date and precision fixes
|
2021-07-26 19:08:45 +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
|
b23315a7e6
|
Merge branch 'develop' into exchange_rate_reval_fixes
|
2021-07-26 19:05:44 +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
|
cba847b051
|
fix: Test case for GSTR-3b report
|
2021-07-26 18:46:27 +05:30 |
|
Deepesh Garg
|
a661667e2a
|
fix(India): Default value for export type
|
2021-07-26 18:46:14 +05:30 |
|
Jannat Patel
|
bfec49376d
|
Merge pull request #26631 from ChillarAnand/co
chore: Updated CODEOWNERS
|
2021-07-26 18:39:13 +05:30 |
|
Deepesh Garg
|
d066eab6cd
|
fix: Test case for GSTR-3b report
|
2021-07-26 18:38:50 +05:30 |
|