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
40,943 Commits 424 Branches 1,723 Tags
2a615af00a754162c202d10f77e1c1d36a6d48cd
Commit Graph

40943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
27570db761 Merge pull request #28197 from frappe/mergify/bp/version-13-hotfix/pr-28195 
fix: (ux) Remove warehouse filter on Batch field for Material Receipt (backport #28195)
 2021-11-02 16:27:18 +05:30
marination
68646c5756 chore: Add comment above fix for future reference 
(cherry picked from commit 48886ee705)
 2021-11-02 10:40:41 +00:00
marination
189595b4f7 fix: Remove warehouse filter on Batch field for Material Receipt 
(cherry picked from commit 048210a8f6)
 2021-11-02 10:40:40 +00:00
marination
b81dfdcd26 chore: Add comment above fix for future reference 
(cherry picked from commit 48886ee705)
 2021-11-02 10:40:02 +00:00
marination
68809159ba fix: Remove warehouse filter on Batch field for Material Receipt 
(cherry picked from commit 048210a8f6)
 2021-11-02 10:40:00 +00:00
Revant Nandgaonkar
1736029733 chore: migrate docker to github actions 2021-11-02 12:03:22 +05:30
Diksha Jadhav
281a9cc749 feat(manufacturing): add link field for quality inspection template on operation 2021-11-01 17:19:07 +05:30
Deepesh Garg
982960fc0a Merge pull request #28177 from frappe/mergify/bp/version-13-pre-release/pr-26735 
fix: COGS account in purchase receipt (backport #26735)
 2021-11-01 16:51:11 +05:30
Deepesh Garg
bb7d661a04 fix: Resolve conflicts 2021-11-01 16:23:39 +05:30
Deepesh Garg
c445d8ea3c Merge pull request #28176 from frappe/mergify/bp/version-13-hotfix/pr-26735 
fix: COGS account in purchase receipt (backport #26735)
 2021-11-01 16:22:32 +05:30
Ankush Menat
79b087670f fix(ux): stock levels take time after item merge 
Item merge creates a repost and depending on number of entries it can
take from 1 to n hours for it to finish. (depending upon queued up
reposts)

Added message so users don't feel confused till this operation is
finished.

(cherry picked from commit 1eab3a44f6)
 2021-11-01 15:34:53 +05:30
Ankush Menat
6d0ff88184 fix: use warehouse to find company 
(cherry picked from commit f7ffe04a4b)
 2021-11-01 15:31:23 +05:30
Ankush Menat
5a40a48e31 fix: pass company while fetching valuation rate 
If company is not supplied and valuation rate is 0, then default
company is used for checking if perpetual inventory is enabled or not.
This makes little sense as different companies can have different
setting for perpetual inventory.

(cherry picked from commit a0727b2e82)
 2021-11-01 15:31:23 +05:30
Ankush Menat
c6557a136c fix: use warehouse to find company 
(cherry picked from commit f7ffe04a4b)
 2021-11-01 15:31:11 +05:30
Ankush Menat
271dad941b fix: pass company while fetching valuation rate 
If company is not supplied and valuation rate is 0, then default
company is used for checking if perpetual inventory is enabled or not.
This makes little sense as different companies can have different
setting for perpetual inventory.

(cherry picked from commit a0727b2e82)
 2021-11-01 15:31:11 +05:30
Deepesh Garg
134ea9214e fix: resolve conflicts 2021-11-01 14:40:19 +05:30
Rohit Waghchaure
e9d1cbb339 fix: COGS account in purchase receipt 
(cherry picked from commit 2a14f255cf)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2021-11-01 07:26:09 +00:00
Rohit Waghchaure
f88c24155c fix: COGS account in purchase receipt 
(cherry picked from commit 2a14f255cf)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2021-11-01 07:25:46 +00:00
mergify[bot]
18dddfdea9 fix: remove duplicate field from selling_settings (#28174) 
fix https://github.com/frappe/erpnext/issues/28155

(cherry picked from commit 1cc4eddacb)

Co-authored-by: ahmadRagheb <ahmedragheb75@gmail.com>
 2021-11-01 11:11:40 +05:30
Deepesh Garg
b2a3451ca2 Merge pull request #28173 from ahmadRagheb/patch-3 
fix: Update selling_settings.json
 2021-11-01 10:36:36 +05:30
ahmadRagheb
1cc4eddacb Update selling_settings.json 
fix https://github.com/frappe/erpnext/issues/28155
 2021-10-31 22:48:52 +02:00
mergify[bot]
f1e3a1cac2 fix: update tax template name for 18% GST (backport #28156) 
fix: update tax template name for 18% GST (backport #28156)
 2021-10-31 19:18:54 +05:30
Deepesh Garg
978d1cde2d Merge pull request #28165 from frappe/mergify/bp/version-13-pre-release/pr-28162 
fix: Error for missing PAN no field (backport #28162)
 2021-10-31 18:50:10 +05:30
Deepesh Garg
04f6070df4 Merge pull request #28164 from frappe/mergify/bp/version-13-hotfix/pr-28162 
fix: Error for missing PAN no field (backport #28162)
 2021-10-31 18:49:52 +05:30
rohitwaghchaure
08e65af5b1 Merge pull request #28169 from frappe/mergify/bp/version-13-hotfix/pr-28168 
fix: patch update_category_in_ltds_certificate (backport #28168)
 2021-10-31 11:17:31 +05:30
rohitwaghchaure
feaae330d5 Merge pull request #28170 from frappe/mergify/bp/version-13-pre-release/pr-28168 
fix: patch update_category_in_ltds_certificate (backport #28168)
 2021-10-31 10:28:09 +05:30
Rohit Waghchaure
060127663a fix: patch update_category_in_ltds_certificate 
(cherry picked from commit cae29b71d8)
 2021-10-31 04:27:51 +00:00
Rohit Waghchaure
57d931dbbe fix: patch update_category_in_ltds_certificate 
(cherry picked from commit cae29b71d8)
 2021-10-31 04:27:32 +00:00
rohitwaghchaure
88bf748275 Merge pull request #28159 from rohitwaghchaure/merge-hotfix-to-pre-release-for-13-14 
chore: merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2021-10-30 22:33:26 +05:30
Deepesh Garg
aa464cc615 fix: Error for missing PAN no field 
(cherry picked from commit 541c892f97)
 2021-10-30 14:00:07 +00:00
Deepesh Garg
686c4fa86f fix: Error for missing PAN no field 
(cherry picked from commit 541c892f97)
 2021-10-30 13:59:47 +00:00
Rohit Waghchaure
8581b5cdea chore: merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-10-30 15:15:19 +05:30
mergify[bot]
9abb467127 fix: Make status filter optional (#28151) 2021-10-29 18:16:23 +05:30
mergify[bot]
f16e0e17cc fix: POS consolidated invoice rounded total issue (#28146) 2021-10-29 18:05:49 +05:30
Deepesh Garg
fe59c313d6 Merge pull request #28148 from frappe/mergify/bp/version-13-hotfix/pr-28145 
fix: COA importer importing all accounts as group (backport #28145)
 2021-10-29 18:03:58 +05:30
Ankush Menat
9e9f730dd1 fix: sort by creation to break tie 
(cherry picked from commit ff9cfe0d14)
 2021-10-29 17:42:05 +05:30
Ankush Menat
264ffe05b4 refactor: simplify sr no fetching 
(cherry picked from commit f4b60a48f5)
 2021-10-29 17:42:05 +05:30
Ankush Menat
42686f92e9 fix: fetch serial nos from ledger unconditionally 
(cherry picked from commit 2aa019ae4c)
 2021-10-29 17:42:05 +05:30
Noah Jacob
7931cfd77b refactor: replaced db.sql with qb 
(cherry picked from commit deb6b38fab)
 2021-10-29 17:42:05 +05:30
Noah Jacob
835d96c727 fix: incorrect amount of serial_nos fetched 
(cherry picked from commit b44945380d)
 2021-10-29 17:42:05 +05:30
Deepesh Garg
f7cf3fed8e Merge pull request #28144 from frappe/mergify/bp/version-13-hotfix/pr-27994 
fix: incorrect VAT Amount in UAE VAT 201 report (backport #27994)
 2021-10-29 17:20:13 +05:30
Deepesh Garg
0664e64003 fix: COA importer importing all accounts as group 
(cherry picked from commit 8ccd3fee9e)
 2021-10-29 11:37:11 +00:00
Deepesh Garg
4f7046e6c2 Merge pull request #28143 from frappe/mergify/bp/version-13-hotfix/pr-28135 
fix: Accounting Dimension filters not honouring user permissions (backport #28135)
 2021-10-29 17:04:45 +05:30
Dany Robert
43ca66f461 fix: wrong vat amount 
(cherry picked from commit 4c499e804a)
 2021-10-29 09:13:18 +00:00
Dany Robert
ff7423f15f fix: incorrect VAT Amount in UAT VAT 201 report 
(cherry picked from commit 1aa34d1780)
 2021-10-29 09:13:17 +00:00
Deepesh Garg
7cbf577f1f fix: Accounting Dimension filters not honouring user permissions 
(cherry picked from commit aa9e78bed1)
 2021-10-29 09:10:50 +00:00
mergify[bot]
1454f8bc96 fix: Skip empty rows while updating unsaved BOM cost (#28136) (#28142) 
- Dont try to get valuation rate if row has no item code
- Dont try to add exploded items if row has no item code

(cherry picked from commit 292419bc9e)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-10-29 14:19:51 +05:30
mergify[bot]
a33ebbdc54 test: remove unnecessary creation of new company (#28137) (#28140) 
(cherry picked from commit afe09d4e80)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-10-29 14:19:25 +05:30
Deepesh Garg
ee6da35c0b Merge pull request #28134 from frappe/mergify/bp/version-13-hotfix/pr-28122 
fix: Consolidated Financial Report throws error for empty equity data list (backport #28122)
 2021-10-29 13:51:48 +05:30
Deepesh Garg
1c0ae92912 Merge pull request #28133 from frappe/mergify/bp/version-13-hotfix/pr-27609 
fix: Unlink PO on cancelling SO (backport #27609)
 2021-10-29 13:51:21 +05:30