Commit Graph

48629 Commits

Author SHA1 Message Date
ruthra kumar
7d22df2af5 Merge pull request #40643 from blaggacao/fix/adv-pay-status
fix(pr): set adv. pay. status base on PR stati
2024-04-03 15:05:25 +05:30
David
46e12e0981 chore: smaller loop; less indirection 2024-04-03 02:23:37 +02:00
David
b4c815b804 test: differentiate progressing and non progressing flows 2024-04-03 02:23:36 +02:00
David
a8cd850bb6 test: patch payments app interface 2024-04-03 02:23:36 +02:00
David
ec675ea3d8 fix(pr): set adv. pay. status base on pr stati 2024-04-03 02:09:56 +02:00
David
c9c6211009 test: trigger so to invoice flow (fails) 2024-04-03 02:09:56 +02:00
David
c705a393fe fix(pr): set adv. pay. status for po (still fails; differently) 2024-04-02 20:15:48 +02:00
David
bcdfbee23e test: correctly trigger po payment request ["Outward"] (fails) 2024-04-02 19:36:13 +02:00
David
3228841e68 fix: individual accounting tests
without this no 'run-tests' during development can be run
as soon as payment requests are involved
2024-04-02 19:36:13 +02:00
rohitwaghchaure
c3b2ed57f6 Merge pull request #40723 from rohitwaghchaure/fixed-allow-to-manually-pick-batches
feat: allow to pick manually qty / batches / serial nos
2024-04-02 22:13:50 +05:30
Rohit Waghchaure
50dd9fa8a3 feat: allow to pick manually qty / batches / serial nos 2024-04-02 21:08:04 +05:30
Raffael Meyer
f3bcdbe5bd fix: translatable web footer (#40834) 2024-04-02 15:14:38 +00:00
rohitwaghchaure
1e4b920fd2 Merge pull request #40828 from rohitwaghchaure/chore-removed-manual-option-from-bom
chore: remove rate of material based on Manual
2024-04-02 18:10:32 +05:30
Rohit Waghchaure
0b63dbf221 chore: remove rate of material based on Manual 2024-04-02 16:32:03 +05:30
Nabin Hait
5281553b61 Merge pull request #40584 from nabinhait/fixed-asset-register-currency
fix: show currency symbol in base currency in fixed asset register report
2024-04-02 15:56:10 +05:30
Nabin Hait
21a40a2236 fix: linter issues 2024-04-02 15:35:06 +05:30
rohitwaghchaure
4c8dfb2e6a Merge pull request #40816 from rohitwaghchaure/fixed-12159
fix: added validation if parent id is missing in BOM Creator
2024-04-02 15:11:56 +05:30
rohitwaghchaure
271fea69b8 Merge pull request #40814 from rohitwaghchaure/fixed-barcode-not-fetch-on-stock-entry
fix: barcode not fetched on selection of item
2024-04-02 11:21:07 +05:30
Rohit Waghchaure
0a1fab762f fix: added validation if parent id is missing in BOM Creator 2024-04-02 11:19:31 +05:30
Rohit Waghchaure
b0730293e2 fix: barcode not fetched on selection of item 2024-04-02 10:39:48 +05:30
rohitwaghchaure
15c3f09898 Merge pull request #40720 from mmdanny89/warehouse-pos
Set default warehouse for pos invoice
2024-04-01 22:37:27 +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
rohitwaghchaure
a3fbeff333 Merge pull request #40757 from rohitwaghchaure/fixed-validation-message
chore: show item name in the validation message
2024-03-29 11:35:07 +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