nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-13 17:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,683 Commits 646 Branches 1,810 Tags
1f0f6e136bb0b2e930fd53b5da50128071868541
Commit Graph

3278 Commits

Author SHA1 Message Date
barredterra
5b5a85ee3b fix: reload currency exchange settings 
(cherry picked from commit 06e094b5fc)
 2022-12-06 12:09:03 +00:00
Rohit Waghchaure
e039a14f6f fix: default clear repost logs 
(cherry picked from commit 5949a7ecff)
 2022-12-02 08:26:49 +00:00
Raffael Meyer
978924a7e4 fix: remove obsolete comment 
(cherry picked from commit 491857b3c8)
 2022-11-27 15:24:20 +00:00
barredterra
014896a595 feat: create incoterms and migrate shipments 
(cherry picked from commit d2563ee973)

# Conflicts:
#	erpnext/patches.txt
 2022-11-27 15:24:16 +00:00
niralisatapara
2bd8bd224b feat: item wise tds calculation for purchase order. 
(cherry picked from commit 46e8cdf31a)
 2022-11-23 04:22:45 +00:00
Ritwik Puri
9a737afb77 chore(patch): remove reload_doc from post model sync update_exchange_rate_settings patch (#32994) 
[skip ci]

(cherry picked from commit b03b568e6c)
 2022-11-17 06:30:33 +00:00
Deepesh Garg
b9fb1045d7 feat: Item Wise TDS Calculation 2022-11-06 11:50:20 +05:30
Deepesh Garg
25e87641b6 chore: Add patch to update repayment schedule type in loan documents 
(cherry picked from commit 679b5ed551)

# Conflicts:
#	erpnext/patches.txt
 2022-10-23 14:08:34 +00:00
ruthra kumar
70e990c4f3 refactor: remove duplicate entries on remarks migration patch 
(cherry picked from commit 518ab93e03)
 2022-10-05 10:35:06 +00:00
Nabin Hait
9ec0d104a5 fix: Create accounting dimension fields in asset capitalization 
(cherry picked from commit fe891aa488)
 2022-09-30 10:26:33 +00:00
Deepesh Garg
097398914e fix: Disbursement Account in patch to update old loans 
(cherry picked from commit be623ce8e8)
 2022-09-28 14:07:00 +00:00
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
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
Sagar Sharma
f2ab220ce3 fix: Subcontracting Receipt GL Entries (backport #31918) (#32124) 
fix: Subcontracting Receipt GL Entries
 2022-09-08 11:18:00 +05:30
Deepesh Garg
6976316ada chore: fix message 
(cherry picked from commit 118b0c0f86)
 2022-09-04 13:34:32 +00:00
Florian HENRY
357f74a580 chore: better text 
(cherry picked from commit d19b664ba9)
 2022-09-04 13:34:32 +00:00
Florian HENRY
aedd0397b8 chore: remove debug 
(cherry picked from commit ac66538651)
 2022-09-04 13:34:32 +00:00
Florian HENRY
4cb685a326 fix: upgrade process to version-14 when currency opportunity wass not set 
(cherry picked from commit 9d02fbadb4)
 2022-09-04 13:34:31 +00:00
mergify[bot]
0e9a1fb40e fix: force delete old report docs (backport #32026) (#32027) 
fix: force delete old report docs (#32026)

(cherry picked from commit ffa3071d36)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-08-30 15:46:08 +05:30
mergify[bot]
1b5a1cbaad fix(patch): update sla doctype directly (backport #32014) (#32015) 
fix(patch): update sla doctype directly (#32014)

fix: update sla doctype directly
(cherry picked from commit 2d41704424)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-08-29 22:17:39 +05:30
ruthra kumar
b3b0272ec9 chore: patch for migrating remarks to payment ledger 
(cherry picked from commit 3a6b095ed4)
 2022-08-29 14:19:46 +00:00
Deepesh Garg
fa4a40812c Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-31816 2022-08-22 09:09:16 +05:30
mergify[bot]
50ad612453 fix: Add dimension section in subcontracting doctypes (backport #31849) (#31877) 
* fix: Add dimension section in subcontracting doctypes (#31849)

(cherry picked from commit 8704ca783d)

# Conflicts:
#	erpnext/patches.txt

* chore: conflicts

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-18 12:04:07 +05:30
Nabin Hait
35e9bfca38 fix: map old data as per new options of no-of-employees 
(cherry picked from commit 909945c0ac)
 2022-08-09 15:18:25 +00:00
ruthra kumar
04bdff736b chore: patch for creating existing dimensions in asset repair 
(cherry picked from commit 80f508c4b1)
 2022-08-08 11:10:25 +00:00
Marica
d2d651a0c3 Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-25 12:43:08 +05:30
Rucha Mahabal
7b0e5661c6 fix(patch): ignore links while deleting hr payroll doctypes (#31674) 2022-07-22 12:46:59 +05:30
Sagar Vora
bf2833b8ee fix: ensure defaults removed in bad frappe patch get set again (#31659) 2022-07-21 13:32:03 +05:30
Deepesh Garg
6d61525ae4 Merge pull request #31648 from deepeshgarg007/dimension-patch-fix 
fix: Patch to make accounting dimension in orders
 2022-07-20 19:02:00 +05:30
Deepesh Garg
d46e406db7 fix: Patch to make accounting dimension in orders 2022-07-20 18:59:36 +05:30
Rucha Mahabal
8b67d627d8 fix(patch): Remove missed records for HR & Payroll separation (#31646) 
* fix(patch): delete HR Payroll custom fields from core

* fix: delete HR Payroll dashboard chart, number card, web forms
 2022-07-20 18:56:37 +05:30
Rucha Mahabal
f222284c33 Merge branch 'develop' into hr-separation 2022-07-20 15:47:40 +05:30
Nabin Hait
6c29146c91 fix: Removed 'Allow Monthly Depreciation' checkbox 2022-07-20 14:27:06 +05:30
Rucha Mahabal
8ce526115d patch: Add HR & Payroll deprecation warning 2022-07-19 13:19:34 +05:30
Rucha Mahabal
2ae48fbdd4 Merge branch 'develop' into hr-separation 2022-07-18 10:58:22 +05:30
Sagar Vora
70c4117c22 fix: unlink custom fields in patch 2022-07-14 15:02:37 +05:30
Sagar Vora
be4a44fccd Merge remote-tracking branch 'upstream/develop' into ic-lingering-code 2022-07-14 14:36:14 +05:30
Rucha Mahabal
db586afc7b chore: Remove Salary Component Accounts doctype from Accounts module 2022-07-13 13:38:58 +05:30
Rucha Mahabal
d8aa1c59f1 Merge branch 'develop' into hr-separation 2022-07-12 19:27:19 +05:30
Marica
681b334236 Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-11 11:22:51 +05:30
Sagar Vora
93f87cb6e2 chore: remove missed code for India localisation 2022-07-07 16:41:41 +05:30
Rucha Mahabal
2248276fe9 chore: Remove gratuity rule patch 2022-07-07 13:48:59 +05:30
Rucha Mahabal
ef02e58859 Merge branch 'develop' into hr-separation 2022-07-07 13:46:54 +05:30
Sagar Sharma
f9885746a8 Merge branch 'develop' into subcontracting 2022-07-07 09:56:23 +05:30
Marica
b58d7d1c89 Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-06 14:43:23 +05:30
Rucha Mahabal
2da427c023 patch: do not run deletion patch if HRMS is already installed 2022-07-04 14:54:23 +05:30
Rucha Mahabal
1497e26f82 fix: patches 2022-06-29 18:38:39 +05:30
Marica
1a749e2589 Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-06-29 10:25:30 +05:30