nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,463 Commits 402 Branches 1,700 Tags
d85aef5b2a8dd698c629fb5caa938231bfca2555
Commit Graph

38463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
d85aef5b2a Merge pull request #29188 from frappe/mergify/bp/version-13-hotfix/pr-29176 
fix: Inconsistency in calculating outstanding amount (backport #29176)
 2022-01-07 20:21:02 +05:30
mergify[bot]
822a8ba47a chore: remove framework patch for custom fields (#29117) (#29195) 
* chore: patches were breaking during migration

* fix: rewrote the query in query builder

* chore: removed patch from patches.txt

(cherry picked from commit 25c875e447)

Co-authored-by: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
 2022-01-07 19:04:19 +05:30
Deepesh Garg
14aca20b00 Merge pull request #29194 from frappe/mergify/bp/version-13-hotfix/pr-28994 
fix: cannot create debit note with zero qty (backport #28994)
 2022-01-07 19:03:56 +05:30
Saqib Ansari
ecf341d1b1 fix: cannot save debit note with zero quantity 
(cherry picked from commit 2be5104848)
 2022-01-07 13:06:01 +00:00
Saqib Ansari
4ef9d289e8 fix(sales-invoice): cannot create debit note with zero qty 
(cherry picked from commit 04ea42ce52)
 2022-01-07 13:06:00 +00:00
Deepesh Garg
9b6c2fdfb7 fix: Conflicts 2022-01-07 15:03:55 +05:30
Deepesh Garg
203943ef97 Merge pull request #29186 from frappe/mergify/bp/version-13-hotfix/pr-29169 
fix: GL Entries for loan repayment via Salary (backport #29169)
 2022-01-07 15:02:19 +05:30
Deepesh Garg
b561c18502 fix: Inconsistency in calculating outstanding amount 
(cherry picked from commit 9d3a5c3184)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-01-07 07:59:28 +00:00
Deepesh Garg
a333635ab6 Merge pull request #29135 from deepeshgarg007/gl_balance_ar_ap 
fix: Show GL balance in Accounts Receivable and Payable summary
 2022-01-07 12:59:17 +05:30
Deepesh Garg
892e63575e fix: GL Entries for loan repayment via Salary 
(cherry picked from commit f316aaf41e)
 2022-01-07 07:25:10 +00:00
Syed Mujeer Hashmi
60ddf39e37 chore: Remove the extra 's' in patient age string (#29180) 2022-01-07 09:22:36 +05:30
mergify[bot]
7abe7c752b fix: incorrect serial no valuation report showing cancelled entries (#29172) (#29173) 
(cherry picked from commit 24fc487dd8)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-06 17:05:00 +05:30
Deepesh Garg
d243291e1c Merge pull request #29155 from deepeshgarg007/ksa_vat_currency 
fix: Currency in KSA VAT report
 2022-01-06 16:22:40 +05:30
Deepesh Garg
493af62038 Merge pull request #29170 from frappe/mergify/bp/version-13-hotfix/pr-29125 
fix: cannot create reverse journal entry (backport #29125)
 2022-01-06 14:11:46 +05:30
Saqib Ansari
b82d4b7577 fix: cannot create reverse journal entry 
(cherry picked from commit 3aa1817f7b)
 2022-01-06 08:01:51 +00:00
mergify[bot]
37d2f6fd15 fix: Earned Leave allocation from Leave Policy Assignment (backport #29163) (#29165) 
* fix: Earned Leave allocation from Leave Policy Assignment

* test: Earned Leave Allocation from Leave Policy Assignment

(cherry picked from commit 26247be3b8)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-06 11:44:58 +05:30
mergify[bot]
6cc3c612ee feat: 'Invoice Number' field in Opening Invoice Creation Tool (#29156) 2022-01-05 16:00:00 +05:30
Deepesh Garg
1d87e9d8f6 fix: Currency in KSA VAT report 2022-01-05 15:08:29 +05:30
Chillar Anand
a64efb764b refactor: Add deprecation warning for agriculture domain (#29149) 2022-01-05 11:56:32 +05:30
mergify[bot]
485fa4700f fix(UX): validate setup on clicking Mark Attendance button in Shift Type (backport #29146) (#29148) 
(cherry picked from commit ac816f4fed)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-04 21:52:42 +05:30
Deepesh Garg
e8e93bdf43 Merge pull request #29144 from frappe/mergify/bp/version-13-hotfix/pr-29142 
fix: map Accounting Dimensions for Bank Entry against Payroll Entry (backport #29142)
 2022-01-04 21:01:54 +05:30
Rucha Mahabal
5900968bd9 fix: map Accounting Dimensions for Bank Entry against Payroll Entry 
(cherry picked from commit 5eeb94db31)
 2022-01-04 14:58:07 +00:00
mergify[bot]
fa735a0539 fix: Modifying Opening invoice creation tool timestamp (#29127) (#29143) 2022-01-04 20:04:47 +05:30
mergify[bot]
b808ef1625 feat: allow user to change the parent company (#29138) 2022-01-04 19:29:39 +05:30
mergify[bot]
06c0313a26 fix: POS items added to cart despite low qty (#29141) 2022-01-04 19:20:19 +05:30
mergify[bot]
f4670a86a0 fix: minor issues (#29140) 2022-01-04 19:16:52 +05:30
mergify[bot]
2838dc537e fix: update idx after updating items in so/po (#29134) (#29136) 
(cherry picked from commit 733c9defdf)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-04 19:05:38 +05:30
Deepesh Garg
1d270dca05 fix: Show GL balance in Accounts Receivable and payable summary 2022-01-04 17:53:08 +05:30
mergify[bot]
fe1a66cf54 fix: future recurring period calculation (backport #29083) (#29118) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 11cfa16158)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2022-01-04 11:58:41 +05:30
Saqib Ansari
e2b2be82e0 Merge pull request #29112 from frappe/mergify/bp/version-13-hotfix/pr-28907 
fix: Validation in POS for item batch no stock quantity (backport #28907)
 2022-01-03 19:35:43 +05:30
Subin Tom
fe3ebafea4 fix: linters fix 2022-01-03 19:10:03 +05:30
Subin Tom
860a0f4696 fix: linters fix 2022-01-03 19:06:40 +05:30
Subin Tom
a34ded79f3 fix: importing Sum() for qb for test fix 2022-01-03 19:01:57 +05:30
Saqib Ansari
d1739eb59a Merge pull request #29113 from frappe/mergify/bp/version-13-hotfix/pr-28160 
refactor: `update_invoice_status` with query builder (backport #28160)
 2022-01-03 18:32:53 +05:30
Pruthvi Patel
84f3f34821 Update erpnext/controllers/accounts_controller.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
(cherry picked from commit 16a90d3e60)
 2022-01-03 12:30:23 +00:00
Pruthvi Patel
50628d416c test: update_invoice_status 
(cherry picked from commit 4d48ca4228)
 2022-01-03 12:30:23 +00:00
Pruthvi Patel
e648a2ccde fix: consider Discounted status 
(cherry picked from commit 0799f378b4)
 2022-01-03 12:30:23 +00:00
Pruthvi Patel
1efce21ba4 refactor: update_invoice_status with query builder 
(cherry picked from commit 6c96ed4e11)
 2022-01-03 12:30:22 +00:00
Subin Tom
110a1e5557 fix: using get_batch_qty method to get available_qty 
(cherry picked from commit 7385497219)
 2022-01-03 12:27:40 +00:00
Subin Tom
80f92ee547 fix: added Sum() in query 
(cherry picked from commit 267da48889)
 2022-01-03 12:27:39 +00:00
Saqib
0be144c193 chore: remove extra whitespace 
(cherry picked from commit c3a9ca09d1)
 2022-01-03 12:27:39 +00:00
Saqib
bf92681fff fix: typo 
(cherry picked from commit 9c8f523537)
 2022-01-03 12:27:38 +00:00
Subin Tom
3947d859c5 fix: replaced sql query with frappe.qb 
(cherry picked from commit 68beee2a00)
 2022-01-03 12:27:38 +00:00
Subin Tom
0222cd198d fix: Validation in POS for item batch no stock quantity 
(cherry picked from commit 9f235526d4)
 2022-01-03 12:27:37 +00:00
rohitwaghchaure
fca8f17b40 Merge pull request #29104 from frappe/mergify/bp/version-13-hotfix/pr-29103 
fix: incorrect posting time fetching incorrect qty (backport #29103)
 2022-01-03 14:53:39 +05:30
rohitwaghchaure
fcbcb08fcd fix: incorrect posting time fetching incorrect qty (#29103) 
(cherry picked from commit f02e6b4631)
 2022-01-03 08:58:56 +00:00
mergify[bot]
674a923669 feat: Add currency in import download statement (#29093) 2022-01-03 13:42:25 +05:30
mergify[bot]
4fdaf51599 fix: filter query in bank reconciliation tool (#29099) 2022-01-03 11:41:23 +05:30
Deepesh Garg
39f7a9de47 Merge pull request #29092 from deepeshgarg007/taxes_category_tax_fetch 
fix(India): Tax and Charges template not getting fetched based on tax category assigned
 2022-01-02 19:06:00 +05:30
Deepesh Garg
342658ea70 fix: Test Case 2022-01-02 18:39:59 +05:30