nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 02:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,002 Commits 478 Branches 1,759 Tags
4a35ff0e5763d4a124de0d84be6a1dce288e1a37
Commit Graph

1485 Commits

Author SHA1 Message Date
mergify[bot]
a3aa4d536a chore: Update user manual link (#34478) 
* chore: Update user manual link (#34478)

(cherry picked from commit be723bb9d4)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflicts

* chore: Update version

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

* chore: Update version

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-03-19 18:08:15 +05:30
Anand Baburajan
f5efb2057c fix: manual depr entry not updating asset value [v13] (#33890) 
fix: asset value for manual depr entries
 2023-01-31 11:00:06 +05:30
rohitwaghchaure
d717ca0325 fix: conflicts 2023-01-20 14:05:14 +05:30
Rohit Waghchaure
1c5c06716b fix: patch item_reposting_for_incorrect_sl_and_gl 
(cherry picked from commit dbde3a3421)

# Conflicts:
#	erpnext/patches.txt
 2023-01-20 06:14:02 +00:00
Deepesh Garg
d73237e896 chore: Resolve conflicts 2022-10-29 11:06:53 +05:30
Deepesh Garg
7ddcfc00fc chore: Add patch to update repayment schedule type in loan documents 
(cherry picked from commit 679b5ed551)

# Conflicts:
#	erpnext/patches.txt
 2022-10-23 14:09:17 +00:00
Ritwik Puri
2e3445fad9 chore: patch for removing stale values in Naming Series (#32271) 2022-09-19 13:35:08 +05:30
Deepesh Garg
9e16f4e412 chore: resolve conflicts 2022-08-09 17:55:02 +05:30
ruthra kumar
a420d0242c chore: patch for creating existing dimensions in asset repair 
(cherry picked from commit 80f508c4b1)

# Conflicts:
#	erpnext/patches.txt
 2022-08-08 11:09:55 +00:00
Rucha Mahabal
9985d28571 chore: Add HR & Payroll deprecation warning (#31720) 2022-07-28 11:43:49 +05:30
mergify[bot]
763787b0a5 fix: ensure defaults removed in bad frappe patch get set again (backport #31659) (#31661) 
fix: ensure defaults removed in bad frappe patch get set again (#31659)

(cherry picked from commit bf2833b8ee)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2022-07-21 13:54:55 +05:30
Nabin Hait
616e3c66b9 fix: Removed 'Allow Monthly Depreciation' checkbox and fixed wdv depreciation rate 2022-07-20 17:32:28 +05:30
Smit Vora
6bda2a0865 chore: deprecation warning for remove-india 2022-07-05 21:20:51 +05:30
Deepesh Garg
4c9422fb1b chore: resolve conflicts 2022-06-10 12:39:12 +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
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
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
d9756d54ad chore: resolve conflicts 2022-05-02 11:15:58 +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
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
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
0bafec2384 fix: merge conflicts 2022-03-31 14:24:42 +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
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
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
mergify[bot]
03d7fc1570 fix: broken production item links on production plan (backport #30399) (#30400) 
* fix: only validate qty for main non-subassy items

(cherry picked from commit 3d43c437ad)

* fix: subassembly items linked to temporary name

Production Plan tables for po_items and sub_assembly_items are prepared
client side so both dont exist at time of first save or modifying and
hence any "links" created are invalid. This change retains temporary
name so it can be relinked server side after naming is performed.

Co-Authored-By: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 5b1d6055e6)

* test: dont resubmit WO

[skip ci]

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-24 17:30:58 +05:30
Deepesh Garg
7cae669e81 fix(India): Auto tax fetching based on GSTIN 2022-03-23 18:47:58 +05:30
Deepesh Garg
da09b64174 fix: Conflicts 2022-03-21 10:28: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]
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
Deepesh Garg
d1049b0d00 fix: Resolve conflicts 2022-02-23 11:10:07 +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
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
Sagar Sharma
7fa46f77e0 revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" (#29782) 
* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"

This reverts commit 038f949550, reversing
changes made to c7b4918434.

* fix: linter
 2022-02-14 19:54: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
066ceb06cd fix: Resolve conflicts 2022-02-07 18:46:53 +05:30
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
aa16a4bb5f chore: Resolve conflicts 2022-02-01 15:02:23 +05:30