CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-12 06:48:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,697 Commits 416 Branches 1,717 Tags
6dd5ed68b4bca7530e5f03657ac2b45bdf8695bf
Commit Graph

38697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
6dd5ed68b4 Merge pull request #29446 from frappe/mergify/bp/version-13-hotfix/pr-29426 
fix: Use get for conditionally available fields while setting missing values (backport #29426)
 2022-02-02 21:45:11 +05:30
Saqib Ansari
34f223a144 Merge pull request #29565 from frappe/mergify/bp/version-13-hotfix/pr-29556 
feat: Allowing non stock items in POS (backport #29556)
 2022-02-02 21:44:02 +05:30
mergify[bot]
0608f61b80 fix: Program Enrollment tests (backport #29592) (#29594) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-02 17:51:46 +05:30
mergify[bot]
535e6d61f0 fix: employee reminders fixes (backport #29548) (#29576) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-01 20:22:49 +05:30
Deepesh Garg
b9b42c11e6 Merge pull request #29561 from frappe/mergify/bp/version-13-hotfix/pr-29451 
feat: Provisional accounting for expenses (backport #29451)
 2022-02-01 18:11:37 +05:30
mergify[bot]
ffbf7ec3b7 fix: don't show "create" on cancelled BOMs (#29570) (#29572) 
(cherry picked from commit a3a05c0c23)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-01 17:44:13 +05:30
Deepesh Garg
640b2d57de chore: fix tests 2022-02-01 17:25:26 +05:30
Saqib Ansari
c0a2388ab2 fix: Validation for invalid serial nos at POS invoice level (backport #29447) 2022-02-01 16:39:22 +05:30
Saqib Ansari
4778f16c56 fix: flaky test 
(cherry picked from commit bf70feb7c9)
 2022-02-01 11:07:33 +00:00
Saqib Ansari
33e8cd9cde chore: remove unused import 
(cherry picked from commit 4e4159ec06)
 2022-02-01 11:07:33 +00:00
Saqib Ansari
04acbea93d chore: remove useless rollback 
(cherry picked from commit 2aca54eb38)
 2022-02-01 11:07:32 +00:00
Saqib Ansari
c8f2a7fc69 test: point of sale search 
(cherry picked from commit 650d44a714)
 2022-02-01 11:07:32 +00:00
Subin Tom
7815ffb842 fix: remove qty indicator from non stock items 
(cherry picked from commit 845c02a989)
 2022-02-01 11:07:31 +00:00
Subin Tom
c57d184576 fix: sider fix 
(cherry picked from commit 27b35d72e2)
 2022-02-01 11:07:30 +00:00
Subin Tom
8ed2a7bc2c fix: removing get_value call by returning is_stock_item in get_stock_availability method 
(cherry picked from commit ac9a9fb229)
 2022-02-01 11:07:30 +00:00
Subin Tom
15c6b93ee3 fix: Removed validate_non_stock_items, filter_service_items methods 
(cherry picked from commit 9e20fa85c1)
 2022-02-01 11:07:29 +00:00
Subin Tom
0aff20e85c fix: sider issues 
(cherry picked from commit 6b973d658c)
 2022-02-01 11:07:28 +00:00
Subin Tom
75faa151fd fix: Allowing non stock items in POS 
(cherry picked from commit ec37930404)
 2022-02-01 11:07:28 +00:00
mergify[bot]
e2bdd5efdb fix: leave application tests (backport #29539) (#29563) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-01 16:18:16 +05:30
Deepesh Garg
c71dbda166 fix: Linting Issues 2022-02-01 15:08:45 +05:30
Deepesh Garg
aa16a4bb5f chore: Resolve conflicts 2022-02-01 15:02:23 +05:30
Deepesh Garg
a54c84728f feat: Provisional accounting for expenses (#29451) 
* feat: Provisonal accounting for expenses

* fix: Method for provisional accounting entry

* chore: Add test case

* fix: Remove test case

* fix: Use company doctype

* fix: Add provisional expense account field in Purchase Receipt Item

* fix: Test case

* fix: Move provisional expense account to parent

* fix: Patch

(cherry picked from commit 528c71382f)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
#	erpnext/patches.txt
#	erpnext/setup/doctype/company/company.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2022-02-01 09:13:47 +00:00
mergify[bot]
2b83dabae1 fix: do not hide Loan Repayment Entry field in salary slip (backport #29535) (#29551) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-01 12:52:30 +05:30
Saqib Ansari
7731a2984c Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29447 2022-02-01 11:12:13 +05:30
Deepesh Garg
038f949550 Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount 
fix: billed amount in delivery note items
 2022-02-01 11:08:49 +05:30
Saqib Ansari
96efdf124e Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29447 2022-01-31 19:34:54 +05:30
Saqib Ansari
c7b4918434 Merge pull request #29388 from frappe/mergify/bp/version-13-hotfix/pr-29373 
fix: cost center validation of asset (backport #29373)
 2022-01-31 19:34:27 +05:30
Sagar Sharma
c4155016d4 Merge branch 'version-13-hotfix' into fix/delivery-note/billed-amount 2022-01-31 19:13:21 +05:30
Sagar Sharma
fedeb2a70f chore: remove patch 2022-01-31 19:07:07 +05:30
mergify[bot]
5ac11a4ba5 refactor!: dynamically compute bom_level (backport #29522) (#29540) 
* refactor!: dynamically compute bom_level

(cherry picked from commit 157b4b33fe)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.py
#	erpnext/patches.txt

* fix(ux): sort multi-production item plans correctly

(cherry picked from commit d38fd8635c)

* fix: conflicts

* fix: removed set_bom_level

* fix: conflict

Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2022-01-31 17:11:43 +05:30
Ankush Menat
2bc42759d2 Merge pull request #29534 from frappe/mergify/bp/version-13-hotfix/pr-29519 
fix: bin uniqueness (backport #29519)
 2022-01-31 15:56:12 +05:30
mergify[bot]
9425ca07f5 chore: revert manual handling of stock level section (#29537) (#29538) 
(cherry picked from commit a254201696)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-31 15:43:08 +05:30
Ankush Menat
2b868e7f56 fix: update reserved qty for production/ s/c 
(cherry picked from commit 0a15334464)
 2022-01-31 09:00:20 +00:00
Ankush Menat
f99f537b57 refactor: patch for fixing broken bins 
fix(patch): delete fully broken bins

if bin doesn't have item_code or warehouse then it's not recoverable.

(cherry picked from commit c2ecc7a2d1)
 2022-01-31 09:00:19 +00:00
Sagar Sharma
a7b30d9197 fix(patch): patch duplicate bins 
(cherry picked from commit 7ff3ca25e5)
 2022-01-31 09:00:18 +00:00
Ankush Menat
b3f36efa8f fix: ignore None item/wh whie updating reservation 
(cherry picked from commit a1e7771cdd)
 2022-01-31 09:00:17 +00:00
Ankush Menat
8aa6423093 fix: add unique constraint on bin at db level 
(cherry picked from commit 08810dbcce)
 2022-01-31 09:00:16 +00:00
Subin Tom
86a560eeb0 fix: Validation for invalid serial nos at POS invoice level (#29447) 
(cherry picked from commit 05bbb69d0e)
 2022-01-31 07:39:10 +00:00
Saqib Ansari
144c8ec904 Merge pull request #29528 from frappe/mergify/bp/version-13-hotfix/pr-29454 
fix(sales order): incorrect no. of items fetched while creating dn (backport #29454)
 2022-01-31 12:16:30 +05:30
Saqib Ansari
bed7201efe fix: merge conflicts 2022-01-31 11:40:59 +05:30
Saqib Ansari
e6f2343fb4 chore: add comment 
(cherry picked from commit 0b9a850a17)
 2022-01-31 06:09:26 +00:00
Saqib Ansari
9da63f2e79 fix(sales order): incorrect no. of items fetched while creating dn 
(cherry picked from commit a73ad6759d)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.js
 2022-01-31 06:09:26 +00:00
Saqib Ansari
f31e52123a fix: qty filter not working if apply_multiple_pricing_rules is enabled 2022-01-31 11:37:33 +05:30
Deepesh Garg
2c83f18864 Merge pull request #29518 from frappe/mergify/bp/version-13-hotfix/pr-29499 
fix(India): Tax calculation for overseas suppliers (backport #29499)
 2022-01-31 11:06:51 +05:30
mergify[bot]
0fb4e81a30 fix: cost of poor quality report time filters not working (#28958) (#29521) 
* fix: cost of poor quality report time filters not working

* chore:update cost of poor quality report to use query builder

* fix: linter warnings

* chore: updated report query

* chore: added test filters

* fix : cleared linter warnings

* chore: formatting

* refactor: query generation

- optionally apply date filters
- join instead of expensive sub-query
- return as dictionary

* test: simplify test

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 0f7c2a19de)

Co-authored-by: aaronmenezes <ron2805@gmail.com>
 2022-01-30 20:49:41 +05:30
Deepesh Garg
ab0e63fe13 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29426 2022-01-30 17:30:10 +05:30
Deepesh Garg
dc82becbd2 fix(India) Tax calculation for overseas suppliers 
(cherry picked from commit e45c38337c)
 2022-01-30 07:44:43 +00:00
Ankush Menat
70dc77305b fix: work order serial no allows storing whitespace 
(cherry picked from commit 43bd88e741)
 2022-01-29 14:27:09 +05:30
Ankush Menat
db3eef9a8b fix: extend sr_no cleanup to packed items too 
(cherry picked from commit e177c5277f)
 2022-01-29 14:27:09 +05:30
Ankush Menat
cc08125f39 refactor: reusable clean_serial_nos 
(cherry picked from commit b20df3745e)
 2022-01-29 14:27:09 +05:30