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

2243 Commits

Author SHA1 Message Date
Deepesh Garg
2a10f09d8d fix: Exchange rate reste to 1 on making mapped doc 2022-05-27 12:12:34 +05:30
Saqib Ansari
268f413f56
fix(pos): paid amount calculation for multicurrency invoice (#31112) 2022-05-25 11:40:49 +05:30
Deepak
867f2c6282
fix: TypeError in add_indicator_for_multicompany (#31042) 
Minor fix in add_indicator_for_multicompany

In case of multi-company transactions add (+) buttons in connection dashboard pf customer aren't being loaded due to TypeError (TypeError: e.dashboard.stats_area.removeClass is not a function) created by "frm.dashboard.stats_area.removeClass('hidden');" during the stats section creation.
 2022-05-17 11:52:52 +05:30
Marica
e3d53413d1
Merge pull request #31025 from ankush/hide_variants_order 
fix: hide template items from sales/purchase order
 2022-05-16 13:59:57 +05:30
Devin Slauenwhite
d76e1b7576
feat: barcode scanner promise to return scanned row. (#31018) 
* feat: barcode scanner promise to return scanned row.

* fix: missing reject at alternate code path
 2022-05-16 13:14:26 +05:30
Ankush Menat
0e875f5049 fix: hide template items from sales/purchase order 2022-05-16 12:14:07 +05:30
Rohit Waghchaure
69be22ba7c fix: select multiple values for accounting dimenssion 2022-05-14 17:19: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
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
Marica
3d96ad2afa
Merge pull request #30950 from marination/actual-qty-total-js-reactive 
fix: Set actual qty and basic rate in SE on warehouse triggers (`get_warehouse_details`)
 2022-05-11 20:13:54 +05:30
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 98468fab18e08de440f2f6731759d221fe08c416.
 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