38035 Commits

Author SHA1 Message Date
Gursheen Anand
fc677811b7 fix: return doc obj after submit 2024-01-26 20:03:21 +05:30
mergify[bot]
19ff10dfeb
Merge branch 'develop' into quotation-to-customer 2024-01-26 13:56:08 +00:00
Deepesh Garg
dbd4dae3d9 test: Internal transfer using purchase receipt 2024-01-26 18:42:29 +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
722ee53fb1 Merge branch 'develop' of https://github.com/frappe/erpnext into copy-emails-to-customer 2024-01-26 09:39:13 +05:30
Deepesh Garg
6173b34b10 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation-to-customer 2024-01-26 09:35:38 +05:30
Deepesh Garg
f7a3af7473
Merge pull request #39532 from GursheenK/type-error-in-transaction-js
fix: type error in transaction.js
2024-01-26 09:30:53 +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
Deepesh Garg
d2057588dd Merge branch 'develop' of https://github.com/frappe/erpnext into type-error-in-transaction-js 2024-01-26 09:29:05 +05:30
rohitwaghchaure
2bdfdeeb9a
fix: incorrect amount in the material request item (#39567)
fix: incoorect amount in the material request
2024-01-25 16:49:12 +05:30
Nabin Hait
be074a2972
Merge pull request #39489 from nabinhait/grouped-asset-value
fix: fetch correct quantity and amount for grouped asset
2024-01-25 16:20:35 +05:30
Gursheen Kaur Anand
2b3cc5ba2d
Merge pull request #39557 from GursheenK/validate-item-code-with-prevdoc
fix: make SO item code mandatory
2024-01-25 16:19:23 +05:30
Nabin Hait
06f48c678b fix: fetch correct quantity and amount for grouped asset 2024-01-25 16:18:54 +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 Anand
7f8303a493 fix: make SO item code reqd 2024-01-25 14:27:35 +05:30
ruthra kumar
1e89c1c875
Merge pull request #39535 from ruthra-kumar/rename_advance_doctype_variable_hook
refactor: use generic name for advance doctypes variable
2024-01-25 13:25:56 +05:30
rohitwaghchaure
d1fb90edff
fix: default enable closing stock balance (#39551) 2024-01-25 12:42:16 +05:30
ruthra kumar
4f215f1b70
Merge pull request #38218 from rtdany10/account-balance-mismatch
fix: honour currency precision while fetching balance
2024-01-25 12:28:36 +05:30
Gursheen Kaur Anand
3f383d81bd
Merge branch 'develop' into payment-reco-company-field 2024-01-25 11:44:53 +05:30
rohitwaghchaure
c0a1188067
Merge pull request #39547 from rohitwaghchaure/fixed-item-tax-template-not-working-for-e-commerce
fix: Item Tax template is not working for e-commerce
2024-01-25 11:36:48 +05:30
Nabin Hait
ca02dfa652
Merge pull request #39498 from nabinhait/asset-cancellation-fix
fix: cancellation of asset/asset capitalization
2024-01-25 11:36:19 +05:30
Rohit Waghchaure
7d3240ae3a fix: Item Tax template is not working for e-commerce 2024-01-25 11:08:33 +05:30
ruthra kumar
93681cfa24 Merge branch 'develop' into pr/38218 2024-01-25 09:58:54 +05:30
ruthra kumar
735576ab27
Merge branch 'develop' into dev_fix_payment_terms_status_for_sales_order_report 2024-01-24 15:45:46 +05:30
Rohit Waghchaure
64cb1153de fix: incorrect active serial nos 2024-01-24 15:15:50 +05:30
ruthra kumar
9fcd89d456 refactor: use generic name for advance doctypes variable 2024-01-24 14:19:21 +05:30
ruthra kumar
4a4c4ba21b
Merge pull request #39529 from ruthra-kumar/typeerror_on_company_transaction_deletion
fix: AttributeError in company transaction deletion
2024-01-24 13:09:49 +05:30
Gursheen Anand
030d35628d fix: type error on company doc 2024-01-24 12:47:55 +05:30
rohitwaghchaure
a552df8a9f
Merge pull request #39525 from rohitwaghchaure/fixed-auto-mr-email-with-user-permissions-issue
fix: email list for auto reorder material request
2024-01-24 12:35:35 +05:30
ruthra kumar
b127aa308e fix: AttributeError in company transaction deletion 2024-01-24 12:24:02 +05:30
rohitwaghchaure
02028becb3
Merge pull request #39521 from rohitwaghchaure/fixed-not-able-to-edit-adddress
fix: not able to edit address through portal
2024-01-24 11:50:02 +05:30
Rohit Waghchaure
764f3422a0 fix: email list for auto reorder material request 2024-01-24 11:45:15 +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
Rohit Waghchaure
b046d980ad fix: not able to edit address through portal 2024-01-24 10:29:55 +05:30
barredterra
806696a003 fix: typos 2024-01-24 02:59:52 +01:00
barredterra
77b044f1a6 fix: don't overwrite existing terms in transaction 2024-01-24 01:48:10 +01:00
Raffael Meyer
7a6a789199
Merge pull request #39512 from barredterra/refactor-split-batch 2024-01-23 17:54:28 +01:00
David Arnold
252fae68df
feat: use new bulk creation arguments and contrue a cut-off date selector for dn-from-so 2024-01-23 17:46:12 +01:00
David Arnold
e5a5b6afc8
feat: add better preselection (cut-off: tomorrow) to dn-from-so creation dialogue 2024-01-23 17:45:40 +01:00
David Arnold
ffd38362d5
feat: add an argument pass mechanism to bulk transactions 2024-01-23 17:42:56 +01:00
barredterra
7a7a213285 refactor(Batch): use const instead of var 2024-01-23 15:02:42 +01:00
barredterra
34ec2f8a2b fix(Batch): reload doc after splitting
to show updated qty
2024-01-23 14:57:23 +01:00
rohitwaghchaure
4832175341
Merge pull request #39503 from rohitwaghchaure/fixed-serial-no-ledger-permission
fix: Serial No Ledger permission issue
2024-01-23 19:06:40 +05:30
barredterra
3c7e7a76f0 refactor: split batch 2024-01-23 14:23:32 +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
ruthra kumar
0d7dd93284
Merge pull request #38560 from blaggacao/feat/so-po-advance-payment-status
feat!: advance payment status on advance payment doctypes
2024-01-23 16:39:22 +05:30
ruthra kumar
9b4e757b0b test: advance payment status for Purchase Order 2024-01-23 15:53:05 +05:30