CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 01:36:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,197 Commits 426 Branches 1,718 Tags
faedd85b660fc0647ab877fc99ddd41634809f44
Commit Graph

43197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
faedd85b66 fix: group warehouse filter not working for Batchwise Balance history report 
(cherry picked from commit 6381e75fa5)
 2022-10-17 09:43:29 +00:00
Deepesh Garg
2db1da0c8a Merge pull request #32612 from frappe/mergify/bp/version-14-hotfix/pr-32607 
chore: Remove HRMS related code (backport #32607)
 2022-10-17 14:53:39 +05:30
Deepesh Garg
d9519f24aa chore: Remove HRMS related code (#32607) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit dc3fe85921)
 2022-10-17 06:09:25 +00:00
Deepesh Garg
a260c594c1 Merge pull request #32608 from frappe/mergify/bp/version-14-hotfix/pr-32591 
fix: Renamed Notes section to Comments (backport #32591)
 2022-10-15 18:26:00 +05:30
Nabin Hait
dac5989d72 fix: Renamed Dashboard tab label to Connections 
(cherry picked from commit f561d8f689)
 2022-10-15 12:13:35 +00:00
Nabin Hait
9e94dd9203 fix: Renamed Notes section to Comments 
(cherry picked from commit 56a4a77398)
 2022-10-15 12:13:35 +00:00
Deepesh Garg
794167aa36 Merge pull request #32606 from frappe/mergify/bp/version-14-hotfix/pr-32594 
fix: Party account for multi-order invoices (backport #32594)
 2022-10-15 17:41:14 +05:30
Deepesh Garg
eaea8469fc fix: Party account for multi-order invoices 
(cherry picked from commit fd49503ba2)
 2022-10-15 11:29:42 +00:00
mergify[bot]
af4dafdc64 fix: add project settings to projects workspace (backport #32568) (#32600) 
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2022-10-14 18:01:43 +05:30
ruthra kumar
a012c55c81 Merge pull request #32592 from frappe/mergify/bp/version-14-hotfix/pr-32567 
fix: deduplicate Payment Ledger on Item value repost (backport #32567)
 2022-10-13 15:28:57 +05:30
mergify[bot]
6a89cb57b0 chore: drop dead code (backport #32595) (#32596) 
chore: drop dead code (#32595)

[skip ci]

(cherry picked from commit 50e9698932)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-10-13 15:27:17 +05:30
ruthra kumar
3c457e2638 test: dedeplication on payment ledger upon repost 
(cherry picked from commit eb819368aa)
 2022-10-13 08:32:51 +00:00
ruthra kumar
62cabdf792 fix: delete old ple's on item value repost 
(cherry picked from commit 65992304bc)
 2022-10-13 08:32:51 +00:00
mergify[bot]
ed85683fea fix: don't try to update youtube data if disabled in settings (backport #32588) (#32589) 
fix: don't try to update youtube data if disabled in settings (#32588)

fix: cast value from db

[skip ci]

(cherry picked from commit e543dca6a0)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2022-10-13 11:55:36 +05:30
mergify[bot]
829a0ff827 fix: type-cast while saving an item (backport #32549) (#32578) 
fix: type-cast while saving an item (#32549)

(cherry picked from commit 43037d893d)

Co-authored-by: Rohan <Alchez@users.noreply.github.com>
 2022-10-13 11:54:22 +05:30
Sagar Sharma
0674d42c96 Merge pull request #32586 from frappe/mergify/bp/version-14-hotfix/pr-32576 
fix: `Brand Defaults` filters (backport #32576)
 2022-10-12 19:25:32 +05:30
Sagar Sharma
cb0c4b5664 fix: Brand Defaults filters 
(cherry picked from commit 7da32c7db3)
 2022-10-12 13:53:35 +00:00
Deepesh Garg
c4b39c7c1c Merge branch 'version-14' into version-14-hotfix 2022-10-12 17:19:33 +05:30
Deepesh Garg
c83c645ab0 Merge pull request #32579 from frappe/mergify/bp/version-14-hotfix/pr-32563 
fix: consider sales rate as incoming rate for transit warehouse in purchase flow (backport #32563)
 2022-10-12 17:16:36 +05:30
Deepesh Garg
eab24b8366 Merge pull request #32582 from frappe/mergify/bp/version-14-hotfix/pr-32272 
fix: Incoming rate precision fixes for intra company transfer (backport #32272)
 2022-10-12 17:05:18 +05:30
rohitwaghchaure
31782d6f71 fix: removed unnecessary imports 2022-10-12 16:34:48 +05:30
Deepesh Garg
2494ccc0a2 chore: check only for inter-company transfers 
(cherry picked from commit 9aa5e20ef7)
 2022-10-12 10:54:33 +00:00
Deepesh Garg
108720b9c3 chore: fix precision condition 
(cherry picked from commit 49601558c6)
 2022-10-12 10:54:33 +00:00
Deepesh Garg
4f3e209009 chore: Use proper accounts 
(cherry picked from commit 1c05c004cd)
 2022-10-12 10:54:33 +00:00
Deepesh Garg
23b18a5e38 chore: Increase precision for other doc fields 
(cherry picked from commit c8d2181498)
 2022-10-12 10:54:33 +00:00
Deepesh Garg
b386b8c634 chore: GL Entries for SLE diff 
(cherry picked from commit df2a0e265b)
 2022-10-12 10:54:32 +00:00
Deepesh Garg
49221d47c2 test: Internal tranfer precision loss test 
(cherry picked from commit dc20b21fb5)
 2022-10-12 10:54:32 +00:00
Deepesh Garg
09e9675653 chore: Increase incoming_rate field precision to 6 
(cherry picked from commit b31c3bd35d)
 2022-10-12 10:54:32 +00:00
Deepesh Garg
8eda2dbdf8 fix: Hanlde rounding loss for internal transfer 
(cherry picked from commit 6e47fd54a0)
 2022-10-12 10:54:32 +00:00
Deepesh Garg
b653f43b70 fix: Incoming rate precision fixes for intra company transfer 
(cherry picked from commit 083309c056)
 2022-10-12 10:54:31 +00:00
Rohit Waghchaure
0b26131b65 fix: test case 
(cherry picked from commit 98bf8e1304)
 2022-10-12 10:51:00 +00:00
Rohit Waghchaure
423c0190e2 fix: consider outgoingrate while valuation rate calculate 
(cherry picked from commit 3266e54e33)
 2022-10-12 10:51:00 +00:00
Rohit Waghchaure
948b231e92 fix: consider sales rate as incoming rate for transit warehouse in purchase flow 
(cherry picked from commit 683a47f7a1)
 2022-10-12 10:50:59 +00:00
Deepesh Garg
23aca6663f Merge pull request #32565 from frappe/mergify/bp/version-14-hotfix/pr-32408 
feat: Tab Breaks in all Sales and Purchase cycle transactions (backport #32408)
 2022-10-12 14:13:38 +05:30
Deepesh Garg
6c85bdd735 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32408 2022-10-12 13:04:01 +05:30
mergify[bot]
154904e960 fix: Explicitly update modified (backport #32519) (#32575) 
fix: Explicitly update modified (#32519)

* fix: Explicitly update modified

required after https://github.com/frappe/frappe/pull/18301

* chore: fix broken translations

(cherry picked from commit 8376fbc982)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-10-12 12:59:06 +05:30
mergify[bot]
03db8b2f5f ci: disable orchestrator (backport #32571) (#32572) 
* ci: disable orchestrator (#32571)

(cherry picked from commit 6ce3ce758c)

* chore: correct build count

* chore: no cov

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-10-12 12:14:48 +05:30
Nabin Hait
236a5f37c7 fix: minor cleanup 
(cherry picked from commit e71c417f7e)
 2022-10-11 10:33:30 +00:00
Nabin Hait
db4fbc9e58 fix: more fields reordering related to Tab Break 
(cherry picked from commit 5389a35798)
 2022-10-11 10:33:30 +00:00
Nabin Hait
89314d4171 feat: Tab Break in Purchase Invoice 
(cherry picked from commit aaf3c2b329)
 2022-10-11 10:33:30 +00:00
Nabin Hait
b092791ac8 feat: Tab Break in Purchase Receipt 
(cherry picked from commit 35f836c4b7)
 2022-10-11 10:33:30 +00:00
Nabin Hait
22ad3ad6f3 feat: Tab Break in Supplier Quotation 
(cherry picked from commit 3d9263bf86)
 2022-10-11 10:33:29 +00:00
Nabin Hait
79151be8ce feat: Tab Break in Material Request 
(cherry picked from commit 2172c5034a)
 2022-10-11 10:33:29 +00:00
Nabin Hait
5a8329add1 feat: Tab Break in Purchase Order 
(cherry picked from commit 10a25603ac)
 2022-10-11 10:33:29 +00:00
Nabin Hait
b0a9f79e18 feat: Tab Break in Quotation 
(cherry picked from commit 7546562139)
 2022-10-11 10:33:28 +00:00
Nabin Hait
31cd96bc89 feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order 
(cherry picked from commit f6613e1e4c)
 2022-10-11 10:33:27 +00:00
ruthra kumar
db563483cb Merge pull request #32558 from frappe/mergify/bp/version-14-hotfix/pr-32557 
fix: Value error on validation of POS invoices with Serial Nos (backport #32557)
 2022-10-11 15:36:36 +05:30
ruthra kumar
6fa1b892f7 test: value error on serial no validation on pos 
(cherry picked from commit 9e2bd10d03)
 2022-10-11 09:13:36 +00:00
ruthra kumar
4b65dd7f2a fix: value error on pos submit 
(cherry picked from commit 4b908ebcd6)
 2022-10-11 09:13:35 +00:00
Deepesh Garg
62296c85cd Merge pull request #32543 from frappe/mergify/bp/version-14-hotfix/pr-32497 
chore: set `Quality Inspection` status based on readings status (backport #32497)
 2022-10-11 14:02:58 +05:30