7064 Commits

Author SHA1 Message Date
Deepesh Garg
88ff945e40
Merge pull request #39562 from GursheenK/JV-timeout-issue
fix: enqueue JV submission when > 100 accounts
2024-01-28 10:30:25 +05:30
Gursheen Anand
fc677811b7 fix: return doc obj after submit 2024-01-26 20:03:21 +05:30
Deepesh Garg
99b839d2b6 chore: failing ci tests 2024-01-26 10:46:44 +05:30
Deepesh Garg
30cc65d2b7
Merge pull request #39511 from barredterra/set-account-for-mode-of-payments
refactor(Sales Invoice): set account and sum for payments
2024-01-26 09:44:11 +05:30
Deepesh Garg
d491036f2d
Merge pull request #39108 from deepeshgarg007/in_words_pe
feat: In words in payment entry
2024-01-26 09:30:26 +05:30
Gursheen Anand
53b44ccf29 fix: enqueue JV submission when more than 100 accounts 2024-01-25 16:13:24 +05:30
Deepesh Garg
69db569ca5
Merge pull request #39446 from GursheenK/payment-reco-company-field
fix: ignore user permissions for company in payment reco
2024-01-25 15:06:10 +05:30
Gursheen Kaur Anand
3f383d81bd
Merge branch 'develop' into payment-reco-company-field 2024-01-25 11:44:53 +05:30
ruthra kumar
9fcd89d456 refactor: use generic name for advance doctypes variable 2024-01-24 14:19:21 +05:30
Deepesh Garg
236c7e1e95
Merge pull request #39493 from GursheenK/skip-liability-acc-for-internal-transfers
fix: skip setting liability account for internal transfer
2024-01-24 10:34:19 +05:30
barredterra
806696a003 fix: typos 2024-01-24 02:59:52 +01:00
barredterra
3815f07c33 refactor(Sales Invoice): set account for mode of payment 2024-01-23 13:11:06 +01:00
ruthra kumar
ebaa5d3add
Merge pull request #39054 from ruthra-kumar/provision_to_set_dimension_in_reconciliation_tool
refactor: provision to filter on dimensions in reconciliation tool
2024-01-23 17:28:21 +05:30
David Arnold
b1aef01a1f
fix: always update the advance payment status 2024-01-23 10:30:08 +01:00
David Arnold
c88ce55242
fix: advance payment doctypes to keep input/output distinction 2024-01-23 10:30:07 +01:00
Gursheen Anand
236b73565e fix: skip liability account for internal transfer 2024-01-22 21:13:32 +05:30
ruthra kumar
72614fe9e1 Merge branch 'develop' into pr/38560 2024-01-22 17:26:35 +05:30
ruthra kumar
7c2cb70387 refactor: handle dynamic dimension in order query 2024-01-22 12:06:07 +05:30
ruthra kumar
f8bbb0619c refactor: dynamic dimension filters in pop up 2024-01-22 10:43:09 +05:30
Deepesh Garg
13aae34e9c Merge branch 'develop' of https://github.com/frappe/erpnext into in_words_pe 2024-01-22 09:33:46 +05:30
Rohit Waghchaure
b4393bc03d fix: added button to make serial / batch from Purchase Invoice 2024-01-21 20:17:15 +05:30
David Arnold
9fc5c0cc58
Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status 2024-01-21 15:16:13 +01:00
Gursheen Kaur Anand
d468accb02
Merge branch 'frappe:develop' into payment-reco-company-field 2024-01-19 11:52:34 +05:30
Gursheen Kaur Anand
4ca63c07f6
Merge branch 'frappe:develop' into insufficient-permissions-for-manager 2024-01-19 11:19:32 +05:30
ruthra kumar
c44eb432a5 refactor: pass dimension values to Gain/Loss journal 2024-01-18 16:42:22 +05:30
Gursheen Anand
e9bc63aacf fix: set unallocated amount after base tax 2024-01-18 14:33:10 +05:30
Gursheen Anand
527cfcd87f fix: ignore user permissions for company field 2024-01-18 11:58:06 +05:30
Nabin Hait
2adb710751
Merge pull request #39427 from nabinhait/test-fix333
fix: Asset module tests
2024-01-17 17:21:47 +05:30
Nabin Hait
97f69986ff fix: Asset module tests 2024-01-17 16:39:39 +05:30
Deepesh Garg
889d67bcee
Merge pull request #39367 from deepeshgarg007/revert_dynamic_splitting
Revert dynamic splitting
2024-01-17 15:03:13 +05:30
Gursheen Anand
8b91287034 fix: account and stock manager read perm 2024-01-17 13:09:51 +05:30
ruthra kumar
188ff8cde7 refactor: apply dimension filters on cr/dr notes 2024-01-17 12:51:41 +05:30
Deepesh Garg
4f3aeaefc1 chore: Remove unwanted changes 2024-01-17 12:42:22 +05:30
Deepesh Garg
7eefedfb11 fix: Update subscription period 2024-01-17 10:57:19 +05:30
ruthra kumar
ab939cc6e8 refactor: Credit Note and its Exc gain/loss JE inherits dimensions 2024-01-16 16:48:50 +05:30
Deepesh Garg
96dcfba65a Merge branch 'develop' of https://github.com/frappe/erpnext into revert_dynamic_splitting 2024-01-16 15:42:02 +05:30
ruthra kumar
e5aeab7e7e fix: broken multi currency test case in subscription 2024-01-16 11:16:39 +05:30
ruthra kumar
0ec17590ae fix: typo's and parameter changes 2024-01-15 16:17:33 +05:30
ruthra kumar
2154502955 refactor: partial change on outstanding invoice popup 2024-01-15 16:17:33 +05:30
ruthra kumar
a4ddf93492
Merge pull request #39332 from ruthra-kumar/validate_subscription_billing_currency
refactor: prevent foreign currency subscription for a party
2024-01-15 15:05:31 +05:30
ruthra kumar
9c5a79209e refactor: replace sql with query builder for Jourals query 2024-01-15 14:55:15 +05:30
ruthra kumar
5dc22e1811 refactor: pass dimension details to query 2024-01-15 14:55:15 +05:30
ruthra kumar
ad8475cb8b refactor: set query filters for dimensions 2024-01-15 14:55:15 +05:30
ruthra kumar
ff60ec85b8 refactor: pass dimension filters to query 2024-01-15 14:55:15 +05:30
ruthra kumar
c1fe4bcc64 refactor: handle dimension filters 2024-01-15 14:55:15 +05:30
ruthra kumar
20576e0f47 refactor: column break in dimension section 2024-01-15 14:55:15 +05:30
ruthra kumar
20e0acc20a refactor: dimensions filter section in payment reconciliation 2024-01-15 14:55:15 +05:30
ruthra kumar
1cde804c77 refactor: dimensions section in allocation table in reconciliation 2024-01-15 14:55:15 +05:30
ruthra kumar
1387b0ba7f refactor(test): supply default currency for subscription plans 2024-01-15 14:42:57 +05:30
ruthra kumar
6bb2d9195f
Merge pull request #39336 from ruthra-kumar/better_validation_on_bank_transaction
refactor: disallow bank transactions on different currencies
2024-01-15 10:01:50 +05:30