3394 Commits

Author SHA1 Message Date
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 f6725e43425043eaba7dcdd3cf3768a857a39ee6)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
#	erpnext/stock/doctype/pick_list/pick_list.json
#	erpnext/stock/doctype/pick_list/pick_list.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fixed test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@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
Ankush Menat
798a0510e6
refactor: change server_action args (#39756)
args are now flat, no need to accept them as dict

ref: https://github.com/frappe/frappe/pull/24782
2024-02-06 08:04:28 +00:00
NIYAZ RAZAK
d73e42fc41
feat: project field 2024-02-04 17:23:08 +03:00
Rohit Waghchaure
9fafc83632 fix: use old serial / batch fields to make serial batch bundle 2024-02-04 18:32:19 +05:30
mergify[bot]
50cff656b4
Merge branch 'develop' into copy-emails-to-customer 2024-02-03 08:37:59 +00:00
Rucha Mahabal
6b8f046fb4
chore: cleanup doctype descriptions (#39637)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2024-01-31 12:15:52 +05:30
David Arnold
9a705169fd
fix: remove empty dn from bulk creation if date filter renders them empty 2024-01-30 13:51:48 +01:00
mergify[bot]
12a4f2761c
Merge branch 'develop' into feat/add-delivery-cutoff-date-on-so 2024-01-30 09:56:24 +00:00
Gursheen Anand
079cd30b9c fix: qtn tests using delivery date 2024-01-29 14:19:25 +05:30
Gursheen Anand
49cb11c1f3 fix: do not auto-populate item delivery date 2024-01-29 13:15:00 +05:30
mergify[bot]
4c197c8dbd
Merge branch 'develop' into copy-emails-to-customer 2024-01-28 04:23:49 +00:00
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
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
Gursheen Anand
7f8303a493 fix: make SO item code reqd 2024-01-25 14:27:35 +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
735576ab27
Merge branch 'develop' into dev_fix_payment_terms_status_for_sales_order_report 2024-01-24 15:45:46 +05:30
barredterra
806696a003 fix: typos 2024-01-24 02:59:52 +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
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
8de03ef836 test: advance payment status for Sales Order 2024-01-23 15:50:52 +05:30
David Arnold
7d8aa469d7
fix: align with 'Partly/Fully X' nomenclature in so & po 2024-01-23 10:30:08 +01:00
rohitwaghchaure
60809ced85
Merge pull request #39488 from rohitwaghchaure/fixed-validate-stock-uom-integer-value
fix: UOM needs to be whole number not being checked in quotations
2024-01-22 17:24:32 +05:30
Rohit Waghchaure
aaf83da3e9 fix: UOM needs to be whole number not being checked in quotations 2024-01-22 16:43:54 +05:30
ruthra kumar
52814724eb refactor: move 'project' set_query to sales_common.js 2024-01-22 15:32:16 +05:30
David Arnold
9fc5c0cc58
Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status 2024-01-21 15:16:13 +01:00
HENRY Florian
af80d253db
fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item (#38322)
* fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item

* fix: evaluate depends_on for fdata visibility in grid

* fix: evaluate depends_on for fdata visibility in grid

* chore: change after review

* chore: change for review
2024-01-17 10:43:36 +05:30
Alexandre Lumertz Damiani
80f5026208
fix: translate (#39395) 2024-01-16 10:46:00 +05:30
Florian HENRY
6c8f52b26f fix: Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template 2024-01-11 16:00:48 +01:00
barredterra
e67ed4fb2d Merge branch 'develop' into quotation-to-customer 2024-01-11 14:04:09 +01:00
barredterra
28626cd7c0 Merge branch 'develop' into copy-emails-to-customer 2024-01-09 17:50:42 +01:00
Ankush Menat
bb18ae82cf refactor: use db.get_single_value 2024-01-09 21:57:50 +05:30
rohitwaghchaure
2d2ff7cf52
fix: incorrect indicator title for portal sales order (#39247) 2024-01-09 15:37:46 +05:30
Nabin Hait
ec07b42ea2
Merge pull request #38530 from bosue/duplicate_zero_quantity_check2
refactor: Consolidate duplicate zero-quantity Items checks for transactions.
2024-01-09 13:12:25 +05:30
ruthra kumar
b498094a97 fix: total allocated percentage for sales team issue 2024-01-09 12:40:41 +05:30
David Arnold
b73507abe0
Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status 2024-01-05 21:36:14 +01:00
Ankush Menat
b71b0d5997
fix: remove bad defaults (#38986)
Child tables can't have a default.
2023-12-28 08:45:40 +00:00