schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,940 Commits 322 Branches 1,581 Tags
2102b83bd9785d874ffaecf41b86850c5f27d310
Commit Graph

33060 Commits

Author SHA1 Message Date
Rohit Waghchaure
f370c7b50b fix: consider posting time for internal transfer PO 
(cherry picked from commit cb763938dc)
 2022-09-16 04:08:04 +00:00
Sagar Sharma
85cf30cfa8 Merge branch 'version-14-hotfix' into SaiFi0102-asset-capitalization-v14 2022-09-15 08:17:37 +05:30
mergify[bot]
64aad88684 fix: correct sql output format in CRM patch (backport #32213) (#32215) 
fix: correct sql output format in CRM patch (#32213)

(cherry picked from commit 97977cdb4b)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-09-14 19:21:40 +05:30
Nabin Hait
f126e88e5e fix: test cases 2022-09-14 18:31:15 +05:30
Nabin Hait
3f8c701083 Merge branch 'SaiFi0102-asset-capitalization-v14' of https://github.com/nabinhait/erpnext into SaiFi0102-asset-capitalization-v14 2022-09-14 17:21:57 +05:30
Nabin Hait
153ef5f164 fix: test cases 2022-09-14 17:20:19 +05:30
Abhinav Raut
b9a249918a fix: pending accrual entries 
(cherry picked from commit f2209045f8)
 2022-09-14 08:45:47 +00:00
Nabin Hait
fb99d3f1b9 Merge branch 'version-14-hotfix' into SaiFi0102-asset-capitalization-v14 2022-09-14 12:56:47 +05:30
Nabin Hait
3b79e24c7e fix: always set default expense account in company 2022-09-14 12:55:49 +05:30
Sagar Sharma
2fe72af359 test: add test case for item master maintain-stock 
(cherry picked from commit bf1fa014f4)
 2022-09-14 02:44:55 +00:00
Sagar Sharma
38488c13e6 fix: unknown column error while updating value of maintain-stock in item master 
(cherry picked from commit 7b878ea3d8)
 2022-09-14 02:44:54 +00:00
Deepesh Garg
5b04bebc0a Merge pull request #32198 from frappe/mergify/bp/version-14-hotfix/pr-32190 
fix: item wise sales register taxes and charges (backport #32190)
 2022-09-13 16:30:59 +05:30
Nabin Hait
38c31077c9 feat: Asset Capitalization 
- manual selection of entry type
- GLE cleanup with smaller functions
- GLE considering periodical inventory
- test cases
 2022-09-13 16:21:06 +05:30
Nabin Hait
cd613c6033 fix: merge conflict 2022-09-13 16:20:42 +05:30
Deepesh Garg
2e1fb5255e Merge pull request #32195 from frappe/mergify/bp/version-14-hotfix/pr-32091 
fix: Migrate old lead notes as per the new format (backport #32091)
 2022-09-13 14:41:35 +05:30
Deepesh Garg
9fd8fffb28 Merge pull request #32166 from frappe/mergify/bp/version-14-hotfix/pr-32144 
fix: Rate for internal PI have non stock UOM items (backport #32144)
 2022-09-13 14:40:31 +05:30
Maharshi Patel
53f235b630 fix: item wise sales register taxes and charges 
i have added separate column for other charges. Instead of adding all values to tax_total, it checks if account_type is tax, and then only it adds to total_tax otherwise it adds to the total_other_charges.

(cherry picked from commit 62163ab3d3)
 2022-09-13 08:26:13 +00:00
mergify[bot]
2c4867cc98 fix(UX): make Item attachments public by default (backport #32196) (#32197) 
fix(UX): make Item attachments public by default (#32196)

(cherry picked from commit fffc245922)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-09-13 13:41:58 +05:30
Deepesh Garg
dda057d257 chore: Resolve conflicts 2022-09-13 13:40:36 +05:30
Nabin Hait
ded6e7f544 fix: drop old notes column from lead and prospect 
(cherry picked from commit 4b13452022)
 2022-09-13 06:51:27 +00:00
Nabin Hait
7bb5f6eb23 perf: lesser SQL queries and no validation 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
(cherry picked from commit 2a100abef1)
 2022-09-13 06:51:27 +00:00
Nabin Hait
28b1d4e2a3 fix: Migrate old lead notes as per the new format 
(cherry picked from commit 3abd00f3bb)
 2022-09-13 06:51:26 +00:00
mergify[bot]
027e66f637 fix(Employee): shorter tab titles (backport #32192) (#32193) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-09-13 10:36:12 +05:30
mergify[bot]
944b8a0ed7 fix: remove EmployeeBoardingController (backport #32139) (#32191) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2022-09-13 09:50:36 +05:30
rohitwaghchaure
95da66a201 Merge pull request #32183 from frappe/mergify/bp/version-14-hotfix/pr-32181 
fix: promotional scheme min and max amount configuration (backport #32181)
 2022-09-13 08:36:54 +05:30
Ahmad
3c3ab897d5 fix: pick_list - picked qty getting set to 1 
(cherry picked from commit 3256e2b8b7)
 2022-09-12 16:50:28 +00:00
Sagar Sharma
581c5cbc38 test: add test cases for BOM Stock Calculated report 
(cherry picked from commit e1a98c1ff7)
 2022-09-12 13:52:05 +00:00
Sagar Sharma
4e09203ddc fix: add missing warehouse filter in BOM Stock Calculated report 
(cherry picked from commit 7a968a5f0d)
 2022-09-12 13:52:05 +00:00
Sagar Sharma
af883be065 fix: required_qty in BOM Stock Calculated report 
(cherry picked from commit 56192daabf)
 2022-09-12 13:52:05 +00:00
Sagar Sharma
08f5f81fa8 refactor: BOM Stock Calculated report 
(cherry picked from commit 723fa9eebc)
 2022-09-12 13:52:05 +00:00
Rohit Waghchaure
702c16eac4 fix: promotional scheme min and max amount configuration 
(cherry picked from commit a8fd92ddc1)
 2022-09-12 13:01:02 +00:00
rohitwaghchaure
93e510023a fix: customer code max characters limit issue (#32177) 
(cherry picked from commit 8f787c08a2)
 2022-09-12 11:19:42 +00:00
Nihantra C. Patel
174c7503c9 fix: Set filter condition and spell in AR 
(cherry picked from commit e2b4ae13fa)
 2022-09-12 09:31:27 +00:00
Deepesh Garg
c06e241fbc fix: Rate for internal PI have non stock UOM items 
(cherry picked from commit 0f655e4430)

# Conflicts:
#	erpnext/controllers/buying_controller.py
 2022-09-12 03:40:43 +00:00
Sagar Sharma
86e5f362e3 refactor: rewrite Process Loss Report queries in QB 
(cherry picked from commit 5245928648)
 2022-09-11 14:18:22 +00:00
ruthra kumar
7cc98181ec Merge pull request #32157 from frappe/mergify/bp/version-14-hotfix/pr-32137 
refactor(minor): delete linked payment ledger entries on source doc deletion (backport #32137)
 2022-09-11 13:41:12 +05:30
ruthra kumar
a2285d5e5e fix: remove multiple call to ple creation 
(cherry picked from commit 4adc372f9a)
 2022-09-11 06:51:50 +00:00
ruthra kumar
ccd0449006 fix: delete linked payment ledger entries no source doc deletion 
(cherry picked from commit 70313df531)
 2022-09-11 06:37:22 +00:00
Sagar Sharma
9203217678 refactor: rewrite Work Order Stock Report queries in QB 
(cherry picked from commit d4c4dddfc3)
 2022-09-10 11:21:27 +00:00
rohitwaghchaure
3c1c50f171 Merge pull request #32141 from frappe/mergify/bp/version-14-hotfix/pr-32135 
fix: reposting not working for internal transferred purchase receipt (backport #32135)
 2022-09-10 16:40:51 +05:30
rohitwaghchaure
a408722983 fix: conflict 2022-09-09 22:44:10 +05:30
Deepesh Garg
16502b30a0 Merge pull request #32148 from frappe/mergify/bp/version-14-hotfix/pr-32110 
fix: error on bank statement import (backport #32110)
 2022-09-09 17:16:58 +05:30
ruthra kumar
467ee97938 fix: import error on bank statement import 
Name collision between frameworks file importer's internal log and
doctype fieldname - import_log.

Frameworks internal log overrode, doctypes field which caused failure
in basic fieldtype validation.

(cherry picked from commit a6fbb80b94)
 2022-09-09 09:31:25 +00:00
Sagar Sharma
d3cc9d4fa6 fix: validate Subcontracting Order in Stock Entry 
(cherry picked from commit 9a3dcb9ad1)
 2022-09-09 09:26:08 +00:00
Sagar Sharma
844f120a56 fix: status filter for Subcontracting Order in Stock Entry 
(cherry picked from commit 30909a9b79)
 2022-09-09 09:26:08 +00:00
Sagar Sharma
5af006278e fix: consider Stock Entry purpose while getting total supplied qty 
(cherry picked from commit 2f00413864)
 2022-09-09 06:44:26 +00:00
Rohit Waghchaure
7ce6729100 fix: reposting not working for internal transferred purchase receipt 
(cherry picked from commit a03b4ce213)

# Conflicts:
#	erpnext/stock/stock_ledger.py
 2022-09-09 04:01:23 +00:00
Sagar Sharma
62741bf744 test: add test case for returned-qty 
(cherry picked from commit aea7188304)
 2022-09-08 13:31:38 +00:00
Sagar Sharma
4568648d8c fix: SCO Supplied Items returned-qty 
(cherry picked from commit ccb2889cac)
 2022-09-08 13:31:38 +00:00
mergify[bot]
7840fed7a5 fix: hide "Return of Components" button in closed SCO (backport #32130) (#32131) 
fix: hide "Return of Components" button in closed SCO (#32130)

(cherry picked from commit 3585daab95)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-09-08 18:25:27 +05:30