nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 15:47:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,611 Commits 619 Branches 1,804 Tags
162ecdca750efe2196d47610ea0f370598d4edcb
Commit Graph

8087 Commits

Author SHA1 Message Date
ruthra kumar
23a0a5337e fix: key error on p/l and balance sheet reports on foreign currency 
(cherry picked from commit a6794c3606)
 2022-12-06 16:55:03 +05:30
ruthra kumar
e18d0eca3c fix: replace sql code with fields list in get_cached_value 
(cherry picked from commit 19db7e2989)
 2022-12-06 16:55:00 +05:30
ruthra kumar
08bca7d252 fix: key error while filtering on date range and different currency 
(cherry picked from commit 9b8d6fe411)
 2022-12-06 10:14:01 +00:00
Deepesh Garg
030765618b fix: Allow item rate udpates for non-stock invoices 
(cherry picked from commit ef9d126254)
 2022-12-06 03:43:16 +00:00
ruthra kumar
653cb9fc3b fix: data import mandatory account_head, charge_type 
(cherry picked from commit 3814db02eb)
 2022-12-05 11:27:34 +00:00
Deepesh Garg
f87c3c6157 fix: Tax withholding net total for PI in reports 
(cherry picked from commit 3eb1ed19a1)
 2022-11-29 13:21:16 +00:00
Deepesh Garg
bf833c4f09 Merge pull request #33151 from frappe/mergify/bp/version-14-hotfix/pr-33138 
fix(ux): Action buttons in Bank Reconciliation (backport #33138)
 2022-11-29 11:06:48 +05:30
Deepesh Garg
5848147a92 Merge pull request #33155 from frappe/mergify/bp/version-14-hotfix/pr-33098 
fix(pos): warehouse selection (backport #33098)
 2022-11-29 11:06:21 +05:30
Sabu Siyad
c379baf7a2 feat(pos): invoice: fitler warehouse by company 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 4ad0e2ed7e)
 2022-11-29 04:46:19 +00:00
Sabu Siyad
c03ec80d1a fix(pos): warehouse should be in company 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 95a620a30d)
 2022-11-29 04:46:19 +00:00
Sabu Siyad
c1ae5b0af5 fix(pos): filter on customer groups 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit cc63415887)
 2022-11-29 04:26:25 +00:00
Deepesh Garg
93b8cc3042 fix(ux): Action buttons in Bank Reconciliation 
(cherry picked from commit 6ebe8ad60d)
 2022-11-29 03:54:02 +00:00
Deepesh Garg
6c3fbf03f9 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33022 2022-11-28 23:06:23 +05:30
Deepesh Garg
6e3ad109d2 chore: Supplier invoice no field description 
(cherry picked from commit 4f2ece34df)
 2022-11-28 07:36:10 +00:00
barredterra
21deb02d81 chore: resolve merge conflicts 2022-11-27 16:30:19 +01:00
barredterra
88346b17e9 feat: add incoterm to purchasing transactions 
(cherry picked from commit 77105306f2)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 2022-11-27 15:24:18 +00:00
barredterra
fcfe0cb9e9 feat: add incoterm to sales transactions 
(cherry picked from commit 029f22c549)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 2022-11-27 15:24:17 +00:00
Deepesh Garg
c11a31b390 fix: Debit and Credit not equal while submitting PI containing asset item 
(cherry picked from commit dc8d635120)
 2022-11-24 09:14:06 +00:00
Deepesh Garg
5d7c4c182a Merge pull request #33085 from frappe/mergify/bp/version-14-hotfix/pr-33062 
fix: create rounding gl entry for PCV during gle post processing (backport #33062)
 2022-11-23 11:50:26 +05:30
Nabin Hait
fd4bcd9f7f fix: create rounding gl entry for PCV during gle post processing 
(cherry picked from commit 022d8d5d79)
 2022-11-23 05:07:29 +00:00
niralisatapara
2bd8bd224b feat: item wise tds calculation for purchase order. 
(cherry picked from commit 46e8cdf31a)
 2022-11-23 04:22:45 +00:00
Deepesh Garg
084d81025c Merge pull request #33078 from frappe/mergify/bp/version-14-hotfix/pr-33072 
chore: Rearrange supplier invoice section in Purchase Invoice (backport #33072)
 2022-11-22 20:41:10 +05:30
Deepesh Garg
995ad90b5a Merge pull request #33079 from frappe/mergify/bp/version-14-hotfix/pr-33068 
fix: Don't show payment button for invoices on hold (backport #33068)
 2022-11-22 20:40:53 +05:30
Deepesh Garg
387665d221 fix: Remove unnecessary filters from Journal Entry 
(cherry picked from commit cd88a53533)
 2022-11-22 14:46:02 +00:00
Deepesh Garg
7487acdeb6 fix: Don't show payment button for invoices on hold 
(cherry picked from commit 1b9e83251f)
 2022-11-22 14:45:39 +00:00
Deepesh Garg
54317b56ea chore: Rearrange supplier invoice section in Purchase Invoice 
(cherry picked from commit e96be712b8)
 2022-11-22 14:45:05 +00:00
Deepesh Garg
da2dfcc10b fix: Viewing account ledger from party master 
(cherry picked from commit 15e74c5d7b)
 2022-11-21 05:45:08 +00:00
Deepesh Garg
5456fec4d5 Merge pull request #33042 from frappe/mergify/bp/version-14-hotfix/pr-33032 
fix: Accounting Dimension filtering for Sales and Purchase Report (backport #33032)
 2022-11-19 18:52:45 +05:30
ruthra kumar
f2fde8327d fix: always send account currency in response 
(cherry picked from commit 5caaccc94b)
 2022-11-19 13:00:42 +00:00
ruthra kumar
a26470a65f fix: incorrect currency in Exchange rate revaluation 
(cherry picked from commit 68b04e2577)
 2022-11-19 13:00:42 +00:00
Deepesh Garg
b78220957b fix: Accounting Dimension filtering for Sales and Purchase Report 
(cherry picked from commit 8b394afaa9)
 2022-11-19 12:50:39 +00:00
gavin
9e8a8356e9 fix(realtime): Restrict updates to only last modified or current user (#33034) 
(cherry picked from commit dd2493a541)
 2022-11-18 11:48:47 +00:00
Deepesh Garg
f2283546b5 Merge pull request #33031 from frappe/mergify/bp/version-14-hotfix/pr-33014 
fix: Bulk payment generation against invoices (backport #33014)
 2022-11-18 16:51:54 +05:30
Deepesh Garg
57b00e3b16 fix: Bulk payment generation against invoices 
(cherry picked from commit 2dfe849c7d)
 2022-11-18 09:41:01 +00:00
Vishal
eaf09503a9 fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt 
(cherry picked from commit 71412f6877)
 2022-11-18 07:46:47 +00:00
Deepesh Garg
6aada76297 fix: Opening journal entry templates 
(cherry picked from commit 33b61aef5a)
 2022-11-16 15:13:08 +00:00
Deepesh Garg
d7340f54cf Merge pull request #32969 from frappe/mergify/bp/version-14-hotfix/pr-32953 
chore(payment_entry): Remove dead validations (backport #32953)
 2022-11-15 16:32:54 +05:30
Gavin D'souza
30d1491257 chore(payment_entry): Remove dead validations 
(cherry picked from commit e1ecc9a819)
 2022-11-15 08:34:35 +00:00
Deepesh Garg
ca96c24c8d chore: Resolve conflicts 2022-11-15 13:57:44 +05:30
Deepesh Garg
07badbc0f2 fix: Write Off section visibility for non POS Invoices 
(cherry picked from commit 9f5d613c78)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 2022-11-15 07:31:58 +00:00
Deepesh Garg
eb4f8e4bd8 fix: Label for applicable dimension table 
(cherry picked from commit 8c13f70fc5)
 2022-11-15 03:55:20 +00:00
Sagar Vora
a30579393e fix: check type for reference name 
(cherry picked from commit b06345af46)
 2022-11-13 15:12:10 +00:00
Deepesh Garg
3614584a2f chore: Remove qb doc reference 
(cherry picked from commit 4b9921782b)
 2022-11-13 15:12:10 +00:00
Deepesh Garg
8a01da3b9e chore: Remove raw SQL query 
(cherry picked from commit 42a59d5c17)
 2022-11-13 15:12:10 +00:00
ruthra kumar
a24f6a5ac7 test: buying amount of invoices 
1. Invoice with unset `update_stock`, with and without Delivery Notes

(cherry picked from commit 2c8b0b17a7)
 2022-11-13 13:46:08 +00:00
ruthra kumar
2d8f00afad fix: GP incorrect buying amount if no upd on SI and Delivery Note 
(cherry picked from commit e4d16c31da)
 2022-11-13 13:46:08 +00:00
Deepesh Garg
de68674933 Merge pull request #32927 from frappe/mergify/bp/version-14-hotfix/pr-32880 
fix: add translate function to valitate company msg in chart of accounts importer (backport #32880)
 2022-11-11 14:21:53 +05:30
Rohit Waghchaure
0d5b7269d4 fix: Purchase Receipt timeout error 
(cherry picked from commit 4082149f0e)
 2022-11-10 17:13:35 +00:00
Ernesto Ruiz
8de4430662 fix: add translate function to valitate company msg in chart of accounts importer 
(cherry picked from commit 637c08d189)
 2022-11-10 14:38:22 +00:00
Deepesh Garg
f2a1596369 Merge pull request #32909 from frappe/mergify/bp/version-14-hotfix/pr-32742 
feat: Tool to repost PLE manually (backport #32742)
 2022-11-10 15:41:22 +05:30