Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,258 Commits 3 Branches 0 Tags 1 GiB
ca24b5287e
Commit Graph

466 Commits

Author SHA1 Message Date
Ankush Menat
3974fbbb6e
feat: UOM specific barcodes (#30988) 2022-06-01 16:43:56 +05:30
Ankush Menat
ddb46c5711
fix: batch selector flag (#31191) 
This is broken again after serializing scan actions, which causes
selector to trigger before batch_no is set.

Solution: for duration of scan disable the selector
 2022-05-31 14:14:27 +05:30
Deepesh Garg
2a10f09d8d fix: Exchange rate reste to 1 on making mapped doc 2022-05-27 12:12:34 +05:30
Deepesh Garg
54d6cf18fc
fix: Item rate reset on changing posting date (#30990) 
* fix: Item rate reset on changing posting date

* chore: Remove debugger
 2022-05-13 13:07:23 +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
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
Deepesh Garg
9c081947ec fix: Price changing on creating Sales retrun from Delivery Note 2022-04-18 10:21:15 +05:30
Deepesh Garg
cbd8998fc1
Merge branch 'develop' into mergify/bp/develop/pr-30438 2022-04-09 20:03:23 +05:30
Sagar Sharma
e80cd29d2e
Merge branch 'develop' into is-subcontracted-fieldtype 2022-04-04 13:31:46 +05:30
Ankush Menat
6a069d6efa feat: dont trigger selector if all info is scanned 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
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
c34847e801 refactor: dont hardcode child table "items" 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
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
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
Deepesh Garg
78ca88d227 fix: Check if onload property exists in the form object 2022-03-23 13:55:05 +05:30
Deepesh Garg
66ca085e39 fix: Changing item prices on converting orders/receipts to invoices 2022-03-22 23:03:41 +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
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
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
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
Subin Tom
ccf63124d6 fix: Coupon code item pricing dynamic updation issue 2022-02-02 20:13:33 +05:30
Saqib Ansari
f6dda738dc fix: ignore pricing rule in all transactions 2022-01-20 12:22:56 +05:30
Deepesh Garg
6eb3d6a814
fix: Conflicts 2021-12-25 09:04:34 +05:30
Deepesh Garg
2d0208ba1f fix: Add round floats for price list rate 
(cherry picked from commit b60fbf5ba95350e79463f922b0e8dce518780383)
 2021-12-24 14:03:48 +00:00
Deepesh Garg
d19369b198 fix: Recalculate taxes irrespective of price list rate changed or not 
(cherry picked from commit 233f79bf960381b1c2bd753d783afd3020b377e0)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2021-12-24 14:03:48 +00:00
Deepesh Garg
4756fbc253 fix: Linting issues 
(cherry picked from commit 0980c2f9816b3e4a11b5410b5997a72b1cad28fd)
 2021-12-24 14:03:47 +00:00
Deepesh Garg
ab09dc545e fix(UX): Optimize rate updation of changing price list 
(cherry picked from commit 6087d5a6038d6e636ce1ba006ebd59e820b3cd8e)
 2021-12-24 14:03:47 +00:00
Saqib
4889661e5c
fix: actual tax conversion in case of multicurrency invoices (#28539) 2021-12-02 11:37:08 +05:30
Subin Tom
c78b8b7897 fix: Shipping Rule picking up old net_rate 2021-11-09 14:46:45 +05:30
Marica
c75c709114
Merge branch 'develop' into scan-batch 2021-09-30 14:07:54 +05:30
marination
abf450dc70 fix: Increment batch qty if pre-existing batch is scanned 2021-09-30 14:03:40 +05:30
Alan
72c081fd8f
fix: apply price list after batch or serial no insertion (#27566) 2021-09-28 12:56:26 +05:30
marination
596cf3951d fix: Batch scans get overwritten on the same row 2021-09-27 15:06:46 +05:30
Frappe PR Bot
4f7af79c31
fix: PO/PINV - Check if doctype has company_address field before setting the value (#27441) (#27576) 
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
(cherry picked from commit 666eaae6ce976c5d820b3b9f91d23a0ed28a263a)

Co-authored-by: vama <vamagithub@gmail.com>
 2021-09-18 13:34:27 +05:30
rohitwaghchaure
7b4a65484a
fix: manually added weight per unit reset to zero after save (#27330) 2021-09-03 22:00:14 +05:30
Deepesh Garg
fd467e6d32
fix: Correct company address not getting copied from Purchase Order to Invoice (#27217) 
* fix: Correct company adderess not getting copied from Purchase Order to Invoice

* fix: Linting issues
 2021-08-30 17:53:59 +05:30
Subin Tom
d4d5a4221a
feat: coupon code discount in pos invoice (#27004) 2021-08-24 16:22:46 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning (#26990) 2021-08-20 11:09:51 +05:30
Marica
7cbd755951
Merge branch 'develop' into serial-no-space 2021-07-30 14:09:19 +05:30