Rohit Waghchaure
0eaf6de5de
feat: serial and batch bundle for POS
2023-06-02 17:14:16 +05:30
Rohit Waghchaure
5bb3173676
refactor: rename doctype serial and batch ledger to serial and batch entry
2023-06-02 17:14:15 +05:30
Rohit Waghchaure
674bd3e2e5
feat: serial and batch bundle for Packing Items
2023-06-02 17:14:15 +05:30
Rohit Waghchaure
e6143abb8a
refactor: added new file serial batch bundle
2023-06-02 17:14:14 +05:30
Rohit Waghchaure
6c9b212dd1
fix: removed sales and purchase fields from serial nos
2023-06-02 17:14:14 +05:30
Gursheen Anand
74619269f0
feat: Record Advance Payments as Liability
...
Ability to let user record advance payments as liability instead of a negative asset.
Issue #34282
2023-06-02 17:13:51 +05:30
Raffael Meyer
09872301bd
Merge branch 'develop' into bank-trans-party-automatch
2023-06-01 18:03:10 +02:00
s-aga-r
4044c2ed40
fix(test): test_stock_reservation_against_sales_order
2023-06-01 17:00:57 +05:30
s-aga-r
0305a925fe
fix: ignore Non-Stock Item
while calculating % Picked
in Sales Order
2023-06-01 14:18:48 +05:30
Nabin Hait
86f88817a9
fix: Added pos links in Selling workspace
2023-05-30 13:18:58 +05:30
Nabin Hait
243c49c550
refactor: Workspace cleanup
2023-05-30 13:17:59 +05:30
Sagar Sharma
fefd788eb5
fix(ux): add non-group warehouse filter
2023-05-25 11:49:47 +05:30
rohitwaghchaure
565322daba
Merge branch 'develop' into stock-reservation
2023-05-24 14:32:04 +05:30
Ankush Menat
b0eb72ffac
fix: replace quotation with invoice in first onboarding ( #35389 )
...
[skip ci]
2023-05-23 15:35:55 +05:30
Marica
6fe5264ae2
Merge branch 'develop' into bank-trans-party-automatch
2023-05-18 12:57:58 +05:30
ruthra kumar
b2290c6f57
fix: possible type error on quotation -> sales order creation
2023-05-18 12:48:15 +05:30
MOHAMMED NIYAS
90ddf1c0f0
fix: create sales order
...
Getting error while clicking create sales order button from quotation
Taceback (most recent call last):
File "apps/frappe/frappe/app.py", line 66, in application
response = frappe.api.handle()
File "apps/frappe/frappe/api.py", line 54, in handle
return frappe.handler.handle()
File "apps/frappe/frappe/handler.py", line 45, in handle
data = execute_cmd(cmd)
File "apps/frappe/frappe/handler.py", line 83, in execute_cmd
return frappe.call(method, **frappe.form_dict)
File "apps/frappe/frappe/__init__.py", line 1607, in call
return fn(*args, **newargs)
File "apps/frappe/frappe/model/mapper.py", line 36, in make_mapped_doc
return method(source_name)
File "apps/erpnext/erpnext/selling/doctype/quotation/quotation.py", line 263, in make_sales_order
return _make_sales_order(source_name, target_doc)
File "apps/erpnext/erpnext/selling/doctype/quotation/quotation.py", line 333, in _make_sales_order
doclist = get_mapped_doc(
File "apps/frappe/frappe/model/mapper.py", line 144, in get_mapped_doc
postprocess(source_doc, target_doc)
File "apps/erpnext/erpnext/selling/doctype/quotation/quotation.py", line 291, in set_missing_values
for d in customer.get("sales_team"):
TypeError: 'NoneType' object is not iterable
2023-05-18 10:23:58 +05:30
Raffael Meyer
870b02b03c
fix: allow over-payment against SO ( #35079 )
2023-05-14 08:59:58 +05:30
Daizy Modi
19cd687784
fix: function batch_no
should only be declared once ( #35115 )
...
fix: remove twice event call of `batch_no` to update batch qty
2023-05-14 08:56:25 +05:30
Sagar Sharma
81a57e4e41
Merge branch 'develop' into stock-reservation
2023-05-13 09:44:06 +05:30
Rohit Waghchaure
a686b8c337
fix: incorrect packing items
2023-05-12 14:12:29 +05:30
marination
dbf7a479b6
fix: Use existing bank fields to match by bank account no/IBAN
...
- Remove newly added fields in Party doctypes to store bank details
- Use Bank Account's fields to match against account no/iban
- For employee, if Bank Account does not exist, find in Employee doctype against account no/iban
2023-05-09 20:47:14 +05:30
Sagar Sharma
12785101d9
Merge branch 'develop' into stock-reservation
2023-05-08 16:47:40 +05:30
ruthra kumar
446f3d12eb
Merge pull request #35153 from ruthra-kumar/fetch_sales_team_from_customer_master
...
fix: fetch default sales team on Quotation -> Sales Order creation
2023-05-08 14:19:28 +05:30
ruthra kumar
4d31436917
fix: fetch default sales team on Quotation -> Sales Order creation
2023-05-04 10:45:22 +05:30
ruthra kumar
f9a4972cb6
fix: bypass flag in Customer Group wasn't effective
2023-05-03 16:40:38 +05:30
s-aga-r
7548bb3fbe
Merge branch 'develop' into stock-reservation
2023-05-03 12:06:11 +05:30
rohitwaghchaure
01bfd2ab67
Merge pull request #35066 from rohitwaghchaure/fixed-delivered-qty-issue-while-making-mr
...
fix: don't create material request from sales order against delivered items
2023-04-27 09:05:36 +05:30
Rohit Waghchaure
1e2deee579
fix: don't create material request from sales order against the delivered items
2023-04-26 20:30:53 +05:30
mergify[bot]
ab0f7794b7
fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order" ( #34726 )
...
fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order" (#34726 )
* fix: convert asynchronous field update to synchronous
* fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order"
(cherry picked from commit 189b020d228bdb1c0c589697162cf91718b2fa27)
Co-authored-by: danjeremynavarro <46537526+danjeremynavarro@users.noreply.github.com>
2023-04-25 21:08:50 +05:30
Solufy Solution
f1acc5fabb
fix: Bulk Payment Entry from PO/SO ( #34942 )
...
Co-authored-by: Nihantra Patel <n.patel.serpentcs@gmail.com>
2023-04-25 19:16:30 +05:30
s-aga-r
bf4a57a37c
fix: miscellaneous
...
fix: don't reserve stock in group warehouse
fix: partial reservation in multiple warehouses
feat: add prompt to select warehouse and qty for reservation in SO
2023-04-24 22:19:09 +05:30
Marica
88647c63ba
Merge branch 'develop' into bank-trans-party-automatch
2023-04-24 12:13:12 +05:30
s-aga-r
388f85b109
refactor: Stock Reservation
code in sales_order.js
2023-04-24 12:04:22 +05:30
s-aga-r
e517c06847
chore: add warehouse info in SRE msg
2023-04-23 15:45:58 +05:30
s-aga-r
0b5f03e88c
Revert "fix: Reserve and Unreserve buttons visibility in SO"
...
This reverts commit cdb3181691
.
2023-04-23 15:41:48 +05:30
s-aga-r
0cd10a50d2
Merge branch 'develop' into stock-reservation
2023-04-22 10:04:46 +05:30
s-aga-r
28d0629df1
chore: add depends_on
condition for Reserve Stock
field in SO
2023-04-22 10:01:00 +05:30
s-aga-r
cdb3181691
fix: Reserve and Unreserve buttons visibility in SO
2023-04-22 09:49:47 +05:30
Deepesh Garg
a02705ded7
chore: Move source and campaign to more info section ( #34946 )
2023-04-21 13:25:32 +05:30
Vishal Dhayagude
59f3fedbf7
fix: batch qty conversion factor issue fixed in pos transaction ( #34917 )
2023-04-19 15:57:28 +05:30
Marica
fd38e8e0af
Merge branch 'develop' into bank-trans-party-automatch
2023-04-17 16:34:46 +05:30
s-aga-r
dc9bb772cb
refactor(test): use change_settings
instead of update_stock_settings
2023-04-17 15:33:55 +05:30
Sagar Sharma
db7b78328b
Merge branch 'develop' into FIX-ISS-23-24-00171
2023-04-16 20:13:42 +05:30
Shariq Ansari
5a4dd354c1
fix: selling workspace is not migrating properly
2023-04-16 13:10:42 +05:30
s-aga-r
c9418aab45
chore: add items field label
2023-04-14 16:57:14 +05:30
s-aga-r
6c9e419fec
fix: validation for Non-Stock
item in Sales Order Reservation
2023-04-12 16:18:13 +05:30
s-aga-r
e7491d117d
test: add test case for Stock Reservation against SO
2023-04-11 17:25:13 +05:30
s-aga-r
a14a6002e7
Merge branch 'develop' into stock-reservation
2023-04-11 10:00:39 +05:30
s-aga-r
efcb84cedf
test: add test cases for SO
2023-04-11 09:11:51 +05:30
s-aga-r
bc3cb6bff6
fix: cancel SRE on SO cancel
2023-04-11 08:32:37 +05:30
s-aga-r
ac24d778e8
refactor: add Docstrings
for functions
2023-04-05 19:48:15 +05:30
Marica
fcc8f9f164
Merge branch 'develop' into bank-trans-party-automatch
2023-04-05 17:04:07 +05:30
Raffael Meyer
e6a9b6ee95
feat: remove deprecated get_customer_list ( #34624 )
...
feat: remove deprecated method
get_customer_list
2023-04-05 11:56:15 +05:30
s-aga-r
ef34f703d4
fix(ux): don't show Stock Reservation
btn if Stock Reservation is disabled
2023-03-31 22:08:12 +05:30
s-aga-r
632f27b10d
fix(ux): Reserve Stock
and Reserved Stock Qty
in SO Item
2023-03-31 21:58:21 +05:30
s-aga-r
de1492759d
feat: add option to reserve stock in SO
2023-03-31 21:42:13 +05:30
marination
ad31e02616
feat: Store Party bank details in party records (Customer/Supplier/Employee/Shareholder)
2023-04-04 11:45:37 +05:30
s-aga-r
0ae400c986
feat: add option to unreserve stock in SO
2023-03-31 15:38:16 +05:30
s-aga-r
81fe5cfd72
chore: update Reserve Stock
label to Reserve Stock on Submit
in SO
2023-03-31 13:06:30 +05:30
s-aga-r
2d3997b2d7
refactor: remove Against Stock Reservation Entry
field from DN Item
2023-03-31 12:16:59 +05:30
rohitwaghchaure
edb0666b2c
Merge branch 'develop' into fix-reserve-qty
2023-03-30 17:26:32 +05:30
s-aga-r
e286d05904
fix: SRE Available Qty to Reserve
for Group Warehouse
2023-03-30 16:26:42 +05:30
Raffael Meyer
f5453adf4d
fix: switch to supported update_linked_doctypes ( #34625 )
2023-03-29 16:59:10 +05:30
Deepesh Garg
50c1172f29
fix: Party Name in SOA print when viewed from Customer/Supplier master ( #34597 )
...
fix: Party Name in SOA print when viewd from Customer/Supplier master
2023-03-28 15:36:16 +05:30
s-aga-r
7d0bc0914d
Merge branch 'develop' into stock-reservation
2023-03-28 12:25:17 +05:30
s-aga-r
00ac49f81b
refactor(minor): SRE functions
2023-03-27 12:18:40 +05:30
s-aga-r
3602d1909e
fix: map DN items based on SRE
2023-03-26 17:33:01 +05:30
s-aga-r
744166da73
fix(ux): unable to uncheck Reserve Stock
button in SO
2023-03-26 12:14:00 +05:30
s-aga-r
9652cb8de5
chore: create SRE on SO submission
2023-03-25 15:50:00 +05:30
=
1142e69d1a
Merge branch 'develop' into fix-reserve-qty
...
# Conflicts:
# erpnext/selling/doctype/selling_settings/selling_settings.json
2023-03-24 23:50:50 -04:00
Raffael Meyer
8c7fa5712b
feat: deprecate get_customer_list ( #34563 )
2023-03-24 12:13:53 +05:30
Shram Kadia
0cd870fc29
fix: get batch_no. for item automatically ( #34473 )
...
* fix: default pos conversion factor set to 1
* fix:get-batch-no-of-item-automatically
2023-03-24 12:05:26 +05:30
Deepesh Garg
87108be11a
fix: Sales person variance report without item group ( #34552 )
...
fix: Sales person variance report witout item group
2023-03-23 19:19:46 +05:30
s-aga-r
1ccdf588e2
fix(ux): Reserve Stock
button behaviour in SO
2023-03-23 13:34:40 +05:30
Raffael Meyer
f7bf1b8a0c
fix: unset address and contact on trash ( #34495 )
...
* fix(Customer): unset address and contact on trash
* fix(Supplier): unset address and contact on trash
---------
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2023-03-23 11:52:32 +05:30
Raffael Meyer
79911734e9
fix: translations and UX in alternative item mapping ( #34433 )
...
* fix: disable deletion in alternative item mapping
* feat: german translations
* fix: make string translatable
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-03-21 16:20:11 +05:30
Shram Kadia
08fc686513
fix: default pos conversion factor set to 1 ( #34437 )
2023-03-21 15:51:18 +05:30
s-aga-r
f858f657a0
feat: add Stock Reservation Entry
ref in SO connections
2023-03-21 13:28:31 +05:30
s-aga-r
50de868285
chore: add Stock Reserved Qty
field in SO Item
2023-03-21 13:17:58 +05:30
s-aga-r
0700063379
chore: add Reserve Stock
check field in Sales Order
2023-03-20 23:55:33 +05:30
Sagar Sharma
9d49afebde
Merge branch 'develop' into fix-22-23-05686
2023-03-13 17:05:27 +05:30
ruthra kumar
a43304b01b
Merge branch 'develop' into fix_flaky_test_in_payment_terms_report
2023-03-11 13:05:38 +05:30
ruthra kumar
7fcd74ed03
fix(test): flaky test case in Payment terms report
2023-03-10 21:23:12 +05:30
Deepesh Garg
10632d75b0
fix: Do not calculate commission post submit ( #34267 )
...
* fix: Do not calculate commision post submit
* chore: Update condition to match server side logic
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
---------
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-03-07 11:44:09 +05:30
s-aga-r
53701c37b1
feat: consider over_order_allowance
while validating sales order qty
2023-03-03 22:03:54 +05:30
Devin Slauenwhite
6190b4cf63
chore: revert unrelated changes.
2023-03-03 09:42:29 -05:00
s-aga-r
d7da8928ac
feat: add field Over Order Allowance (%)
in Selling Settings
2023-03-03 11:19:28 +05:30
Deepesh Garg
6a89cb98ce
Merge pull request #33874 from frappe/alternative-items-quotation
...
feat: Support for Alternative Items in Quotation
2023-03-01 17:41:24 +05:30
Vishal
f18ae5856f
chore: minor changes in pos_controller
2023-02-28 11:03:26 +05:30
Vishal
1de531e56e
fix: multiple pos conversion issue resolved
2023-02-28 11:03:25 +05:30
ruthra kumar
a11d3327df
fix(test): use standalone method to fetch work orders from SO
2023-02-24 21:07:49 +05:30
ruthra kumar
b6bad728cd
fix: permission error while calling get_work_order_items
2023-02-24 21:07:46 +05:30
Marica
47ab26dedf
Merge branch 'develop' into alternative-items-quotation
2023-02-23 13:20:28 +05:30
ruthra kumar
60d3b86cdb
Merge pull request #34176 from ruthra-kumar/fix_ui_freeze_on_sales_invoice
...
fix: ui freeze on item selection in sales invoice
2023-02-23 10:35:50 +05:30
ruthra kumar
6412583e98
fix: ui freeze on item selection in sales invoice
2023-02-23 09:36:21 +05:30
Deepesh Garg
c88444a6c4
fix: Filters in item-wise sales history report ( #34145 )
2023-02-21 14:26:33 +05:30
marination
6b789e2f04
fix: Map only non alternative items from Quotation in Sales Invoice
...
- Since there's no item selection, only Quotation selection :/
2023-02-20 21:17:43 +05:30
marination
19456127cf
fix: Handle Get Items From
in Sales Order
...
- Map all non alternatives from Quotation to SO if no selected items
- Show disclaimer mentioning that Qtns with alternatives must be mapped to SO from the Qtn form
2023-02-20 20:52:14 +05:30
Marica
3c96791d52
fix: Use block variable
...
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-02-20 12:04:14 +05:30