Ankush Menat
ab80783e3a
refactor: single function to fetch related row
...
There was separate function for batch row which frequently didn't
receive all the love main function received like:
1. empty row reuse
2. max qty validation
Hence it makes sense to combine these in one fat function
2022-05-11 19:27:16 +05:30
Ankush Menat
d35a13ec7e
refactor: change alert duration to 3 and modern js
2022-05-11 18:52:14 +05:30
Ankush Menat
7f14222700
docs: document barcode_scanner API
2022-05-11 18:45:31 +05:30
marination
90a8e924f5
fix: set_missing_values in SE and re-use the same on all SE mappings
...
- `set_missing_values` in SE will set actual qty, transfer qty and calculate rate/amount
- Re-use `set_missing_values` wherever SE is doc is being mapped
2022-05-11 14:54:22 +05:30
Saqib Ansari
a1e3ae8869
fix: user can select disabled accounts in taxes table
2022-05-11 13:01:06 +05:30
marination
494ddd1eb4
fix: Calculate totals even though pricing rule is not applied on mapped doc
...
- `apply_pricing_rule` is triggered due to change in some data which most likely contributes to Total.
2022-05-10 14:02:43 +05:30
Devin Slauenwhite
0a77c28594
fix: cast value to Number type
2022-05-05 10:46:40 -04:00
Devin Slauenwhite
47b4251844
feat: prompt qty on scan
2022-05-05 09:39:19 -04:00
Devin Slauenwhite
7ae89dedd5
fix: cleanup dont_allow_new_row logic
2022-05-04 11:06:16 -04:00
Devin Slauenwhite
5560ceca62
fix: max qty message
...
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-05-04 10:32:21 -04:00
Devin Slauenwhite
afb841c771
Merge branch 'develop' into feat-picklist-scan
2022-05-03 11:15:42 -04:00
Deepesh Garg
2e3e666784
Merge branch 'develop' of https://github.com/frappe/erpnext into erpnext_setup_cleanup
2022-05-03 18:17:36 +05:30
Devin Slauenwhite
48128911be
fix: syntax
2022-04-29 16:27:15 -04:00
Deepesh Garg
60b693f84f
chore: clean up hooks
2022-04-28 12:02:54 +05:30
Deepesh Garg
41e2959389
chore: remove files related to LMS
2022-04-28 10:41:30 +05:30
Devin Slauenwhite
ceffbf243e
fix: show alert when maximum qty scanned is reached
2022-04-27 22:07:25 -04:00
Devin Slauenwhite
159cf2848e
fix: get correct row to modify with duplicate item_codes and max_qty fields are present
2022-04-27 22:03:39 -04:00
Deepesh Garg
429361ce87
chore: Remove domains from Setup
2022-04-27 13:32:51 +05:30
Deepesh Garg
9c081947ec
fix: Price changing on creating Sales retrun from Delivery Note
2022-04-18 10:21:15 +05:30
Suraj Shetty
d890ee9495
Merge pull request #29962 from nemesis189/exotel-fixes
...
fix: Exotel Call Log fixes
2022-04-13 20:36:03 +05:30
Deepesh Garg
227a711d70
Merge pull request #30585 from frappe/mergify/bp/develop/pr-30575
...
fix: Do not apply shipping rule for POS transactions (backport #30575 )
2022-04-10 20:12:53 +05:30
Deepesh Garg
cbd8998fc1
Merge branch 'develop' into mergify/bp/develop/pr-30438
2022-04-09 20:03:23 +05:30
Deepesh Garg
e30cc8422c
fix: Resolve conflicts
2022-04-09 19:53:40 +05:30
Suraj Shetty
199419db80
Merge branch 'develop' into exotel-fixes
2022-04-08 21:37:08 +05:30
Ankush Menat
225deb949b
fix: use empty row when batch is scanned ( #30638 )
2022-04-07 21:38:18 +05:30
Ankush Menat
8b090a9f7d
fix: hide pending qty only if original item is assigned ( #30599 )
2022-04-06 16:35:36 +05:30
Deepesh Garg
714fc08150
fix: Do not apply shipping rule for POS transactions
...
(cherry picked from commit c0ebcfb39331caa678d36cc4694490a2363f10a0)
# Conflicts:
# erpnext/public/js/controllers/taxes_and_totals.js
2022-04-06 04:31:13 +00:00
Suraj Shetty
117e5d05a3
Merge branch 'develop' into exotel-fixes
2022-04-04 18:21:46 +05:30
Sagar Sharma
e80cd29d2e
Merge branch 'develop' into is-subcontracted-fieldtype
2022-04-04 13:31:46 +05:30
Suraj Shetty
6644ebd52d
Merge branch 'develop' into exotel-fixes
2022-04-03 21:17:29 +05:30
Ankush Menat
6a069d6efa
feat: dont trigger selector if all info is scanned
2022-04-01 21:11:03 +05:30
Ankush Menat
47f27a5171
refactor: move scan api to stock utils; add item_info
2022-04-01 21:11:03 +05:30
Ankush Menat
9bf427985f
fix!: remove barcode field triggers
...
use "scan barcode" field instead for scanning
[skip ci]
2022-04-01 21:11:03 +05:30
Ankush Menat
530f767098
revert: "fix: ignore circular dependencies on barcode scan"
...
This reverts commit 98468fab18
2022-04-01 21:11:03 +05:30
Sagar Sharma
d074c93ac7
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-04-01 13:22:44 +05:30
Ankush Menat
3821a97a75
Merge branch 'develop' into mergify/bp/develop/pr-30395
2022-03-28 20:14:19 +05:30
Ankush Menat
7ef54809be
Merge branch 'develop' into exotel-fixes
2022-03-28 19:55:39 +05:30
Ankush Menat
b58b1343bb
refactor: dont harcode "serial_no" field
2022-03-28 12:07:00 +05:30
Ankush Menat
98468fab18
fix: ignore circular dependencies on barcode scan
2022-03-28 12:07:00 +05:30
Ankush Menat
806f420ddd
fix: revert global flag added for erasing barcode
...
This looked like a hack and doesn't even work anyway! how can row level
barcode-item relation be maitnained on entire form?
2022-03-28 12:07:00 +05:30
Ankush Menat
17a2ceb5d1
style: prettier js
2022-03-28 12:07:00 +05:30
Ankush Menat
9f0e7949aa
fix: clean up if item is not found
2022-03-28 12:07:00 +05:30
Ankush Menat
32e44f5121
fix: correctly capture first serial no
2022-03-28 12:07:00 +05:30
Ankush Menat
b3c604d679
refactor: dont hardcode child table name
2022-03-28 12:07:00 +05:30
Ankush Menat
3a8656b3c8
refactor: split data update responsibilty to multiple functions
...
Apply "single responsibilty principle"
2022-03-28 12:07:00 +05:30
Ankush Menat
c34847e801
refactor: dont hardcode child table "items"
2022-03-28 12:07:00 +05:30
Ankush Menat
893139f963
refactor: dont hardcode "scan_barcode" field
2022-03-28 12:07:00 +05:30
Ankush Menat
bd06ffab00
refactor: store scannned field as attr
2022-03-28 12:07:00 +05:30
Ankush Menat
2d15413c9e
refactor: transaction.js -> barcode_scanner.js
2022-03-28 12:07:00 +05:30
Ankush Menat
18abb28744
fix(barcode_scan): dont add duplicate serial nos
2022-03-28 12:07:00 +05:30
Ankush Menat
b06123bc65
fix: trigger table_add on new row
2022-03-28 12:07:00 +05:30
Ankush Menat
a270f12855
fix(UX): reduce duration of barcode scan toasts
...
default is 7 which is bit too much when you're scanning lots of items,
switched to 5 sec delay
2022-03-28 12:07:00 +05:30
Deepesh Garg
33fa14b6cf
fix: Resolve conflicts
2022-03-27 19:23:53 +05:30
Deepesh Garg
18c5b24ac1
fix: Update condition
2022-03-27 19:20:37 +05:30
Deepesh Garg
fc09377de2
fix: Resolve conflicts
2022-03-27 19:18:32 +05:30
Deepesh Garg
485e6b6a09
fix: Incorrect default amount to pay for POS invoices
...
(cherry picked from commit a044e9268786b3395f2e33fd5b79e64bc60160a5)
# Conflicts:
# erpnext/public/js/controllers/taxes_and_totals.js
2022-03-27 12:31:36 +00:00
Deepesh Garg
2e9648538e
fix: Check for onload property
...
(cherry picked from commit 71402b43a776d4af98912223c8299c4fd8bfbbfe)
2022-03-25 16:23:44 +00:00
Deepesh Garg
19b1b1f4ba
test: test for auto write-off amount
...
(cherry picked from commit 6a50f36b3167d43b1e964d4f0cf96af587f1a4a2)
# Conflicts:
# erpnext/public/js/controllers/taxes_and_totals.js
2022-03-25 15:27:12 +00:00
Deepesh Garg
8cfa3a9ece
fix: Ignore for Purchase Invoices
...
(cherry picked from commit ed38679d222e12709396fbb8dacbe9e25ea38ed7)
# Conflicts:
# erpnext/public/js/controllers/taxes_and_totals.js
2022-03-25 15:27:11 +00:00
Deepesh Garg
d04d3038f5
fix: Client side changes for POS Write off amount
...
(cherry picked from commit 2e33e748ea248acface128f759d3982635024399)
# Conflicts:
# erpnext/public/js/controllers/taxes_and_totals.js
2022-03-25 15:27:10 +00:00
Deepesh Garg
54cdff7947
fix: Add back calculation for discount
...
(cherry picked from commit 067564bd260437290b7cb190fb1cdc02eb658d0a)
2022-03-25 07:30:40 +00:00
Deepesh Garg
174a6ec398
fix: Rate change issue on save and mapping from other doc
...
(cherry picked from commit 13fcda57767c456dfca4c064c41ca4f80a1898b2)
2022-03-25 07:30:40 +00:00
Ankush Menat
4aa74af90d
fix: ignore items without info for pending qty computation
2022-03-23 15:46:40 +05:30
Ankush Menat
be16fb9dbb
chore(DX): add sourceURL for debugging
2022-03-23 15:46:40 +05:30
Deepesh Garg
78ca88d227
fix: Check if onload property exists in the form object
2022-03-23 13:55:05 +05:30
Deepesh Garg
3a1e31592e
Merge branch 'develop' into ignore_price_list
2022-03-23 09:27:44 +05:30
Deepesh Garg
66ca085e39
fix: Changing item prices on converting orders/receipts to invoices
2022-03-22 23:03:41 +05:30
marination
f6e64c2cac
fix: Product Filters Lookup
...
- bind the right classes to the filter lookup field
- make class names more descriptive
- make filter lookup field more visible with white bg and border
- bind lookup input field js in `views.js`
- make filter lookup field functioning for atribute filters too
- added placeholder to lookup field
2022-03-21 17:58:39 +05:30
Ankush Menat
0a533d6ccc
fix: skip already selected serials in sr selector
2022-03-19 20:55:27 +05:30
Ankush Menat
5ec27c9055
fix: filter serial nos by selected batch number
2022-03-19 20:55:27 +05:30
Ankush Menat
f4c213379e
fix: set current qty as default qty for stock entry
2022-03-19 20:55:27 +05:30
marination
8264d6b0bc
fix: Sub-Categpry Routing in Item Group Page Listing pills
...
- Use absolute route even 3-4 sub-category levels down
- Remove scroll from category pills due to accessibility issues
- Arrange sub-category pills alphabetically
2022-03-15 16:53:46 +05:30
Deepesh Garg
d596e0e4df
fix: Shipping rule application fixes
2022-03-10 20:56:36 +05:30
Subin Tom
1ab5b7a811
fix: linter, sider fixes
2022-02-28 12:47:05 +05:30
Rushabh Mehta
1e7df5d0c2
fix(minor): student attendance tool query fix
2022-02-26 11:07:44 +05:30
Rucha Mahabal
71d33081aa
fix: org chart connectors not rendered when Employee Naming is set to Full Name ( #29997 )
2022-02-25 23:01:32 +05:30
Subin Tom
f1f3e035a6
Merge branch 'exotel-fixes' of https://github.com/nemesis189/erpnext into exotel-fixes
2022-02-25 16:59:35 +05:30
Subin Tom
5b79496f05
fix: call type doctype, fixes
2022-02-25 16:52:25 +05:30
Deepesh Garg
25edc700bd
Merge pull request #29974 from deepeshgarg007/abbr_check
...
fix: Make abbreviation limit to 10
2022-02-25 15:52:51 +05:30
Saqib Ansari
81514516f3
fix(pos): coupon code is applied even if ignore pricing rule is check
2022-02-25 15:18:06 +05:30
Subin Tom
a91fb88929
fix: sider fixes
2022-02-25 13:45:26 +05:30
Subin Tom
00b0f10100
fix: added type of call select field, additional status for agent rejecting call
2022-02-25 13:38:57 +05:30
Deepesh Garg
239733acd1
fix: Make abbreviation limit to 10
2022-02-23 20:41:49 +05:30
Marica
856d3f63b5
Merge pull request #29953 from marination/heart-icon-and-shop-by-category
...
chore: Adjust heart icon to v14 icons in frappe (make consistent with v13) & misc fix
2022-02-23 13:01:30 +05:30
marination
b0a1cd6a7b
chore: Change heart icon to icon-heart and change var icon-stroke to accomodate changes in frappe icon
...
- `icon-heart` got a stroke colour that needs to be overriden via var `icon-stroke
- Use `icon-heart` instead of `icon-heart-active` as the latter has a color fill now
2022-02-23 00:13:44 +05:30
Deepesh Garg
bd80e04aa7
Merge pull request #29865 from deepeshgarg007/loan_bank_reco
...
feat: Bank Reconciliation for loan documents
2022-02-22 20:43:00 +05:30
Marica
235fc127b3
fix: Fetch conversion factor even if it already existed in row, on item change ( #29917 )
...
* fix: Fetch conversion factor even if it already existed in row, on item change
* fix: Retain manually changed conversion factor
- If item code changes, reset conversion factor on client side
- Keep API behavious consistent, if conversion factor is sent, same must come back
- API should not ideally reset values in most cases
2022-02-22 12:53:46 +05:30
Deepesh Garg
0d8c24f488
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 22:22:02 +05:30
Ankush Menat
342d09a671
feat: get_valuation_rate batch wise
...
This function is used to show valuation rate on frontend and also as
fallback in case values aren't available. Add "batch_no" param to get
batch specific valuation rates.
Co-Authored-By: Alan Tom <2.alan.tom@gmail.com>
2022-02-21 18:02:40 +05:30
Deepesh Garg
b7c388976d
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 16:58:52 +05:30
Deepesh Garg
555b1335f6
feat: Bank Reconciliation for loan documents
2022-02-17 19:15:30 +05:30
Saqib Ansari
2743999785
fix: coupon code is applied even if ignore_pricing_rule is enabled
2022-02-17 16:03:43 +05:30
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-08 15:29:28 +05:30
Saqib Ansari
5e32b809cb
Merge pull request #29599 from nemesis189/coupon-code-issue-pos
...
fix: Coupon code item pricing dynamic updation issue in pos screen
2022-02-08 11:50:19 +05:30
Saqib Ansari
4c3d751421
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-08 11:42:33 +05:30
Mohammed Yusuf Shaikh
a3e69cf75d
feat: Bulk Transaction Processing ( #28580 )
...
* feat: Bulk Transaction Processing
* fix: add flags to ignore validations and exception handling correction
* fix: remove duplicate code, added logger functionality and improved notifications
* fix: linting and sider issues
* test: added tests
* fix: linter issues
* fix: failing test case
* fix: sider issues and test cases
* refactor: mapping function calls to create order/invoice
* fix: added more test cases to increase coverage
* fix: test cases
* fix: sider issue
* fix: rename doctype, improve formatting and minor refactor
* fix: update doctype name in hooks and sider issues
* fix: entry log test case
* fix: typos, translations and company name in tests
* fix: linter issues and translations
* fix: linter issue
* fix: split into separate function for marking failed transaction
* fix: typos, retry failed transaction logic and make log read only
* fix: hide retry button when no failed transactions and remove test cases not rrelevant
* fix: sider issues and indentation to tabs
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-02-08 01:00:37 +05:30
Marica
79ab8e6459
Merge pull request #29456 from marination/product-bundle-packing-list-logic
...
fix: Incorrect packing list for recurring items & code cleanup
2022-02-03 22:09:52 +05:30
marination
017a882f90
fix: Remove cart.js from erpnext-web bundle
...
- Due to it being in the bundle, controls bundle was required for Dialogs used in cart
- But this is exclusively used in `cart.html`
- It has no reason to load and break the login page
- Moved it back to where the html is, it is now back to being tightly coupled with its html
2022-02-03 21:34:48 +05:30
Suraj Shetty
e652ab5f05
fix: Load control & dialog assets with cart.js
...
Previously, control & dialog assets were getting loaded only on visiting "/cart", but since cart.js sets up various events on homepage, dialog related assets are required up-front.
2022-02-03 20:06:24 +05:30
Marica
e9fc6c3249
Merge branch 'develop' into product-bundle-packing-list-logic
2022-02-03 17:02:57 +05:30
