Commit Graph

37634 Commits

Author SHA1 Message Date
Frappe PR Bot
3a39c0f19a
fix: force reload of Opportunity in patch (#26668) (#26681)
(cherry picked from commit ac2e139d5b)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2021-07-28 00:19:32 +05:30
rohitwaghchaure
c1eb5a06a3
Merge pull request #26679 from rohitwaghchaure/removed-remarks-field-from-ar-ap-report-develop
fix: removed Remarks column from AR/AP report
2021-07-27 22:23:40 +05:30
Rohit Waghchaure
5d121c41f3 fix: removed Remarks column from AR/AP report 2021-07-27 22:22:56 +05:30
rohitwaghchaure
69983eb8ff
Merge pull request #26678 from rohitwaghchaure/fixed-dict-object-has-no-attr-develop
fix: not able to add employee in the job card
2021-07-27 22:22:10 +05:30
Rohit Waghchaure
7903aeca7e fix: not able to add employee in the job card 2021-07-27 22:19:41 +05:30
Deepesh Garg
5a7fad8a6a feat: Enhancements in TDS 2021-07-27 18:55:14 +05:30
rohitwaghchaure
82d0cfc68e
Merge pull request #26676 from rohitwaghchaure/fixed-dict-object-has-no-attr-pre
fix: not able to add employee in the job card
2021-07-27 18:46:59 +05:30
Rohit Waghchaure
940356d28a fix: not able to add employee in the job card 2021-07-27 18:45:17 +05:30
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
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
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
2dbfb932b4
Merge pull request #26618 from nemesis189/supplier-invoice-importer-fix
fix: Supplier invoice importer fix
2021-07-27 10:27:07 +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
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
Anupam Kumar
34353df48c
fix: sales pipeline graph issue (#26626) 2021-07-27 09:47:44 +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
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
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
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
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
b23315a7e6
Merge branch 'develop' into exchange_rate_reval_fixes 2021-07-26 19:05:44 +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
Jannat Patel
16feebf685
Update CODEOWNERS
chore: update code owner for education module
2021-07-26 18:17:30 +05:30
Jannat Patel
ebda4d67bd
Merge branch 'develop' into co 2021-07-26 18:14:48 +05:30
Noah Jacob
ba18a96b0c test: test case for over transfer of materials 2021-07-26 18:12:40 +05:30
Noah Jacob
bc82344fc7 feat: over transfer allowance for material transfers 2021-07-26 18:12:37 +05:30
Deepesh Garg
5fe7d80a64 fix: GST Reports timeout issue 2021-07-26 17:13:28 +05:30
Deepesh Garg
19589b1e21 fix: GST Reports timeout issue 2021-07-26 17:05:48 +05:30
Deepesh Garg
c468e4a93d fix: Add missing cess amount in GSTR-3B report 2021-07-26 16:58:07 +05:30
Deepesh Garg
00fd319531 fix: Add missing cess amount in GSTR-3B report 2021-07-26 16:52:54 +05:30
Subin Tom
50b76d04bf fix:Ignore mandatory fields while creating payment reconciliation Journal Entry 2021-07-26 16:52:05 +05:30
Deepesh Garg
4e0664b548
Merge branch 'develop' into supplier-invoice-importer-fix 2021-07-26 16:48:11 +05:30
Subin Tom
ed68f11a46
fix: Supplier invoice importer fix pre release (#26636)
* fix: Supplier Invoice Importer fix
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
2021-07-26 16:47:36 +05:30