Commit Graph

38359 Commits

Author SHA1 Message Date
Deepesh Garg
45d5f6e00a fix: Multiple partial payment requests against Purchase Invoice 2024-04-01 21:21:46 +05:30
Deepesh Garg
edf51c9ab9 Merge pull request #40797 from deepeshgarg007/po_filter
fix: Party type in Payment Order
2024-04-01 20:38:33 +05:30
Deepesh Garg
6416a6ad94 Merge pull request #40796 from deepeshgarg007/pe_default_company_bank_account
fix: Default company bank account
2024-04-01 20:38:17 +05:30
Deepesh Garg
4f8990602e Merge pull request #40770 from deepeshgarg007/so_commission_update
fix: Recalculate sales commission on item update
2024-04-01 20:37:57 +05:30
Deepesh Garg
81cf970883 Merge pull request #40755 from deepeshgarg007/employee_payment_entry_receive
fix: Receive payment entry from Employee
2024-04-01 20:37:40 +05:30
rohitwaghchaure
4c79d92faa Merge pull request #40735 from rohitwaghchaure/fixed-stock-balance-report
fix: Show Stock Ageing Data filter not working in stock balance report
2024-04-01 16:54:12 +05:30
Rohit Waghchaure
621421bda2 fix: Show Stock Ageing Data filter not working in stock balance report 2024-04-01 16:19:21 +05:30
ruthra kumar
2dd07d9292 Merge pull request #40790 from frappe/pot_develop_2024-03-31
chore: update POT file
2024-04-01 15:49:06 +05:30
ruthra kumar
d2b96b415c Merge pull request #40181 from pps190/fix-show-future-payments
fix: show future payments consider allocated sales returns
2024-04-01 13:03:23 +05:30
Deepesh Garg
91fa41c9ec fix: Party type in Payment Order 2024-03-31 20:08:39 +05:30
Deepesh Garg
7ac91deb83 fix: Default company bank account 2024-03-31 19:48:40 +05:30
Deepesh Garg
b542f21eea Merge pull request #40714 from khushi8112/general_ledger_report_voucher_no
fix: voucher no. is link field for non english user interface
2024-03-31 19:23:01 +05:30
frappe-pr-bot
6283ff5d52 chore: update POT file 2024-03-31 09:35:24 +00:00
rohitwaghchaure
9bacf53f04 Merge pull request #40786 from rtdany10/gp-wh-issue
fix(gp): SLEs not fetched for correct warehouse
2024-03-31 11:45:49 +05:30
rohitwaghchaure
4f91effca9 Merge pull request #40778 from blaggacao/chore/into-child-mapper
chore(stock): use the into child mapper mapper frappe/frappe#22592
2024-03-31 11:43:56 +05:30
Dany Robert
f958e8be06 fix(gp): SLEs not fetched for correct warehouse 2024-03-30 16:32:43 +05:30
rohitwaghchaure
3231ee4d9d Merge pull request #40783 from rohitwaghchaure/fixed-provision-to-add-serial-batch-bundle-in-subcontracting-receipt
fix: button to select serial / batch bundle in the subcontracting receipt
2024-03-30 11:23:20 +05:30
Rohit Waghchaure
d73b1f3e6a fix: button to select serial / batch bundle in the subcontracting receipt 2024-03-30 10:46:56 +05:30
jeshani
679aea607b fix: Warehouse linked company name in multicompany setup (#40779) 2024-03-30 10:16:22 +05:30
David Arnold
28c75b8f4d chore(stock): use the into child mapper mapper frappe/frappe#22592 2024-03-29 23:28:33 +01:00
Deepesh Garg
2a8a404c69 Merge branch 'develop' of https://github.com/frappe/erpnext into so_commission_update 2024-03-29 18:02:53 +05:30
Deepesh Garg
f76da50b7e fix: Recalculate sales commission on item update 2024-03-29 17:57:58 +05:30
rohitwaghchaure
8e522183bc Merge pull request #40758 from ashish-greycube/patch-12
fix: payment_order_status should be no_copy
2024-03-29 13:25:13 +05:30
ruthra kumar
66a06ca1a5 Merge pull request #40760 from ruthra-kumar/fix_cost_center_update_in_gain_loss_journal
fix: cost center shouldn't update debit/credit in Exc gain/loss JV
2024-03-29 11:42:44 +05:30
ruthra kumar
398d3022ef fix: cost center shouldn't update debit/credit in Exc gain/loss JV 2024-03-29 11:32:34 +05:30
Rohit Waghchaure
d05412f96a chore: show item name in the validation message 2024-03-29 10:53:04 +05:30
Ashish Shah
adee2ba541 fix: payment_order_status should be no_copy
payment_order_status should be no_copy
2024-03-29 10:52:52 +05:30
rohitwaghchaure
ce2b9de9be Merge pull request #40752 from rohitwaghchaure/provision-to-override-batch-dialog
chore: allow to override serial batch selector using custom app
2024-03-29 09:10:36 +05:30
Deepesh Garg
29e5c6807e fix: Receive payment entry from Employee 2024-03-29 09:05:35 +05:30
Frappe PR Bot
10bf6529ef fix: sync translations from crowdin (#40717)
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
2024-03-28 17:16:11 +01:00
Raffael Meyer
a2961a427d Merge pull request #40725 from barredterra/in-context-translation 2024-03-28 14:11:54 +01:00
Deepesh Garg
fe1290a89a Merge pull request #40734 from deepeshgarg007/trend_report_filters
fix: Filters in trend reports
2024-03-28 18:16:14 +05:30
rohitwaghchaure
e04cad3368 Merge pull request #40741 from rohitwaghchaure/fixed-sales-purchase-return-validation-issue
fix: sales / purchase return validation issue
2024-03-28 17:52:55 +05:30
ruthra kumar
139c18f2cc Merge pull request #40739 from ruthra-kumar/use_sql_to_clear_comments_and_communications
refactor: use sql to clear comments
2024-03-28 17:40:54 +05:30
Rohit Waghchaure
59dc4a96e1 fix: sales / prchase return validation issue 2024-03-28 16:45:09 +05:30
ruthra kumar
1f46c1530e refactor: use sql to clear comments 2024-03-28 13:56:20 +05:30
Deepesh Garg
5a151189ad Merge pull request #40731 from Nihantra-Patel/fix_tax_format
fix: markdown to text editor set for supplier quotation
2024-03-28 12:44:45 +05:30
Deepesh Garg
c15a320940 chore: remove hardcoded FY 2024-03-28 12:25:42 +05:30
Deepesh Garg
87324c7349 fix: Filters in trend reports 2024-03-28 12:07:49 +05:30
rohitwaghchaure
4d41516abb Merge pull request #40713 from rohitwaghchaure/fixed-12091
fix: enable list view for the issues on the portal
2024-03-28 11:07:07 +05:30
Nihantra Patel
9828d34b19 fix: markdown to text editor set for supplier quotation 2024-03-28 10:30:13 +05:30
ruthra kumar
6b2f745afe Merge pull request #40719 from frappe/fix-ruff-qb-formatting
fix: exclude some query builder lines from ruff rules
2024-03-28 09:48:05 +05:30
ruthra kumar
eee86d2e4b fix: use 'eq' and isnull() on qb conditions 2024-03-28 09:18:33 +05:30
barredterra
04c91e263d chore: add crowin identifiers for in-context translation 2024-03-27 19:31:19 +01:00
rohitwaghchaure
9709a18ef5 Merge pull request #40718 from rohitwaghchaure/fixed-do-not-fetch-recived-items-12005
fix: do not fetch received items in purchase receipt
2024-03-27 22:40:18 +05:30
Akhil Narang
ac69513f60 fix: exclude some query builder lines from ruff rules
`== None` and `== True` are intentional here

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-03-27 21:51:09 +05:30
Rohit Waghchaure
5bff434902 fix: do not fetch received items in purchase receipt 2024-03-27 20:05:27 +05:30
“Khushi
2b8928cae6 fix: voucher no. is link field for non english user interface 2024-03-27 16:25:13 +05:30
Rohit Waghchaure
bddc1e3974 fix: enable list view for the issues on the portal 2024-03-27 16:17:22 +05:30
Akhil Narang
89b5e061af ci: sync up action versions with framework
Fixup some tests for py312

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-03-27 16:06:04 +05:30