Commit Graph

37688 Commits

Author SHA1 Message Date
Rohit Waghchaure
2a14f255cf fix: COGS account in purchase receipt 2021-07-31 11:14:14 +05:30
Deepesh Garg
64267faa8f
Merge pull request #26742 from deepeshgarg007/tds_194q_calculations_v13
fix: TDS calculation for first threshold breach for TDS category 194Q
2021-07-30 20:41:37 +05:30
Deepesh Garg
6eded547f5 fix: TDS calculation for first threshold breach for TDS category 194Q 2021-07-30 20:12:51 +05:30
Rucha Mahabal
1a2332a81c
fix: student category mapping from the program enrollment tool (#26716)
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-07-30 18:30:15 +05:30
Saqib
d4ae1febe3
fix: gl entries for exchange gain loss (#26734) 2021-07-30 11:21:49 +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
rohitwaghchaure
50b4b70589
Merge pull request #26727 from deepeshgarg007/pricing_rule_item_group_v13
fix: Parent condition in pricing rules
2021-07-29 20:06:47 +05:30
Deepesh Garg
9c7a9f3a13 fix: Parent condition in pricing rules 2021-07-29 20:02:49 +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
Ankush
57cd273f7c
fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26719)
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
2021-07-29 19:49:36 +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
rohitwaghchaure
020b8ae110
Merge pull request #26721 from rohitwaghchaure/skip-cancelled-entries-in-report-pre
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 19:18:58 +05:30
Rohit Waghchaure
a6d276a06f fix: remove cancelled entries from Stock and Account Value comparison report 2021-07-29 19:16:20 +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
Dany Robert
2833a02e0e
Merge branch 'develop' into patch-5 2021-07-29 16:47:28 +05:30
Dany Robert
909995a441
fix: issue with cache.setex 2021-07-29 15:58:27 +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
Ankush
f8343890b9
feat: don't recompute taxes (#26695) 2021-07-29 11:09:34 +05:30
Anuja
5dcd5e48e7 fix: fixed zero tax rate issue by adding custom field 2021-07-29 00:54:48 +05:30
Deepesh Garg
c6fe601efa
Merge pull request #26677 from deepeshgarg007/tds_enhancements_v13
feat: Enhancements in TDS
2021-07-28 20:58:42 +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
rohitwaghchaure
bfd824c56e
Merge pull request #26691 from frappe-pr-bot/backport/version-13-pre-release/26689
fix(bom): remove manual permission checking
2021-07-28 18:01:58 +05:30
Deepesh Garg
6ac68f3bc7 fix: Patch 2021-07-28 17:19:00 +05:30
Deepesh Garg
8c7d9efa9d fix: Chnage fieldtype from data to check 2021-07-28 17:18:50 +05:30
Ankush
8ed7a21cd5 fix(bom): remove manual permission checking (#26689)
get_list does the permission checking.

(cherry picked from commit d95f16ac8f)
2021-07-28 11:12:27 +00:00
Ankush
d95f16ac8f
fix(bom): remove manual permission checking (#26689)
get_list does the permission checking.
2021-07-28 16:38:59 +05:30
Anuja
4571fb6635 Merge remote-tracking branch 'origin/sa-vat-report' into sa-vat-report 2021-07-28 15:44:19 +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
Marica
d43e6ced91
Merge branch 'develop' into pi-expense-account 2021-07-28 14:38:48 +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
Afshan
868a6cb26d
fix: documentation link for E Invoicing (#26686) 2021-07-28 13:42:13 +05:30
rohitwaghchaure
36bf5c7ed4
Merge branch 'develop' into mr_allowance_feat 2021-07-28 11:52:57 +05:30
Deepesh Garg
441adf763f fix(minor): Consider grand total for threshold check 2021-07-28 10:51:50 +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
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