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
