Deepesh Garg
|
441adf763f
|
fix(minor): Consider grand total for threshold check
|
2021-07-28 10:51:50 +05:30 |
|
Deepesh Garg
|
64af124f88
|
fix(minor): Consider grand total for threshold check
|
2021-07-28 10:43:02 +05:30 |
|
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 |
|
Raffael Meyer
|
ac2e139d5b
|
fix: force reload of Opportunity in patch (#26668)
|
2021-07-28 00:14:59 +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 |
|
Rohit Waghchaure
|
56b81565fa
|
fix: added progress bar in repost item valuation
|
2021-07-27 22:11:30 +05:30 |
|
Deepesh Garg
|
5a7fad8a6a
|
feat: Enhancements in TDS
|
2021-07-27 18:55:14 +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 |
|
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 |
|
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 |
|
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 |
|