ruthra kumar
b2ed9fd3fe
refactor: use group fields from Sales Order and Sales Order Items
2022-04-04 17:00:47 +05:30
ruthra kumar
e324d668d3
refactor: item filters are linked with group filters
2022-04-04 14:52:19 +05:30
ruthra kumar
7558f1b078
refactor: adding new filters and column to test cases
2022-03-30 18:50:18 +05:30
ruthra kumar
eaeadbc422
feat: additional filters in payment terms status report
2022-03-30 18:50:13 +05:30
Ankush Menat
b12fe0f15b
fix: dont check for failed repost while freezing ( #30472 )
...
[skip ci]
2022-03-29 13:54:26 +05:30
Ankush Menat
d29e314c81
ci: pin click for black ( #30464 )
...
[skip ci]
2022-03-29 11:47:28 +05:30
Ankush Menat
76dce2eddc
fix: use name for links not item_code ( #30462 )
2022-03-29 11:21:03 +05:30
Deepesh Garg
760e68b656
Merge pull request #30426 from frappe/mergify/bp/develop/pr-30395
...
fix: Write off amount wrongly calculated in POS Invoice (backport #30395 )
2022-03-29 07:56:15 +05:30
Ankush Menat
3821a97a75
Merge branch 'develop' into mergify/bp/develop/pr-30395
2022-03-28 20:14:19 +05:30
Ankush Menat
7c0c31bc6a
Merge pull request #29783 from ankush/format
...
style: force auto-formatted code
2022-03-28 19:19:02 +05:30
Ankush Menat
b0f7931b2b
chore: ignore black formatting changes in blame
2022-03-28 18:54:12 +05:30
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Ankush Menat
21e00da3d6
ci: force black formatting (pre-commit)
2022-03-28 18:47:20 +05:30
Ankush Menat
8dff4d66a4
fix: bom valuation - handle lack of LPP ( #30454 )
2022-03-28 18:18:23 +05:30
Sagar Vora
77c36f6d22
fix: set options for Currency field Incoming Rate ( #30384 )
2022-03-28 17:55:23 +05:30
Raffael Meyer
c01fe74cf0
fix(patch): fix failing patches ( #30427 )
...
* patch: reload Opportunity
* patch: reload child tables before doctype
2022-03-28 17:53:54 +05:30
Saqib Ansari
eea183957a
Merge pull request #30419 from nextchamp-saqib/fix-item-tax-template-patch
...
fix: move item tax to item tax template patch
2022-03-28 17:34:31 +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
Ankush Menat
69ae2661d2
fix: update picked qty on cancellation
2022-03-28 10:43:32 +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
Ankush Menat
e401ad3f90
refactor: replace dead duplicate code
2022-03-26 19:33:00 +05:30
Ankush Menat
9daea6fa6c
perf: slimmer and faster before_tests
2022-03-26 19:33:00 +05:30
Saqib Ansari
c10e4977c3
Merge pull request #30420 from nextchamp-saqib/fix-minor-custom-cash-flow
...
fix: unsupported operand type(s) for +=: 'int' and 'NoneType'
2022-03-26 19:15:34 +05:30
Saqib Ansari
4766732b56
Merge branch 'develop' into fix-item-tax-template-patch
2022-03-26 11:48:41 +05:30
Saqib Ansari
8e7c214e9e
Merge branch 'develop' into fix-minor-custom-cash-flow
2022-03-26 11:48:40 +05:30
Deepesh Garg
0312c502ac
Merge pull request #30430 from frappe/mergify/bp/develop/pr-30429
...
fix: Check for onload property (backport #30429 )
2022-03-25 21:54:59 +05:30
Deepesh Garg
2e9648538e
fix: Check for onload property
...
(cherry picked from commit 71402b43a776d4af98912223c8299c4fd8bfbbfe)
2022-03-25 16:23:44 +00:00
Rucha Mahabal
ffec9516fa
fix: do not update status to Paid if sanctioned amount is 0
2022-03-25 21:41:48 +05:30
Rucha Mahabal
2d915782cb
chore: sort imports
2022-03-25 21:41:48 +05:30
Rucha Mahabal
edf0c0030e
test: expense claim against fully and partially paid advances
2022-03-25 21:41:48 +05:30
Rucha Mahabal
0461223627
fix: Expense Claim conditions for Paid status
...
- status doesn't change to Paid if the entire required amount is already covered via linked advances
- status doesn't change to Paid if the claim is partially paid via advances
- patch to update such uncancelled claims to Paid
2022-03-25 21:41:48 +05:30
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
b2ac773cca
fix: Ignore for Purchase Invoices
...
(cherry picked from commit d3fd2fd2c535733939ed69439301033052f45712)
2022-03-25 15:27:11 +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
