Commit Graph

48513 Commits

Author SHA1 Message Date
Raffael Meyer
f20c54a6c1 Merge pull request #40593 from barredterra/uom-fields 2024-03-25 21:53:22 +01:00
Raffael Meyer
f316a29ba6 Merge pull request #40635 from frappe/pot_develop_2024-03-24 2024-03-25 21:41:07 +01:00
David Arnold
462204fc65 fix(Payment Entry): get contact details from existing contact (#40556) 2024-03-25 20:12:44 +01:00
Deepesh Garg
e04a3b107a Merge pull request #40627 from deepeshgarg007/da_code_cleanup
chore: Discount accounting code cleanup
2024-03-25 19:06:26 +05:30
Deepesh Garg
7d7d10e422 Merge pull request #40577 from barredterra/one-item-price
perf: query one item price only
2024-03-25 17:22:49 +05:30
Deepesh Garg
12945341ce Merge pull request #40589 from barredterra/get_prices_as_dict
refactor: get prices as dict
2024-03-25 17:18:31 +05:30
Deepesh Garg
5ab9656e8f Merge pull request #40640 from deepeshgarg007/default_fb_pl
fix: Add default finance book check in P&L statement
2024-03-25 14:43:29 +05:30
Ankush Menat
e055147849 fix: address_display, text -> text editor (#40621)
* fix: address_display, text -> text editor

* fix: text -> text editor for shipping and dispatch_address
2024-03-25 05:46:16 +00:00
Deepesh Garg
5be3417fdf fix: Add default finance book check in P&L statement 2024-03-24 19:02:38 +05:30
rohitwaghchaure
c89b0e37ab Merge pull request #40638 from rohitwaghchaure/fixed-40578
fix: Batch No is mandatory while making manufacture entry
2024-03-24 18:31:19 +05:30
Rohit Waghchaure
43fd60a877 fix: Batch No is mandatory while making manufacture entry 2024-03-24 17:44:37 +05:30
rohitwaghchaure
079cc8bd21 Merge pull request #40594 from rohitwaghchaure/fixed-serial-batch-bundle-scr
fix: use serial/batch fields for subcontracting receipt and in transit in stock entry
2024-03-24 16:03:46 +05:30
frappe-pr-bot
d47b87ba71 chore: update POT file 2024-03-24 09:35:26 +00:00
Deepesh Garg
ae31f2c5ad Merge pull request #40504 from khushi8112/selling-coupon-code
feat: Coupon code in sales invoice
2024-03-23 17:07:41 +05:30
Deepesh Garg
24e2672fde Merge branch 'develop' into selling-coupon-code 2024-03-23 14:42:47 +05:30
Deepesh Garg
aaa1df6a1f chore: Discount accounting code cleanup 2024-03-23 00:19:27 +05:30
Rohit Waghchaure
3423334e4f fix: use serial/batch fields for subcontracting receipt and in transit stock entry 2024-03-22 23:13:47 +05:30
ruthra kumar
b1a9b6d64a Merge pull request #40622 from ruthra-kumar/refactor_flag_update_patch
refactor: reset update_outstanding_for_self flag for old records
2024-03-22 20:22:14 +05:30
ruthra kumar
fdcdc8a56e refactor: hide on print formats 2024-03-22 17:50:51 +05:30
ruthra kumar
a88bf8419e refactor: reset flag for old records 2024-03-22 16:16:07 +05:30
rohitwaghchaure
6d603cc35f Merge pull request #40616 from rohitwaghchaure/fixed-rate-reset-to-zero-11988
fix: rate reset to zero
2024-03-22 15:19:54 +05:30
Rohit Waghchaure
6821baa850 fix: rate reset to zero 2024-03-22 15:03:38 +05:30
ruthra kumar
844ad405ff Merge pull request #40509 from blaggacao/fix/cutoff-date-implementation
fix: permissions sales user for selling settings
2024-03-22 10:13:58 +05:30
ruthra kumar
6940c2b0aa Merge pull request #40520 from blaggacao/fix/bulk-tx-log-permissions
fix: permissions during bulk transaction logs
2024-03-22 10:07:08 +05:30
ruthra kumar
f30e5eab11 fix: query 'Selling Settings' 2024-03-22 09:55:47 +05:30
ruthra kumar
4972f6b66f Merge pull request #40208 from barredterra/refactor-semgrep
refactor: reduce usage of `cur_frm`
2024-03-22 09:28:19 +05:30
Akhil Narang
1cd38c860a perf: add in some indexes (#40590)
`Sales Invoice Item.purchase_order`
`Delivery Note Item.purchase_order`

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-03-22 08:47:03 +05:30
rohitwaghchaure
eb45a71997 Merge pull request #40595 from rohitwaghchaure/fixed-rate-not-fetch-from-item-price
fix: rate not fetching from the item price
2024-03-21 22:18:28 +05:30
ruthra kumar
2bd9c5b001 Merge pull request #40386 from rtdany10/gp-report-rate
fix: wrong buying amount if delivered and billed qty varies
2024-03-21 21:13:32 +05:30
Rohit Waghchaure
d893a465d7 fix: rate not fetching from the item price 2024-03-21 21:04:03 +05:30
ruthra kumar
ccb51ded95 test: buying amt calculation if DN and SI differ in qty 2024-03-21 20:57:52 +05:30
barredterra
4a49618cd7 feat(UOM): add common code, symbol and description 2024-03-21 15:49:45 +01:00
Raffael Meyer
9fcddc3378 Merge pull request #40587 from barredterra/validate-price-dates 2024-03-21 14:12:37 +01:00
barredterra
58b3ce6a19 refactor: get prices as dict 2024-03-21 13:48:05 +01:00
barredterra
cbcc47b5c4 refactor(Item Price): validate dates 2024-03-21 11:57:22 +01:00
ruthra kumar
64f686d943 Merge pull request #40580 from ruthra-kumar/config_changes_in_transaction_deletion_record
refactor: config changes in Transaction Deletion Record
2024-03-21 10:45:54 +05:30
ruthra kumar
4ba67fb3ec refactor: config changes in Transaction Deletion Record 2024-03-21 10:29:56 +05:30
barredterra
be9fe7331a perf: query one item price only 2024-03-20 19:37:34 +01:00
Deepesh Garg
1714ac6587 Merge pull request #40572 from GursheenK/pcv-validate-only-valid-gles
fix: PCV validation for previous fiscal year
2024-03-20 20:55:08 +05:30
ruthra kumar
0a495bf65e Merge pull request #39717 from ruthra-kumar/redesign_transaction_deletion_record
refactor: Transaction Deletion record for large volumes
2024-03-20 19:41:39 +05:30
Gursheen Anand
a1d108c062 fix: validate gl for previous fiscal year 2024-03-20 18:45:04 +05:30
Deepesh Garg
986357428d Merge pull request #40563 from GursheenK/tax-breakup-table-docfield
fix: use `Text Editor` for rendering tax breakup table
2024-03-20 18:32:38 +05:30
Ankush Menat
967540da18 fix: style for tax breakup 2024-03-20 16:56:30 +05:30
rohitwaghchaure
e1ce7bfb11 Merge pull request #40545 from barredterra/bom-configurator-labels
fix: translatability of bom configurator labels
2024-03-20 16:18:22 +05:30
Gursheen Anand
1c63983873 fix: use Text Editor for rendering tax breakup table 2024-03-20 16:09:14 +05:30
ruthra kumar
02c522b7cd chore: fix linting issue in JS 2024-03-20 16:01:09 +05:30
ruthra kumar
81309576b0 refactor(test): test cases modified to handle new approach 2024-03-20 15:16:33 +05:30
ruthra kumar
a158b825d7 refactor: ability to process in single transaction 2024-03-20 15:12:26 +05:30
rohitwaghchaure
50bfb8eaa9 Merge pull request #40561 from rohitwaghchaure/fixed-11260
fix: Cannot read properties of undefined (reading 'rate')
2024-03-20 15:00:14 +05:30
Rohit Waghchaure
ac92a22914 fix: Cannot read properties of undefined (reading 'rate') 2024-03-20 14:56:07 +05:30