nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 23:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,655 Commits 459 Branches 1,746 Tags
4e2ed6f9d9cf6e7df8a047bfcb59a00b81970871
Commit Graph

40655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marination
8b5e759965 fix: Sider and Linter 
(cherry picked from commit 3e3af95712)
 2022-03-31 10:25:43 +00:00
marination
444af4588f feat: List View indicators for Log and Error Log link in log 
(cherry picked from commit 8aff75f8e8)
 2022-03-31 10:25:42 +00:00
marination
59af556241 chore: Polish error handling and code sepration 
- Added Typing
- Moved all job business logic to bom update log
- Added `run_bom_job` that handles errors and runs either of two methods
- UX: Replace button disabled until both inputs are filled
- Show log creation message on UI for correctness
- APIs return log document as result
- Converted raw sql to QB

(cherry picked from commit cff91558d4)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
 2022-03-31 10:25:41 +00:00
marination
7aa37ec511 feat: BOM Update Log 
- Created BOM Update Log that will handle queued job status and failures
- Moved validation and BG job to thus new doctype
- BOM Update Tool only works as an endpoint

(cherry picked from commit 4283a13e5a)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
 2022-03-31 10:25:39 +00:00
marination
7317a0696b refactor: Add exception handling in background job within BOM Update Tool 
(cherry picked from commit f57725f8fa)
 2022-03-31 10:25:37 +00:00
marination
40a154e64d fix: (test) change expected exception due to https://github.com/frappe/frappe/pull/16454 
(cherry picked from commit 93f6346cea)
 2022-03-31 09:23:47 +00:00
marination
84247e91f3 fix: Add non-existent Item check and cleanup in validate_for_items 
- Added a validation if invalid item code ia passed via data import/API, etc.
- Used DB APIs instead of raw sql
- Separated checks into separate functions
- Added return types to functions
- Better variable naming and removed redundant utils import in function

(cherry picked from commit 982a246eec)
 2022-03-31 09:23:46 +00:00
Saqib Ansari
ab7417c26a fix: invalid keyword argument 'pluck' 2022-03-31 14:38:40 +05:30
Saqib Ansari
0bafec2384 fix: merge conflicts 2022-03-31 14:24:42 +05:30
Saqib Ansari
a51b32b7e0 fix: merge conflicts 2022-03-31 14:19:53 +05:30
Saqib Ansari
47567c66c1 chore: ignore rules for QB formatting 
(cherry picked from commit e0c36d87e0)
 2022-03-31 08:47:20 +00:00
Saqib Ansari
82aea2b998 fix: set is_return & return_against in POS Invoice Reference table 
(cherry picked from commit 16253a2f72)

# Conflicts:
#	erpnext/patches.txt
 2022-03-31 08:47:20 +00:00
Saqib Ansari
cf3e09588f fix: test cases 
(cherry picked from commit 1b556d1c53)
 2022-03-31 08:47:18 +00:00
Saqib Ansari
650274e973 fix: sider issues 
(cherry picked from commit cb4873c019)
 2022-03-31 08:47:17 +00:00
Saqib Ansari
3bb0716dff fix(pos): cannot close the pos if sr. no. is sold & returned 
(cherry picked from commit cf51a0a1b8)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
#	erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py
 2022-03-31 08:47:17 +00:00
Saqib Ansari
36845a87e0 fix(pos): remove returned sr. nos. from pos reserved sr. nos. list 
(cherry picked from commit f2ae63cbfd)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
#	erpnext/stock/doctype/serial_no/serial_no.py
 2022-03-31 08:47:15 +00:00
Saqib Ansari
76f83ea559 fix(pos): allow validating stock on save 
(cherry picked from commit aff7408775)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
 2022-03-31 08:47:13 +00:00
Saqib Ansari
3b583c6c48 fix(pos): specific case when serialized item not removed 
(cherry picked from commit 4afb47e869)
 2022-03-31 08:47:11 +00:00
Saqib Ansari
a3a7dc9ce6 fix(pos): customer group filter in customer selector 
(cherry picked from commit 2f82e237ef)
 2022-03-31 08:47:10 +00:00
Saqib Ansari
bd2061d6f3 fix: prevent multiple save on applying coupon code 
(cherry picked from commit d5fd8e0ba6)
 2022-03-31 08:47:09 +00:00
Saqib Ansari
b4a10d571f fix(test): Item MacBook does not exist 
(cherry picked from commit 4623a1bc57)
 2022-03-31 08:46:17 +00:00
Saqib Ansari
c36b5d9ab8 perf: skip warehouse validation for non-stock items 
(cherry picked from commit 199a6da960)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2022-03-31 08:46:16 +00:00
Saqib Ansari
ad91d57a41 perf: skip warehouse validation for non-stock items 
(cherry picked from commit 6528218ac3)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
 2022-03-31 08:46:15 +00:00
Saqib Ansari
00cb0d0294 fix(asset): do not validate warehouse on asset purchase 
(cherry picked from commit 136466d255)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
 2022-03-31 08:46:13 +00:00
Deepesh Garg
ebb2e975cd fix: make test record 
(cherry picked from commit d93edbc859)
 2022-03-31 08:10:25 +00:00
Deepesh Garg
168cc353ca fix: Account currency validation 
(cherry picked from commit d4cc7c553e)
 2022-03-31 08:10:25 +00:00
Anupam
444625a0ca fix: linter issues 2022-03-31 13:38:37 +05:30
Saqib Ansari
9ffe34757e Merge pull request #30455 from frappe/mergify/bp/version-13-hotfix/pr-30419 
fix: move item tax to item tax template patch (backport #30419)
 2022-03-31 12:43:15 +05:30
Anupam
af2d55f893 Merge branch 'crm-contract-naming-v13' of github.com:anupamvs/erpnext into crm-contract-naming-v13 2022-03-31 12:05:46 +05:30
Anupam
20ef6ab5bf fix: review changes 2022-03-31 12:04:53 +05:30
Saqib Ansari
1a169c9dc5 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-30419 2022-03-31 12:02:15 +05:30
mergify[bot]
22ec1a4996 fix: enable row deletion in reference table (#30492) 
(cherry picked from commit 500870b2b0)

Co-authored-by: rahib-hassan <rahib.hassan10@gmail.com>
 2022-03-30 16:37:00 +05:30
Anoop
3f3717952c fix: cast array slice index integer while splitting serial_nos array (#30468) 2022-03-30 16:36:15 +05:30
mergify[bot]
c7d8d60de6 fix: explicitly check if additional salary is recurring while fetching components for payroll (backport #30489) (#30491) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-30 15:07:56 +05:30
Saqib Ansari
6397456ba6 Merge pull request #30484 from frappe/mergify/bp/version-13-hotfix/pr-30470 
fix: credit limit validation in delivery note (backport #30470)
 2022-03-30 14:57:49 +05:30
mergify[bot]
46e6d16c49 fix: Dont set idx while adding WO items to Stock Entry (backport #30377) (#30485) 
* fix: Dont set `idx` while adding WO items to Stock Entry

- `idx` must be computed by base document's `self.append()` function, so do not set it

(cherry picked from commit a787ebb732)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py

* chore: Remove redundant idx query and value setting

- idx can be removed from `select_columns` as it is already in the main query
- setting idx to '' is not required as it is not used further

(cherry picked from commit 639d380c1f)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py

* test: idx mapping correctness

(cherry picked from commit fa3b953cf7)

* fix: Linter

(cherry picked from commit b5ad626d23)

* fix: resolve conflicts

Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-30 12:05:26 +05:30
Saqib Ansari
c9cd3ee9aa fix: credit limit validation in delivery note 
(cherry picked from commit c122882884)
 2022-03-30 05:39:15 +00:00
Ankush Menat
7a2729e5bb Merge branch 'version-13-hotfix' into version-13-pre-release 2022-03-29 18:41:22 +05:30
mergify[bot]
39ff7b0b06 fix: validate 0 transfer qty in stock entry (#30476) (#30479) 
(cherry picked from commit b80fac03af)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-29 18:18:13 +05:30
Ankush Menat
eedfee367c Merge pull request #30478 from ankush/format_v13 
style: bulk formatting (v13 port)
 2022-03-29 17:51:30 +05:30
Ankush Menat
14c8386040 chore: ignore black formatting commit in blame 2022-03-29 17:31:43 +05:30
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
Ankush Menat
7cc84dcbb4 ci: pin click for black (#30464) 
[skip ci]
 2022-03-29 17:26:42 +05:30
Ankush Menat
68ded18a23 ci: force black formatting (pre-commit) 2022-03-29 17:26:26 +05:30
mergify[bot]
00ad515ac7 fix: use name for links not item_code (backport #30462) (#30463) 
* fix: use `name` for links not `item_code` (#30462)

(cherry picked from commit 76dce2eddc)

# Conflicts:
#	erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py

* fix: conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-29 17:16:31 +05:30
Deepesh Garg
751a6354f1 Merge pull request #30471 from deepeshgarg007/release_v13_24_0 
chore: version bump an change log for v13.24.0
v13.24.0 		2022-03-29 14:35:21 +05:30
Deepesh Garg
33071a4731 Merge pull request #30469 from frappe/version-13-pre-release 
chore: v13.24.0 release
 2022-03-29 14:29:09 +05:30
Deepesh Garg
e1a0f067b0 chore: version bump an change log for v13.24.0 2022-03-29 14:18:37 +05:30
mergify[bot]
6b3bdb2e9e fix: dont check for failed repost while freezing (backport #30472) (#30473) 
* fix: dont check for failed repost while freezing (#30472)

[skip ci]

(cherry picked from commit b12fe0f15b)

# Conflicts:
#	erpnext/stock/utils.py

* fix: conflicts

[skip ci]

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-29 13:56:15 +05:30
Deepesh Garg
a7b2fa31a1 chore: version bump an change log for v13.24.0 2022-03-29 13:38:39 +05:30