Nabin Hait
fec20decc1
fix: Don't set delivery date as today while making SO from Quotation
2024-04-04 15:25:46 +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
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
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
fe1290a89a
Merge pull request #40734 from deepeshgarg007/trend_report_filters
...
fix: Filters in trend reports
2024-03-28 18:16:14 +05:30
Deepesh Garg
87324c7349
fix: Filters in trend reports
2024-03-28 12:07:49 +05:30
ruthra kumar
eee86d2e4b
fix: use 'eq' and isnull() on qb conditions
2024-03-28 09:18:33 +05:30
Danny
b156937254
fix: set default warehouse for pos invoice
2024-03-27 12:41:58 -04:00
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
Akhil Narang
f63396ef47
fix(treewide): manual ruff fixes
...
Signed-off-by: Akhil Narang <me@akhilnarang.dev >
2024-03-27 16:06:04 +05:30
Akhil Narang
3effaf21ef
refactor(treewide): formatting and ruff fixes, + manually enabled F401
...
Signed-off-by: Akhil Narang <me@akhilnarang.dev >
2024-03-27 16:06:04 +05:30
Ankush Menat
dfde490c02
refactor!: switch to creation sort ( #40699 )
2024-03-27 13:45:34 +05:30
Rohit Waghchaure
0d9d42ae61
chore: allow to override serial batch selector
2024-03-27 11:52:06 +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
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
f30e5eab11
fix: query 'Selling Settings'
2024-03-22 09:55:47 +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
Gursheen Anand
1c63983873
fix: use Text Editor for rendering tax breakup table
2024-03-20 16:09:14 +05:30
Raffael Meyer
a8d458b979
Merge pull request #40542 from barredterra/remove-in-list
2024-03-19 12:11:16 +01:00
barredterra
d238751e6b
refactor: usage of in_list
2024-03-19 12:03:36 +01:00
rohitwaghchaure
09ea7edb86
fix: Update Existing Price List Rate not working ( #40333 )
2024-03-19 12:10:24 +05:30
David
2f3d6cd304
fix: permissions for selling settings
2024-03-18 19:52:24 +01:00
Deepesh Garg
2fadfd7cfc
Merge pull request #40428 from deepeshgarg007/search_field_fix
...
chore: Remove custom party queries
2024-03-16 20:03:31 +05:30
Deepesh Garg
60ba25caf2
fix: Remove custom queries for customer
2024-03-16 19:47:39 +05:30
ruthra kumar
c9039d767b
Merge pull request #40485 from ruthra-kumar/prevent_partial_links_between_so_and_dn
...
refactor: validate SO and SI references in Delivery Notes
2024-03-16 14:57:41 +05:30
ruthra kumar
4f396d3049
test: SO reference validation
2024-03-16 14:39:57 +05:30
Gursheen Anand
3e0c798cca
chore: merge upstream
2024-03-15 12:08:33 +05:30
Gursheen Anand
4cda88690f
fix: show correct variance for durations with no vouchers
2024-03-14 12:51:51 +05:30
Deepesh Garg
d15cdd9190
Merge pull request #40433 from deepeshgarg007/client_side_tax_updates
...
fix: Taxes not getting updated on change
2024-03-14 12:13:16 +05:30
rohitwaghchaure
f4a945aee4
fix: incorrect gross profit on the quotation ( #40438 )
2024-03-13 17:48:06 +05:30
Deepesh Garg
65ae9616ba
fix: Taxes not getting updated on change
2024-03-13 13:59:50 +05:30
Gursheen Anand
9f3a310300
test: sales partner targets with invoices
2024-03-13 13:35:24 +05:30
Gursheen Anand
7690a40ebb
fix: achieved targets for sales partners
2024-03-13 12:18:25 +05:30
rohitwaghchaure
a419812864
fix: negative stock error for the batch ( #40389 )
2024-03-12 14:18:39 +05:30
Rushabh Mehta
c4570ccfad
fix(chore): remove inscrutable message via DOM injection (via Sentry)
2024-03-11 12:17:22 +05:30
Ankush Menat
ec74a5e566
style: format js files
2024-03-10 19:45:40 +05:30
ruthra kumar
e017421708
Merge pull request #38561 from blaggacao/feat/add-delivery-cutoff-date-on-so
...
feat(delivery): add cutoff item date for so delivery items
2024-03-02 12:55:00 +05:30
David Arnold
b8dac84a90
feat: add selling setting for cutoff date
2024-03-01 12:12:07 +01:00
Gursheen Anand
24dcd64c16
fix: make warning for previously existing SO an alert
2024-02-28 18:01:27 +05:30
Sajad Alimoradi
c310da7b29
fix: Translate 'mode of payments' in the 'point of sale'. ( #39467 )
...
- Due to a language change, the name of 'mode of payments' was not translated in the placeholder.
2024-02-27 07:15:20 +00:00
Rushabh Mehta
d6b29d1cd7
Merge pull request #39719 from niyazrazak/patch-18
...
feat: project field in installation note
2024-02-27 12:44:39 +05:30
Gursheen Kaur Anand
c9ff769d28
Merge pull request #40062 from GursheenK/sales-person-target-contributions
...
fix: sales person / partner achieved targets in report
2024-02-26 10:37:14 +05:30
Gursheen Anand
7566c1ee78
test: sales person target variance
2024-02-23 15:05:36 +05:30
ruthra kumar
467c0898e9
test: credit limit on update after submit
2024-02-23 14:03:09 +05:30
Gursheen Anand
a823f16dff
feat: show contributed qty in transaction summary
2024-02-23 12:17:54 +05:30
Gursheen Anand
339698d172
fix: only consider contributed qty towards achieved targets
2024-02-23 12:14:54 +05:30
Nihantra C. Patel
17452b7693
fix: check_credit_limit on_update_after_submit of Sales Order
2024-02-09 15:18:45 +05:30
mergify[bot]
2c8e4c1ab3
fix: do not consider rejected warehouses in pick list (backport #39539 ) ( #39804 )
...
* fix: do not consider rejected warehouses in pick list (#39539 )
* fix: do not picked rejected materials
* test: test case for pick list without rejected materials
(cherry picked from commit f6725e4342rohitw1991@gmail.com >
2024-02-08 13:54:08 +05:30
rohitwaghchaure
4671f65cbd
Merge pull request #39718 from rohitwaghchaure/create-bundle-using-old-fields
...
fix: use old serial / batch fields to make serial batch bundle
2024-02-06 15:47:08 +05:30
