Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,614 Commits 3 Branches 0 Tags
Commit Graph

9564 Commits

Author SHA1 Message Date
ruthra kumar
baa83ece21 refactor: add total row if only one party is being filtered 
(cherry picked from commit b1dfa2537bee220e8bb915b8152e4aa3014befa9)
 2024-02-19 02:57:35 +00:00
Raffael Meyer
0b7a95351a
Merge pull request #39907 from frappe/mergify/bp/version-15-hotfix/pr-39857 
fix: fetch company terms (backport #39857)
 2024-02-17 01:11:09 +01:00
barredterra
bf5d2f5fe4 fix(Bank Transaction): precision for (un)allocated_amount 
(cherry picked from commit 8a702a633883408cd41572c19dd157f8211ea905)
 2024-02-15 19:05:21 +00:00
kunhi
a56d5b805c fix: update_dimension is required and not need party account method 
(cherry picked from commit e6949d71f628a15ea87ee143d09dce47b66f0e02)
 2024-02-14 14:54:55 +00:00
kunhi
bef38f74fe fix: no need call for company method in sales invoice js 
(cherry picked from commit e3bd8d10b0a99fca326c7252063ef11b3665d3cf)
 2024-02-14 14:54:54 +00:00
kunhi
14fe0af887 fix: fetch company terms 
(cherry picked from commit d97b6d38ef732205f8de17dcb01d90ea1f5120fa)
 2024-02-14 14:54:54 +00:00
mergify[bot]
4daee6d9c7
fix: Brazilian COA for demo data creation (#39839) 
fix: Brazilian COA for demo data creation (#39839)

fix: Brazilian COA
(cherry picked from commit 4b1c851da17c2b9dcabb60194fbad6974fc60716)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-02-11 18:12:18 +05:30
ruthra kumar
a805796c0a refactor(test): assert Invoice status as well 
(cherry picked from commit 33efe0d12d85484e551dc9ebebf8840d427ecc67)
 2024-02-07 15:00:47 +00:00
ruthra kumar
0bff065f0b test: Invoice status on Cr/Dr note cancellation 
(cherry picked from commit 31a8c3bdc45f0e32a51e43260db8484e5f17aa75)
 2024-02-07 15:00:46 +00:00
Gursheen Anand
3c6114ab72 fix: remove duplicates from tax category map 2024-02-07 18:27:08 +05:30
rohitwaghchaure
faf79f4d2a
Merge pull request #39761 from frappe/mergify/bp/version-15-hotfix/pr-39718 
fix: use old serial / batch fields to make serial batch bundle (backport #39718)
 2024-02-06 16:26:33 +05:30
Rohit Waghchaure
282c19e7e1 fix: use old serial / batch fields to make serial batch bundle 
(cherry picked from commit 9fafc83632c4e5c73186bda038b892b7a43d16b8)
 2024-02-06 10:18:05 +00:00
ruthra kumar
4235e08668 refactor(test): make use of test fixtures in Payment Order 
(cherry picked from commit 322cdbaccf0b8697000aae4e56efa659a34fa8e5)
 2024-02-06 04:00:23 +00:00
ruthra kumar
949f4c3790 refactor(test): generate uniq GL acc and Bank acc for each test case 
(cherry picked from commit a9a2ec81de73cde0995c837e12cd5dc79a584841)
 2024-02-06 04:00:23 +00:00
ruthra kumar
11d4382e19 refactor: ensure unique accounts for each Bank Account's 
(cherry picked from commit 2caa2d677c09793f7097c3e76ebb4180a3f2a336)
 2024-02-06 04:00:23 +00:00
Deepesh Garg
451c288011 perf: Move dimension validation out of GL Entry doctype (#39730) 
(cherry picked from commit b834ed10d6b6faa1f76e1343ca8b347ca393b7dd)
 2024-02-05 15:31:36 +00:00
mergify[bot]
1822325f34
feat: Period-wise closing entries for TB (#39712) 
feat: Period-wise closing entries for TB (#39712)

(cherry picked from commit 6e6c818084ee3fbbb2d44a58acb5c78c9f5b61ac)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-02-05 14:34:33 +05:30
mergify[bot]
4ee8cf3907
feat: reference for POS SI payments (#39523) 
feat: reference for POS SI payments (#39523)

* feat: reference field in SI payment

* fix: document link for pos si

* refactor: pos invoice queries

(cherry picked from commit d9a72c1e614a8d103ecb8eb13db26cff18981a52)

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2024-02-04 17:54:56 +05:30
mergify[bot]
f31070741a
fix: Pricing rule application/removal on qty change (#39084) 
fix: Pricing rule application/removal on qty change

(cherry picked from commit f52d7c7665d4097b19a8bb6c5f99acf38cd8adcf)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-02-03 08:49:50 +05:30
mergify[bot]
e76f59803c
fix: Percentage handling in queries (#39692) 
fix: Percentage handling in queries (#39692)

* fix: Percentage handling in queries

* test: Account with percent sign

* chore: add test records

(cherry picked from commit 6d87cfeb8d87b6faed8a7238cd8cf97df2acd99d)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-02-02 20:27:36 +05:30
ruthra kumar
4f994cf26c
Merge pull request #39666 from frappe/mergify/bp/version-15-hotfix/pr-39655 
fix: correctly calculate diff amount for included taxes (backport #39655)
 2024-02-01 19:44:57 +05:30
ruthra kumar
e2d041f51c refactor: use pop up to inform of possible data issue 
and leave a comment in communcation trail as well

(cherry picked from commit 78483e2ee6fdef9e36b63408f6796f0a1e78dac1)
 2024-02-01 11:43:19 +00:00
ruthra kumar
72c95d31d1 refactor(test): use party with USD billing currency 
(cherry picked from commit beff566c8267104b97f7e4b80c36715e4eb91832)
 2024-02-01 10:41:39 +00:00
ruthra kumar
1ee15f65a8 test: ignore_err filter out in General Ledger 
(cherry picked from commit affca3a519c626a2c3273a82f00ee1579853b0e1)
 2024-02-01 10:41:39 +00:00
ruthra kumar
0a235584ad refactor: move ignore ERR filters from SOA to General Ledger 
(cherry picked from commit c077eda64e8b57011c42fbf7b4fe41af9ab2bc2f)
 2024-02-01 10:41:39 +00:00
Gursheen Kaur Anand
7f4cd3cd15 fix: correctly calculate diff amount for included taxes (#39655) 
(cherry picked from commit 772f540bef28117c008512ead6558db801d395cd)
 2024-02-01 04:44:40 +00:00
mergify[bot]
aebb0c7979
chore: cleanup doctype descriptions (backport #39637) (#39652) 
* chore: cleanup doctype descriptions (#39637)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 6b8f046fb4cfef201464976f5b4c95dc79f96731)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/fiscal_year/fiscal_year.json
#	erpnext/stock/doctype/item_price/item_price.json
#	erpnext/stock/doctype/stock_settings/stock_settings.json

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-01-31 12:38:37 +05:30
ruthra kumar
5c9c3bee70 test: debit note account mismatch 
(cherry picked from commit bdca718103a98eba64e69715eaf628dfd9377d5e)
 2024-01-30 05:31:53 +00:00
ruthra kumar
c9ea83591f test: account mismatch validation 
(cherry picked from commit 8bdc76073367d4a912524f16bf098d94340f50c5)
 2024-01-30 05:31:53 +00:00
Gursheen Anand
da33079f12 fix: return doc obj after submit 
(cherry picked from commit fc677811b7d896879d9c2537b0527635a8ff3855)
 2024-01-29 06:10:03 +00:00
Gursheen Anand
07bcc24e35 fix: enqueue JV submission when more than 100 accounts 
(cherry picked from commit 53b44ccf2907ee15ca4dd6291400272e7cc2acf3)
 2024-01-29 06:10:02 +00:00
mergify[bot]
a118417645
refactor: provision to filter on dimensions in reconciliation tool (#39054) 
* refactor: dimensions section in allocation table in reconciliation

(cherry picked from commit 1cde804c773de41520a6148e7d99ab0c23c39ae1)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

* refactor: update dimension doctypes in hooks

(cherry picked from commit cfb3d872673844f04f5c9dd3f7d7f56288e5dd22)

* refactor: dimensions filter section in payment reconciliation

(cherry picked from commit 20e0acc20a218029d7101a1ba6ff3c1ae03fac02)

* refactor: column break in dimension section

(cherry picked from commit 20576e0f47ba3c4937121bfab1e0d8d395a590ce)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

* refactor: handle dimension filters

(cherry picked from commit c1fe4bcc64775507a3bd8e02b61274d8dc2d6447)

* refactor: pass dimension filters to query

(cherry picked from commit ff60ec85b85d5548886e247b72cf1262587feba3)

* refactor: set query filters for dimensions

(cherry picked from commit ad8475cb8b24d40b04f86903feee08ecac6aa1f1)

* refactor: pass dimension details to query

(cherry picked from commit 5dc22e1811bb1841bb8c790cc3a1e1315cef6074)

* refactor: replace sql with query builder for Jourals query

(cherry picked from commit 9c5a79209eb014c90aac46a5dd5ed0d9b7cb8f87)

* refactor: partial change on outstanding invoice popup

(cherry picked from commit 2154502955166243e354897d7dcb22d1987c4693)

* fix: typo's and parameter changes

(cherry picked from commit 0ec17590ae062fbda0c14a2806ec1ac07c638593)

* refactor: Credit Note and its Exc gain/loss JE inherits dimensions

(cherry picked from commit ab939cc6e8ab3669f1e9b0f007e9459be180ac32)

* refactor: apply dimension filters on cr/dr notes

(cherry picked from commit 188ff8cde794bb1ef1043f0e47469d65944aac1e)

* chore: test dimension filter output

(cherry picked from commit e3c44231abbbe389a1f815ab77f2d6ff0c614e1b)

* test: dimension inheritance for cr note reconciliation

(cherry picked from commit ba5a7c8cd8ee6fc09b0d81ffbe8b364e584f1f1b)

* refactor: pass dimension values to Gain/Loss journal

(cherry picked from commit c44eb432a59fb3ffb3748e47356068499f1129b1)

# Conflicts:
#	erpnext/accounts/utils.py

* test: dimension inheritance in PE reconciliation

(cherry picked from commit 6148fb024b7157d637aa2308e7c856969858468d)

* refactor: pass dimensions on advance allocation

(cherry picked from commit cbd443a78afbc7c58055881e534a8aa56ca4bea6)

* test: dimension inheritance on adv allocation

(cherry picked from commit fcf4687c523202436234814af3da4c4d84f5eba9)

* refactor: dynamic dimension filters in pop up

(cherry picked from commit f8bbb0619cbbbaace8f54a9f8758c3962ebe4725)

* refactor: update dimensions, only if provided

(cherry picked from commit ec0f17ca8bd810e41ae73f5a45f304ba38c63d0a)

* refactor: handle dynamic dimension in order query

(cherry picked from commit 7c2cb70387d7dbb7f976d28919ce21f25a0b6acd)

* chore: resolve conflicts

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2024-01-28 13:50:08 +05:30
mergify[bot]
a83f3106f3
feat: New financial views - Growth and margin views for P&L and balance sheet (#39588) 
feat: New financial views - Growth and margin views for P&L and balance sheet (#39588)
 2024-01-28 13:48:55 +05:30
ruthra kumar
10488520e7 test: future payment with foreign currency 
(cherry picked from commit 7b37389115cd10aac154c292e7b34fcefd4d7ba2)
 2024-01-27 07:23:17 +00:00
ruthra kumar
9e15a3c981 refactor: do currency conversion on future amount columns 
(cherry picked from commit 0de4197c886f6dfa500c0b3f1869c13cc3807aaf)
 2024-01-27 07:23:16 +00:00
Deepesh Garg
ab99414242
Merge pull request #39577 from frappe/mergify/bp/version-15-hotfix/pr-39511 
refactor(Sales Invoice): set account and sum for payments (#39511)
 2024-01-26 10:04:23 +05:30
barredterra
4fc3a264f9 refactor(Sales Invoice): set account for mode of payment 
(cherry picked from commit 3815f07c33d9c84230304d53a735d8f580f3288e)
 2024-01-26 04:15:14 +00:00
Deepesh Garg
5df2f5d523 feat: In words in payment entry 
(cherry picked from commit b21da472f6e106ea7b2430c285ce24400a0208dd)
 2024-01-26 04:01:45 +00:00
Dany Robert
ed032b3224 chore: avoid explicit escaping for precision 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit a8949174c878499e14228517abe66050f9b9ddb9)
 2024-01-25 07:00:45 +00:00
Dany Robert
8b7900e6a7 chore: change f-string to sql params 
(cherry picked from commit 383a4b132ed5cc3383b035de8c22ba759b1e1241)
 2024-01-25 07:00:45 +00:00
Dany Robert
e0a38207f6 fix: honour currency precision while fetching balance 
(cherry picked from commit bfaa93b0ca641352917be16a50e602a7fe458386)
 2024-01-25 07:00:45 +00:00
Gursheen Anand
e2d85c513c fix: skip liability account for internal transfer 
(cherry picked from commit 236b73565e6889aaa7027929f770918e89bca7fc)
 2024-01-24 05:04:45 +00:00
Gursheen Anand
9a0834987c fix: party field in pdf html 
(cherry picked from commit b2d9380596dd8ca134777148337ef039f10cc2ca)
 2024-01-22 09:51:29 +00:00
Rohit Waghchaure
96e1db80ac fix: added button to make serial / batch from Purchase Invoice 
(cherry picked from commit b4393bc03d68769f57678bb56a09baf7b4ec3dc0)
 2024-01-21 16:53:46 +00:00
David Arnold
b388adcb2e fix: use most reliable section reference per report line 
(cherry picked from commit b5be17c6dfc9ab10e9eb57669f697fbb5576489c)
 2024-01-21 08:14:55 +00:00
Gursheen Kaur Anand
ddb84d9036 Revert "fix(minor): financial statements period end date" 
(cherry picked from commit 73625a2622f29a83c98179c0b5048a29e61ce243)
 2024-01-20 12:29:27 +00:00
mergify[bot]
00a3ee313b
refactor(UX): Accounts workspace cleanup (backport #39232) (#39456) 
* refactor(UX): Accounts workspace cleanup (#39232)

* refactor(UX): Accounts workspace cleanup

* chore: move asset workspace outside accounting

* fix: remove redundant links from parent workspace

* chore: change icons for payable & receivable workspaces

* chore: remove redundant links from subworkspaces

(cherry picked from commit 35067282cfeaf88a1e4251e3725f7557d3b2d356)

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-01-19 12:40:25 +05:30
Gursheen Anand
86f3f62e00 fix: linting issue 
(cherry picked from commit 99b94af49ffd34bccb76b73c2f06187540444a44)
 2024-01-18 10:45:49 +00:00
Gursheen Anand
74613c7fe8 fix: set unallocated amount after base tax 
(cherry picked from commit e9bc63aacf20dd83cb7e15494bb8f2f025491991)
 2024-01-18 10:45:49 +00:00
Nabin Hait
9e33216c24 fix: Asset module tests 
(cherry picked from commit 97f69986ff3c56c032fe32d554b9f162df3f8b33)
 2024-01-17 11:56:41 +00:00