nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 18:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,725 Commits 636 Branches 1,812 Tags
d9723a12c43e620d7845cd927eafb515f122f55d
Commit Graph

3067 Commits

Author SHA1 Message Date
Smit Vora
6bda2a0865 chore: deprecation warning for remove-india 2022-07-05 21:20:51 +05:30
Deepesh Garg
1aaca097b3 chore: Linting Issues 2022-06-10 12:51:16 +05:30
Deepesh Garg
c19dfbe98a fix: Add cost center in loan document 
(cherry picked from commit 5d66cc4c4a)

# Conflicts:
#	erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
#	erpnext/patches.txt
 2022-06-07 08:40:48 +00:00
mergify[bot]
a7fc278b60 fix(job card): only hold during draft state (backport #31243) (#31249) 
* fix(job card): only hold during draft state (#31243)

(cherry picked from commit ee5bc58e9b)

# Conflicts:
#	erpnext/patches.txt

* chore: conflicts

Co-authored-by: Ankush Menat <me@ankush.dev>
 2022-06-06 19:54:56 +05:30
mergify[bot]
4aeb448fea fix: remove leave policy assignment creation patch (backport #31097) (#31204) 
* fix: remove leave policy assignment creation patch (#31097)

(cherry picked from commit d4b9cc0242)

# Conflicts:
#	erpnext/patches.txt

* chore: fix conflicts

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-06-01 12:46:17 +05:30
Rucha Mahabal
cac9e245b6 patch: Employee Advance return statuses 2022-05-24 11:11:10 +05:30
mergify[bot]
a019cb6caa fix: dont fail repost for recoverable errors (backport #30979) (#31023) 
recoverable erros:
1. timeout
2. lock/deadlocks

(cherry picked from commit 80d959c579)

Co-authored-by: Ankush Menat <me@ankush.dev>
 2022-05-16 12:08:32 +05:30
Deepesh Garg
43ebe946f1 Merge pull request #30982 from deepeshgarg007/failing_patch_for_dimensisons 
fix: Failing accounting dimension patch
 2022-05-12 14:57:01 +05:30
Deepesh Garg
b14a7b8a5d fix: Failing accounting dimension patch 2022-05-12 13:54:47 +05:30
mergify[bot]
97ea1f5123 fix: per_billed for return DN (backport #30868) (#30971) 
This is a semi-automatic backport of pull request #30868 done by [Mergify](https://mergify.com).
 2022-05-11 14:33:58 +00:00
Rucha Mahabal
9189653f2e fix: patch for renaming membership settings (#30929) 2022-05-09 10:11:52 +05:30
Saqib Ansari
2972ef8f2c chore: fix linter (#30925) 2022-05-08 12:48:57 +05:30
Ganga Manoj
bf2eaecb1d fix: Set available-for-use date if missing (#30838) 2022-05-06 18:06:21 +05:30
mergify[bot]
37fad7e04c fix: convert default_item_manufacturer to link field (#30835) (#30866) 
(cherry picked from commit dcda55641b)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-05-02 14:58:05 +05:30
Deepesh Garg
7c0069c0d3 chore: Education domain deprecation warning (#30861) 
* chore: Education domain deprecation warning

* chore: Education domain deprecation warning

* chore: Rename file and patch
 2022-05-02 13:29:25 +05:30
Deepesh Garg
5df50588cf fix: Consistent accounting dimensions across Sales and Purchase docs 
(cherry picked from commit 82a0635c66)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/selling/doctype/sales_order/sales_order.json
 2022-05-01 16:33:16 +00:00
Marica
d8944b0499 Merge branch 'version-13-hotfix' into patch-4 2022-04-21 12:32:17 +05:30
marination
dc2f694547 fix: Handle Multiselect field mapping separately 
- Map Multiselect child table to Website Item (copy rows)
 2022-04-20 17:47:14 +05:30
marination
e76220e819 fix: Mistyped variable name in patch 2022-04-20 12:27:04 +05:30
mergify[bot]
38002e3fe2 fix(patch): check if column is present while fixing reverse linking (backport #30737) (#30739) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-04-19 12:39:28 +05:30
marination
9506dbe433 chore: Patch to copy custom fields (field filters) from Item to Website Item 2022-04-18 21:38:22 +05:30
Ankush Menat
ef4eb4705e chore: warning for DATEV deprecation (#30703) 2022-04-13 15:07:48 +05:30
Saqib Ansari
d720d15e3d fix(pos): reload doc before set value (#30610) 2022-04-06 22:32:23 +05:30
mergify[bot]
14f46a3e26 fix: check null values in is_cancelled patch (#30594) (#30595) 
(cherry picked from commit bb875fe217)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-04-06 15:14:37 +05:30
Saqib Ansari
ab7417c26a fix: invalid keyword argument 'pluck' 2022-03-31 14:38:40 +05:30
Saqib Ansari
82aea2b998 fix: set is_return & return_against in POS Invoice Reference table 
(cherry picked from commit 16253a2f72)

# Conflicts:
#	erpnext/patches.txt
 2022-03-31 08:47:20 +00:00
Saqib Ansari
1a169c9dc5 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-30419 2022-03-31 12:02:15 +05:30
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
Saqib Ansari
3142e6f188 fix: move item tax to item tax template patch 
(cherry picked from commit 936267c934)
 2022-03-28 12:05:23 +00:00
Deepesh Garg
156416bcc3 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into quotation_gst 2022-03-27 17:28:42 +05:30
Rucha Mahabal
e783e3f93e fix: do not update status to Paid if sanctioned amount is 0 2022-03-25 23:43:46 +05:30
Rucha Mahabal
961e691bdc fix: Expense Claim conditions for Paid status 
- status doesn't change to Paid if the entire required amount is already covered via linked advances

- status doesn't change to Paid if the claim is partially paid via advances

- patch to update such uncancelled claims to Paid
 2022-03-25 23:43:46 +05:30
mergify[bot]
29fde6ee8b fix: failing broken patches (#30409) (#30412) 
* fix: failing broken patches

* refactor: simpler conditions

[skip ci]

(cherry picked from commit c4854bb1b1)

Co-authored-by: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
 2022-03-25 12:57:05 +05:30
Deepesh Garg
7cae669e81 fix(India): Auto tax fetching based on GSTIN 2022-03-23 18:47:58 +05:30
Deepesh Garg
75458f90b5 fix: Add permission for KSA Vat documents 
(cherry picked from commit 972d06555a)

# Conflicts:
#	erpnext/patches.txt
 2022-03-21 04:49:05 +00:00
Rucha Mahabal
15413cf835 fix: Non Profit fixes (#30280) 2022-03-17 12:52:02 +05:30
mergify[bot]
6ef08545b6 fix: Leave Policy Assignment creation patch (backport #30215) (#30252) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-15 12:24:08 +05:30
mergify[bot]
2e79c4fd59 fix(ux): remove get item buttons from submitted production plan (#30224) 
(cherry picked from commit 1af13ca4bf)

fix(patch): remove dead links to ProdPlan Item

(cherry picked from commit d3e90ed8c8)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-14 15:17:46 +05:30
mergify[bot]
eb90d50946 fix: ignore non-unique swift numbers while migrating (#30139) 
(cherry picked from commit 4d8798b0ea)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-09 17:49:11 +05:30
Deepesh Garg
3aace2f420 fix: Reload doctypes 2022-03-09 10:11:01 +05:30
Deepesh Garg
c2129b762a fix: Add patch for account fields 
(cherry picked from commit a0bdcbd0cd)

# Conflicts:
#	erpnext/patches.txt
 2022-02-22 15:13:59 +00:00
Marica
f958956322 Merge pull request #29825 from frappe/mergify/bp/version-13-hotfix/pr-29803 
fix: Update SO via Work Order made from MR (attached to SO) (backport #29803)
 2022-02-18 19:20:12 +05:30
Ankush Menat
90ebe6f266 fix: avoid creating bins without item-wh 
Co-Authored-By:  Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Co-Authored-By: Saurabh <saurabh6790@gmail.com>
(cherry picked from commit c36bd7e1a6)
 2022-02-17 20:17:13 +05:30
marination
94a1016623 chore: Move patch that updates SO from WO to v13 2022-02-16 17:45:41 +05:30
marination
98ce6a1c8d chore: Patch to update SO work_order_qty and Linter fix 
(cherry picked from commit 0ca58d7627)

# Conflicts:
#	erpnext/patches.txt
 2022-02-16 08:35:11 +00:00
Sagar Sharma
83ab63ba81 chore: warning for Amazon MWS integration deprecation (#29792) 
* chore: warning for amazon mws integration deprecation

* style: spaces to tabs

[skip ci]
 2022-02-15 11:37:29 +05:30
Ankush Menat
94fc5f95db fix: concflicts 2022-02-09 12:21:38 +05:30
Ankush Menat
0ac16f9e63 fix: patch existing bins 
(cherry picked from commit e134524532db0473bef48b7e558e5d7a289f090e)

# Conflicts:
#	erpnext/patches.txt
 2022-02-09 06:17:27 +00:00
Deepesh Garg
946e560c55 feat: Refund entry against loans 
(cherry picked from commit c68c70f8bc)

# Conflicts:
#	erpnext/loan_management/doctype/loan/loan.json
#	erpnext/patches.txt
 2022-02-07 09:08:48 +00:00
Deepesh Garg
640b2d57de chore: fix tests 2022-02-01 17:25:26 +05:30