Subin Tom
b19305aa83
fix: used get_employees_with_number, strip_number methods
2022-03-22 16:22:09 +05:30
Subin Tom
1ab5b7a811
fix: linter, sider fixes
2022-02-28 12:47:05 +05:30
Subin Tom
f1f3e035a6
Merge branch 'exotel-fixes' of https://github.com/nemesis189/erpnext into exotel-fixes
2022-02-25 16:59:35 +05:30
Subin Tom
5b79496f05
fix: call type doctype, fixes
2022-02-25 16:52:25 +05:30
Subin Tom
a91fb88929
fix: sider fixes
2022-02-25 13:45:26 +05:30
Subin Tom
00b0f10100
fix: added type of call select field, additional status for agent rejecting call
2022-02-25 13:38:57 +05:30
Subin Tom
fd20713bd7
fix: added field to show called group, user_id
2022-02-25 12:01:53 +05:30
Subin Tom
006606c437
fix: added employee name to call log
2022-02-23 18:45:50 +05:30
Subin Tom
8d3011832b
fix: call status fix
2022-02-23 12:59:38 +05:30
Sagar Vora
08a391fa88
test: set correct DocType ( #29819 )
2022-02-16 10:56:57 +05:30
Ankush Menat
f89a64db48
fix: dont attempt to set batch number if item doesn't have batch no ( #29812 )
...
This causes other triggers and unnecessary changes (e.g. price list)
2022-02-15 16:10:35 +05:30
Deepesh Garg
4a33cdab34
Merge pull request #29791 from deepeshgarg007/tds_payable_cancelled_entries
...
fix: Fixes in TDS payable monthly report
2022-02-15 15:39:47 +05:30
Deepesh Garg
4bc286d284
Merge pull request #29593 from deepeshgarg007/reverse_entry_dead_lock
...
fix: Deadlock on making reverse GL Entries
2022-02-15 12:23:16 +05:30
Deepesh Garg
10629f78fa
Merge branch 'develop' into reverse_entry_dead_lock
2022-02-15 11:59:50 +05:30
Ankush Menat
1e9766433a
fix: get_item_details overrides parentype ( #29799 )
2022-02-15 10:57:06 +05:30
Ankush Menat
13a60fb258
ci: ignore bugs identified in QA process for stalebot
...
[skip ci]
2022-02-15 10:43:58 +05:30
Saqib Ansari
67a7802f0d
Merge pull request #29789 from nextchamp-saqib/fix-opening-inv-tool
...
fix: disable rounded total in opening invoice creation tool
2022-02-15 10:38:11 +05:30
Marica
728545d147
Merge pull request #29788 from marination/fifo-slot-by-wh
...
fix: Generate Warehouse wise FIFO Queue always and later aggregate if required
2022-02-14 23:04:44 +05:30
Marica
599f4b1412
Merge pull request #29705 from marination/pending-qty-in-prod-plan
...
fix: Set Pending Qty in Prod Plan after updating Work Order
2022-02-14 23:01:51 +05:30
marination
e46a1bc80f
fix: Server Tests and sider
2022-02-14 21:00:51 +05:30
Marica
cd728fc9e7
Merge branch 'develop' into fifo-slot-by-wh
2022-02-14 20:42:57 +05:30
Deepesh Garg
04cbde2e52
fix: Filter out bank payment entries
2022-02-14 20:38:04 +05:30
marination
f221a0d253
test: Cover back to back recos from different warehouses
2022-02-14 20:14:14 +05:30
Deepesh Garg
2ff6b3560e
fix: Fixes in TDS payable monthly report
2022-02-14 19:51:58 +05:30
Sagar Sharma
19a6c21eec
refactor!: amazon mws integration ( #29438 )
...
* remove: amazon mws integration
* add patch to remove doctype
* remove old patch
2022-02-14 19:43:26 +05:30
Saqib Ansari
a8309c5183
Merge branch 'develop' into fix-opening-inv-tool
2022-02-14 19:14:03 +05:30
Saqib Ansari
60b55f0d5c
Merge pull request #29778 from nextchamp-saqib/fix-pricing-rule-filtering
...
fix: incorrect pricing rule filtering on selecting first item
2022-02-14 18:40:59 +05:30
Saqib Ansari
18d0a59a9d
fix: disable rounded total in opening invoice creation tool
2022-02-14 18:38:02 +05:30
Saqib Ansari
3713ae75ab
fix: incorrect pricing rule filtering on selecting first item
2022-02-14 13:31:37 +05:30
Dany Robert
85adb947bf
fix: show user id in emp group table ( #29776 )
2022-02-14 09:22:21 +05:30
Deepesh Garg
3557bbc539
Merge pull request #29770 from frappe/mergify/bp/develop/pr-29716
...
fix: Loan repayment via Salary Slip (backport #29716 )
2022-02-12 21:55:23 +05:30
Deepesh Garg
65711dbde8
test: Update account type in payroll payable account
...
(cherry picked from commit a54e0fe42b38f571396e88b3ebcc46fd3b389301)
2022-02-12 13:17:33 +00:00
Deepesh Garg
988dee04fa
fix: Loan repayment via Salary Slip
...
(cherry picked from commit 2572480554db265e2e93a5dfba75749675b46d14)
2022-02-12 13:17:32 +00:00
Deepesh Garg
19e281a54f
Merge pull request #29700 from vorasmit/gstr-1-fixes
...
fix(India): Report GSTR-1 minor fixes
2022-02-12 17:16:24 +05:30
Wolfram Schmidt
a0d163ebff
chore: changed Region zu Gebiet ( #29651 )
...
"Region" is more fitting when talking about a geographical area or region. Gebiet is more accurate translation in this case of territory as we are talking about sales territory which would be a "Verkaufsgebiet".
2022-02-12 14:50:48 +05:30
Wolfram Schmidt
7338641791
chore: added DocType Translation #29730
...
frappe.cloud/app/doctype/Email Digest Recipient
..it's just a table
[skip ci]
2022-02-12 14:49:31 +05:30
Ankush Menat
eb8b424722
feat: item-wise negative stock setting ( #29761 )
2022-02-12 13:08:28 +05:30
mergify[bot]
749005eb8b
fix: list mutation within loop ( #29766 )
...
Prevent list mutation within loop leading to incorrect data
(cherry picked from commit 894a406ed406f8e6fa3efed9315609ffc33075f6)
Co-authored-by: Govind S Menokee <govindsmenokee@gmail.com>
2022-02-12 12:14:19 +05:30
Saqib Ansari
80944e666f
Merge pull request #29754 from resilient-tech/remove-format
...
chore: remove deprecated print format
2022-02-12 12:08:23 +05:30
Saqib Ansari
ef971e160a
Merge pull request #29729 from resilient-tech/allow_regional
...
fix: allow `regional_overrides` hook to be set in subsequent apps
2022-02-12 12:05:25 +05:30
Rucha Mahabal
961467c389
fix: revert removal of gratuity payment via salary slip ( #29589 )
2022-02-12 00:29:53 +05:30
Rucha Mahabal
fe37103dcb
Merge pull request #29711 from ruchamahabal/leave-policy-assgn-fixes
2022-02-11 21:24:07 +05:30
Rucha Mahabal
10ee2fbeac
Merge branch 'develop' into leave-policy-assgn-fixes
2022-02-11 21:00:49 +05:30
Rucha Mahabal
cbaadcf113
fix(test): reset test setup
2022-02-11 20:59:19 +05:30
Rucha Mahabal
9b0f9c3442
test: earned leave allocations based on DOJ
2022-02-11 20:08:01 +05:30
marination
f62b3207ff
fix: Generate Wh wise FIFO Queue and later aggregate if required
...
- Back to back stock recos cause incorrect qty calculation across warehouses
- Hard to differentiate how much of the qty is reset by the reco
- Maintain Queue and balances warehouse wise and later aggregate for accurate values
2022-02-11 18:14:28 +05:30
Deepesh Garg
86ef932979
Merge pull request #29756 from frappe/revert-29499-overseas_gst_tax
...
Revert "fix(India): Tax calculation for overseas suppliers"
2022-02-11 17:40:48 +05:30
Rucha Mahabal
51e6086829
chore: clean-up leave policy assignment tests
2022-02-11 17:40:20 +05:30
Deepesh Garg
ea20c63182
Revert "fix(India): Tax calculation for overseas suppliers"
2022-02-11 17:38:37 +05:30
rohitwaghchaure
ce79434a9b
Merge pull request #29736 from rohitwaghchaure/performance-issue-while-making-wo
...
fix: time out error while making work orders from production plan
2022-02-11 16:12:21 +05:30
