Deepesh Garg
3b15966cc9
fix: Cash and non trade discount calculation
2022-08-21 17:51:05 +05:30
Sagar Vora
a3625b3817
fix: set billing_address for purchases in get_party_details
2022-08-08 06:04:10 +00:00
Marc de Lima Lucio
048c037842
FIX: quality inspection quick creation from purchase receipt: pre-fill sample size if available ( #31544 )
...
FIX: quality inspection quick creation from transaction documents: pre-fill sample size if available
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2022-07-21 13:46:59 +05:30
Sagar Sharma
f75d35ed60
Merge branch 'develop' into subcontracting
2022-07-05 11:25:08 +05:30
Deepesh Garg
6bb203d1f5
Merge pull request #31410 from alyf-de/apply-price-list
...
fix: apply price list rate
2022-07-02 22:47:55 +05:30
Ankush Menat
7e40c86c56
fix(UX): dont apply price list when changing batch on mapped docs ( #31503 )
...
fix(UX): dont apply price list batch change on mapped docs
2022-07-01 20:08:16 +05:30
s-aga-r
f6ef3068d7
Merge branch 'develop' into subcontracting
2022-06-20 23:10:31 +05:30
s-aga-r
6d89b2fa28
refactor: backport old subcontracting code
2022-06-20 23:10:02 +05:30
barredterra
e2295b4e2f
fix: apply price list rate
2022-06-20 18:52:40 +02:00
Sagar Vora
1a3997a566
fix: transaction date gets unset in material request ( #31327 )
...
* fix: set date correctly in material request
* fix: use only `transaction_date` in `get_item_details`
2022-06-16 22:33:47 +05:30
Sagar Sharma
74fae72939
Merge branch 'develop' into subcontracting
2022-06-06 10:27:25 +05:30
Deepesh Garg
21de550549
Merge pull request #31219 from deepeshgarg007/group_filter_cost_center
...
fix: Parent dimension filters in orders
2022-06-06 08:58:40 +05:30
s-aga-r
992ba974e2
Merge branch 'develop' into subcontracting
2022-06-03 13:25:49 +05:30
Deepesh Garg
3f376cc3a5
fix: Parent dimension filters in orders
2022-06-02 13:57:54 +05:30
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
Sagar Sharma
4ff734c25a
Merge branch 'develop' into subcontracting
2022-05-25 12:32:33 +05:30
Saqib Ansari
268f413f56
fix(pos): paid amount calculation for multicurrency invoice ( #31112 )
2022-05-25 11:40:49 +05:30
Sagar Sharma
213113bc00
Merge branch 'develop' into subcontracting
2022-05-20 12:13:13 +05:30
Sagar Sharma
409df263e8
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-05-20 10:45:33 +05:30
Sagar Sharma
77db843692
refactor!: Make required changes to create SCO from PO
2022-05-20 10:45:30 +05:30
Ankush Menat
0e875f5049
fix: hide template items from sales/purchase order
2022-05-16 12:14:07 +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
Saqib Ansari
319c858d63
Merge pull request #30968 from nextchamp-saqib/validate-on-hold-invs
...
fix(accounts): minor fixes & validations
2022-05-12 22:06:35 +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
Deepesh Garg
9c081947ec
fix: Price changing on creating Sales retrun from Delivery Note
2022-04-18 10:21:15 +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
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
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
3821a97a75
Merge branch 'develop' into mergify/bp/develop/pr-30395
2022-03-28 20:14:19 +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
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
