CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 18:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,471 Commits 424 Branches 1,723 Tags
198bdcfdc609e9a6280408f86471cedbc454da90
Commit Graph

39471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
9a5acc313c Merge pull request #30515 from frappe/mergify/copy/version-13-hotfix/pr-30324 
fix: multiple pos issues (copy #30324)
 2022-04-01 12:11:06 +05:30
Saqib Ansari
9335578a0b fix: linting errors 2022-04-01 11:02:18 +05:30
Deepesh Garg
af6dcd66dc Merge pull request #30534 from frappe/mergify/bp/version-13-hotfix/pr-30510 
fix: Taxes getting overriden from mapped to target doc (backport #30510)
 2022-04-01 10:31:32 +05:30
Deepesh Garg
6c53ca6328 Merge pull request #30512 from frappe/mergify/bp/version-13-hotfix/pr-30486 
fix: Account currency validation (backport #30486)
 2022-04-01 09:45:45 +05:30
Deepesh Garg
20df023b9a Merge pull request #30525 from frappe/mergify/bp/version-13-hotfix/pr-30500 
fix(India): Tax fetching based on tax category (backport #30500)
 2022-04-01 09:45:28 +05:30
Deepesh Garg
328b9431b2 fix: Taxes getting overriden from mapped to target doc 
(cherry picked from commit 4720969ce6)
 2022-04-01 04:14:07 +00:00
Saqib Ansari
a9f24859ad Merge pull request #30514 from frappe/mergify/bp/version-13-hotfix/pr-30461 
fix(asset): do not validate warehouse on asset purchase (backport #30461)
 2022-03-31 21:08:51 +05:30
rohitwaghchaure
dbb872aeb4 Merge pull request #30530 from frappe/mergify/bp/version-13-hotfix/pr-30527 
feat: minor, pick list item reference on delivery note item table (backport #30527)
 2022-03-31 21:04:02 +05:30
Rohit Waghchaure
a74198f974 test: test case to check pick list name has mapped or not 
(cherry picked from commit 2f51011f91)
 2022-03-31 14:53:52 +00:00
Rohit Waghchaure
c92df4eed3 feat: minor, pick list item reference on delivery note item table 
(cherry picked from commit 2f63ae2ee9)
 2022-03-31 14:53:51 +00:00
Deepesh Garg
f213dc9999 fix(India): Tax fetching based on tax category 
(cherry picked from commit 532961fad2)
 2022-03-31 12:32:41 +00:00
Saqib Ansari
8416dc713c fix: unexpected keyword argument 'pluck' 2022-03-31 16:32:01 +05:30
Saqib Ansari
8d315a6573 fix: 'int' object has no attribute 'is_draft' 2022-03-31 16:17:51 +05:30
marination
a9ec72d833 chore: Added BOM std filters and update type in List View 
(cherry picked from commit 2fece523f6)
 2022-03-31 10:25:51 +00:00
marination
770f8da792 test: Added test for 2 more validations 
- Covers full validate function

(cherry picked from commit a945484af4)
 2022-03-31 10:25:51 +00:00
marination
0d3c8e4d74 fix: Type Annotations, Redundancy, etc. 
- Renamed public function`update_new_bom` to `update_new_bom_in_bom_items`
- Replaced `get_cached_doc` with `get_doc`
- Removed click progress bar (drive through update log)
- Removed `bom_obj.update_new_bom()`, was redundant. Did same job as `update_new_bom_in_bom_items`
- Removed `update_new_bom()` in `bom.py`, unused.
- Prettier query formatting
- `update_type` annotated as non optional Literal
- Removed redundant use of JobTimeoutException
- Corrected type annotations in `create_bom_update_log()`

(cherry picked from commit 620575a901)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
 2022-03-31 10:25:50 +00:00
marination
c0c39f8c79 fix: Semgrep 
- Explain explicit commits and skip semgrep
- Format client side translated string correctly

(cherry picked from commit ebf00946c9)
 2022-03-31 10:25:48 +00:00
marination
1f9ecb3397 fix: Auto format bom_update_log.py 
(cherry picked from commit 79495679e2)
 2022-03-31 10:25:47 +00:00
marination
9b069ed04b test: API hit via BOM Update Tool 
- test creation of log and it's impact

(cherry picked from commit 1d1e925bcf)
 2022-03-31 10:25:47 +00:00
Marica
70485a6afc Merge pull request #30517 from frappe/mergify/bp/version-13-hotfix/pr-30509 
fix: Add non-existent Item check and cleanup in `validate_for_items` (backport #30509)
 2022-03-31 15:55:46 +05:30
marination
5dca5563ff fix: Test, Sider and Added button to access log from Tool 
(cherry picked from commit f3715ab382)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
 2022-03-31 10:25:45 +00:00
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