nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 08:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,189 Commits 397 Branches 1,698 Tags
cedabd7242265f354e94d4e4b526db7dbd3d5dda
Commit Graph

39189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
cedabd7242 fix: Future recurring period calculation for additional salary (#29581) 
* fix: Future recurring period calculation for addl salary

* fix: future recurring period calculation

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-21 14:23:31 +05:30
Nabin Hait
c5f257da00 fix: While creating Payment Request from other forms, open a new Payment Request form without saving (#30228) 2022-03-21 14:22:10 +05:30
Nabin Hait
9abd22b408 fix: Payment Request Amount calculation in case of multicurrency (#30254) 2022-03-21 14:20:15 +05:30
mergify[bot]
71d6209a29 fix: disable deferred naming on SLE/GLE if hash method is used. (#30286) (#30315) 
* fix: dont rename GLE/SLE that dont have naming series

* test: tests for deferred naming of ledgers

(cherry picked from commit c2aad115c1)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-21 12:29:21 +05:30
Deepesh Garg
621db33591 Merge pull request #30321 from frappe/mergify/bp/version-13-hotfix/pr-30317 
fix: P&L account validation on cancellation (backport #30317)
 2022-03-21 12:05:41 +05:30
Deepesh Garg
4337b86349 Merge pull request #30318 from frappe/mergify/bp/version-13-hotfix/pr-30304 
fix: Add permission for KSA VAT documents (backport #30304)
 2022-03-21 12:05:15 +05:30
Saqib Ansari
10f06d2e50 Merge pull request #30320 from frappe/mergify/bp/version-13-hotfix/pr-30287 
fix: custom cash flow mapper doesn't show any data (backport #30287)
 2022-03-21 11:40:06 +05:30
Deepesh Garg
1b5e936d27 fix: P&L account validation on cancellation 
(cherry picked from commit 2ff6790283)
 2022-03-21 05:15:39 +00:00
Saqib Ansari
8f6333cd40 refactor: convert raw sql to frappe.qb 
(cherry picked from commit 00bfee97c7)
 2022-03-21 05:03:19 +00:00
Saqib Ansari
4dd6a99b69 fix: custom cash flow mapper doesn't show any data 
(cherry picked from commit 119273e633)
 2022-03-21 05:03:19 +00:00
Deepesh Garg
da09b64174 fix: Conflicts 2022-03-21 10:28:58 +05:30
Deepesh Garg
75458f90b5 fix: Add permission for KSA Vat documents 
(cherry picked from commit 972d06555a)

# Conflicts:
#	erpnext/patches.txt
 2022-03-21 04:49:05 +00:00
Syed Mujeer Hashmi
dc8674fe0d fix: Allow draft PE, PA to link to Vital Signs (#29934) 
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Chillar Anand <chillar@avilpage.com>
Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
 2022-03-21 08:42:28 +05:30
mergify[bot]
3636e596d3 refactor: remove redundant if-statement (#30311) (#30316) 
(cherry picked from commit 0a015b7f70)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2022-03-20 20:24:40 +05:30
mergify[bot]
7bcad01953 fix(UX): misc serial no selector + warehouse.py refactor (backport #30309) (#30310) 
* fix: set current qty as default qty for stock entry

(cherry picked from commit f4c213379e)

* fix: filter serial nos by selected batch number

(cherry picked from commit 5ec27c9055)

* fix: skip already selected serials in sr selector

(cherry picked from commit 0a533d6ccc)

* fix: sort serial nos before sending

(cherry picked from commit 4f8bb91eae)

* test: auto serial fetching

(cherry picked from commit b9eec331e3)

* refactor: batch no filter handling

(cherry picked from commit a585dff6fd)

# Conflicts:
#	erpnext/stock/doctype/serial_no/serial_no.py

* refactor: Use QB for serial fetching query

(cherry picked from commit 4b695915f4)

# Conflicts:
#	erpnext/stock/doctype/serial_no/serial_no.py

* refactor(warehouse): raw query to ORM

(cherry picked from commit 953afda01b)

* test: warehouse conversion and treeview test

(cherry picked from commit 684d9d66d1)

* perf: Single query to delete bins instead of `N`

(cherry picked from commit 4859574233)

* chore: resolve conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-20 19:25:10 +05:30
Devarsh Bhatt
cca9668309 fix: Allow on Submit for Material Request Item Required Date (#30174) 
* fix: Allow on Submit for Material Request Item Required Date

* chore: whitespace

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2022-03-19 13:02:21 +05:30
mergify[bot]
3d35c69a2d fix: respect db multi_tenancy while fetching precision (#30301) (#30302) 
[skip ci]

(cherry picked from commit 5a9bf9ffd6)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-18 17:32:01 +05:30
Deepesh Garg
88b2447297 Merge pull request #30296 from frappe/mergify/bp/version-13-hotfix/pr-30266 
fix: Validate income/expense account in sales and purchase invoice (backport #30266)
 2022-03-17 18:55:21 +05:30
Deepesh Garg
2cf19aa19d fix: Test case 
(cherry picked from commit 4237e5d928)
 2022-03-17 13:03:20 +00:00
Deepesh Garg
935d2e3d64 fix: Validate income/expense account in sales and purchase invoice 
(cherry picked from commit 06936cf1c0)
 2022-03-17 13:03:20 +00:00
mergify[bot]
face53ae8e feat: Create single PL/DN from several SO. (backport #30238) (#30289) 
* feat: Create single PL/DN from several SO. New PR from latest develop to avoid rebase

(cherry picked from commit 61eb9b6c68)

* to enable selection of SO irrespective of customer,removed validation for customer

(cherry picked from commit 466df6bdb7)

* fixed spacings

(cherry picked from commit f33a725a9e)

* added new field - Picked Qty, in Sales Order Item

(cherry picked from commit a68213d82e)

* Added new field in SO - % Picked

(cherry picked from commit 9f7fee7a4f)

* removed semicolon for break statement

(cherry picked from commit e970616b51)

* as per review comments - changed for loop

(cherry picked from commit 0211f27e83)

* corrected spacing

(cherry picked from commit a12895ec03)

Co-authored-by: Krithi Ramani <krithi.ramani@gmail.com>
 2022-03-17 18:17:16 +05:30
Deepesh Garg
e60145e10a Merge pull request #30295 from frappe/mergify/bp/version-13-hotfix/pr-30261 
fix: Error in bank reconciliation statement (backport #30261)
 2022-03-17 18:11:04 +05:30
Deepesh Garg
aa1732a212 fix: Error in bank reco statement 
(cherry picked from commit fbcb413d96)
 2022-03-17 12:21:03 +00:00
Deepesh Garg
65d0189f71 Merge pull request #30284 from deepeshgarg007/dimension_wise_balance_report 
fix: Clean and fixes in Dimension-wise Accounts Balance Report
 2022-03-17 17:27:01 +05:30
mergify[bot]
3b1033c315 test: fix holiday list creation causing flaky tests (backport #30260) (#30288) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-17 15:39:02 +05:30
Deepesh Garg
cab69fe1f2 fix: Remove comments 2022-03-17 12:57:12 +05:30
Deepesh Garg
08a06ce5c6 fix: Clean and fixes in Dimension-wise Accounts Balance Report 2022-03-17 12:56:43 +05:30
Rucha Mahabal
15413cf835 fix: Non Profit fixes (#30280) 2022-03-17 12:52:02 +05:30
mergify[bot]
0becc1e231 refactor: call repost directly during tests (#30277) (#30279) 
enqueue(now=frappe.flags.in_test) is always true in test, this change avoids
confusion.

(cherry picked from commit 76187d175f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-16 23:01:38 +05:30
mergify[bot]
64b646050e refactor: removed unrequired code and test for standalone delivery note serial return (#30276) (#30278) 
(cherry picked from commit 2a0ca7c91a)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2022-03-16 19:51:22 +05:30
Ankush Menat
f3af5dd384 test: packed item return scenarios 
(cherry picked from commit b46d6e3c05)
 2022-03-16 14:02:17 +05:30
Ankush Menat
cde3c685ee revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607)" 
This reverts commit 20216fa9f1.

(cherry picked from commit b781e8b7d1)
 2022-03-16 14:02:17 +05:30
Saqib Ansari
b8fc06f633 Merge pull request #30270 from frappe/mergify/bp/version-13-hotfix/pr-30269 
fix: Do not update ignore pricing rule check implicitly (backport #30269)
 2022-03-16 13:01:54 +05:30
Saqib Ansari
461506a7ff Merge pull request #30267 from frappe/mergify/bp/version-13-hotfix/pr-30265 
feat: add German translations (backport #30265)
 2022-03-16 13:01:32 +05:30
Deepesh Garg
f27fd605f5 fix: Do not update ignore prcing rule check implicitly 
(cherry picked from commit 1f79b47a17)
 2022-03-16 07:03:16 +00:00
Saqib Ansari
3bcef50b15 Merge pull request #30262 from frappe/mergify/bp/version-13-hotfix/pr-30244 
fix: incorrect debit credit amount in presentation currency (backport #30244)
 2022-03-16 10:55:04 +05:30
Samuel Danieli
29fa902b33 feat: add German translations 
(cherry picked from commit bbe5739547)
 2022-03-16 05:24:45 +00:00
Saqib Ansari
510668f78a test: foreign_account_balance_after_exchange_rate_revaluation 
(cherry picked from commit 12d99ed69a)
 2022-03-15 13:10:27 +00:00
Saqib Ansari
8663a776dd fix: incorrect debit credit amount in presentation currency 
(cherry picked from commit 83a5fae591)
 2022-03-15 13:10:26 +00:00
Marica
69bf64e238 Merge pull request #30259 from frappe/mergify/bp/version-13-hotfix/pr-30258 
fix: Sub-Category Routing in Item Group Page Listing pills (backport #30258)
 2022-03-15 17:47:40 +05:30
marination
a56fd20ab4 fix: Sub-Categpry Routing in Item Group Page Listing pills 
- Use absolute route even 3-4 sub-category levels down
- Remove scroll from category pills due to accessibility issues
- Arrange sub-category pills alphabetically

(cherry picked from commit 8264d6b0bc)
 2022-03-15 12:00:33 +00:00
mergify[bot]
2c5e76d542 fix(pos): loyalty points in case of returned pos invoice (#30257) 2022-03-15 17:28:21 +05:30
rohitwaghchaure
5d458d6eb7 Merge pull request #30243 from akurungadam/jc-fix 
fix: Job Card sub operations status and list view
 2022-03-15 15:20:56 +05:30
mergify[bot]
6ef08545b6 fix: Leave Policy Assignment creation patch (backport #30215) (#30252) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-15 12:24:08 +05:30
mergify[bot]
0133b2a145 fix: salary slip amount rounding errors (backport #30248) (#30251) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-15 11:41:38 +05:30
Deepesh Garg
f48caf4944 Merge pull request #30246 from frappe/mergify/bp/version-13-hotfix/pr-30230 
fix: KSA E-Invoice QR Code showing wrong VAT amount (backport #30230)
 2022-03-15 09:49:55 +05:30
Deepesh Garg
5e4ab346c7 Merge pull request #30245 from frappe/mergify/bp/version-13-hotfix/pr-30206 
fix: Do not update ignore prcing rule check implicitly (backport #30206)
 2022-03-15 09:49:35 +05:30
Deepesh Garg
ec92551f7c Update erpnext/regional/saudi_arabia/utils.py 
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
(cherry picked from commit e33d4713cd)
 2022-03-14 16:17:46 +00:00
Deepesh Garg
c5de90320f fix: Itemised tax rate updation 
(cherry picked from commit be56efad26)
 2022-03-14 16:17:46 +00:00
Deepesh Garg
fc298770e9 fix: Linting Issue 
(cherry picked from commit 3cc2e53b08)
 2022-03-14 16:17:46 +00:00