Marica
|
7cbd755951
|
Merge branch 'develop' into serial-no-space
|
2021-07-30 14:09:19 +05:30 |
|
Rucha Mahabal
|
821db5cce7
|
fix: employee status server-side validation (#26442)
* fix: employee status server-side validation
* fix: test
* test: employee inactive status
* fix: test
|
2021-07-30 10:21:42 +05:30 |
|
rohitwaghchaure
|
383c49cfed
|
Merge pull request #26726 from marination/stock-reco-fetch-non-empty-stock
feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse
|
2021-07-30 00:15:18 +05:30 |
|
Marica
|
0eed394f5e
|
Merge branch 'develop' into stock-reco-fetch-non-empty-stock
|
2021-07-29 19:54:56 +05:30 |
|
rohitwaghchaure
|
22eac9bd0c
|
Merge pull request #26720 from rohitwaghchaure/skip-cancelled-entries-in-report-develop
fix: remove cancelled entries from Stock and Account Value comparison report
|
2021-07-29 19:50:00 +05:30 |
|
marination
|
533ee9a401
|
feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse
- Added checkbox to `Fetch Items from Warehouse` dialog to ignore empty stock
- fix: Items fetched twice due to Item Defaults
- Improved code readability
|
2021-07-29 19:39:32 +05:30 |
|
Rohit Waghchaure
|
c1c5a4ae17
|
fix: remove cancelled entries from Stock and Account Value comparison report
|
2021-07-29 19:15:34 +05:30 |
|
Deepesh Garg
|
8b7e3775c2
|
Merge pull request #26712 from ankush/against_acc_pr
fix: empty "against account" in Purchase Receipt GLE
|
2021-07-29 19:10:38 +05:30 |
|
Jannat Patel
|
e99f68fd7e
|
fix: expense claim semgrep issue (#26709)
* fix: expense claim semgrep issue
* fix: sider
|
2021-07-29 18:31:38 +05:30 |
|
Ankush
|
0bb60b37df
|
chore: add timeout to GHA workflows (#26714)
|
2021-07-29 17:15:12 +05:30 |
|
Ankush Menat
|
5764b49767
|
fix: remove incorrect field check from reposting
|
2021-07-29 15:41:22 +05:30 |
|
Ankush Menat
|
c3e739caf8
|
fix: correct field for GLE against account in PR
|
2021-07-29 15:34:18 +05:30 |
|
Nabin Hait
|
ebbabf11e9
|
Merge pull request #25944 from ruchamahabal/fix-employee-onboarding-status
fix: boarding status in Employee Onboarding and Separation
|
2021-07-29 15:24:54 +05:30 |
|
Ankush
|
e906acdc49
|
chore: change location of backport action (#26705)
|
2021-07-29 13:56:21 +05:30 |
|
rohitwaghchaure
|
04ff0bc40d
|
Merge pull request #26264 from noahjacob/mr_allowance_feat
feat: over transfer allowance for material transfers
|
2021-07-29 11:18:37 +05:30 |
|
Deepesh Garg
|
e79bfbb104
|
Merge pull request #26665 from ankush/dont_recompute_taxes
feat: don't recompute taxes
|
2021-07-28 19:36:27 +05:30 |
|
Ankush
|
d95f16ac8f
|
fix(bom): remove manual permission checking (#26689)
get_list does the permission checking.
|
2021-07-28 16:38:59 +05:30 |
|
Sagar Vora
|
70c673d9b0
|
Merge pull request #26688 from resilient-tech/fix-reference-date
fix: date as reference_date from bank transactions
|
2021-07-28 15:20:14 +05:30 |
|
walstanb
|
655b5dc190
|
fix: date as reference_date from bank transactions
|
2021-07-28 14:30:11 +05:30 |
|
Afshan
|
42bc0a7db8
|
fix: documentation link for E Invoicing (#26684)
|
2021-07-28 13:42:53 +05:30 |
|
rohitwaghchaure
|
36bf5c7ed4
|
Merge branch 'develop' into mr_allowance_feat
|
2021-07-28 11:52:57 +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 |
|
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 |
|
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 |
|
Anupam
|
6a89b9e267
|
Merge branch 'campaign-module' of https://github.com/anupamvs/erpnext into campaign-module
|
2021-07-27 16:53:08 +05:30 |
|
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
|
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 |
|
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 |
|
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
|
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
|
b23315a7e6
|
Merge branch 'develop' into exchange_rate_reval_fixes
|
2021-07-26 19:05:44 +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
|
19589b1e21
|
fix: GST Reports timeout issue
|
2021-07-26 17:05:48 +05:30 |
|
Deepesh Garg
|
00fd319531
|
fix: Add missing cess amount in GSTR-3B report
|
2021-07-26 16:52:54 +05:30 |
|
Deepesh Garg
|
4e0664b548
|
Merge branch 'develop' into supplier-invoice-importer-fix
|
2021-07-26 16:48:11 +05:30 |
|
Noah Jacob
|
cbddedab7b
|
fix: included company in Link Document Type filters for contact (#26576)
|
2021-07-26 12:54:35 +05:30 |
|