nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,063 Commits 402 Branches 1,700 Tags
bbcd10161340b8a3ae9c10e01b18562bea67c0d4
Commit Graph

44063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vishal
bbcd101613 chore: minor changes in pos_controller 
(cherry picked from commit f18ae5856f)
 2023-02-28 09:26:38 +00:00
Vishal
f812dbc524 chore: minor change 
(cherry picked from commit a51bec0269)
 2023-02-28 09:26:37 +00:00
Vishal
786eb97ab4 chore: minor changes added to code 
(cherry picked from commit 3ebe7d861d)
 2023-02-28 09:26:37 +00:00
Vishal
db964e8256 fix: multiple pos conversion issue resolved 
(cherry picked from commit 1de531e56e)
 2023-02-28 09:26:36 +00:00
ruthra kumar
3117758575 Merge pull request #34219 from frappe/mergify/bp/version-14-hotfix/pr-34207 
fix: permission error while calling get_work_order_items (backport #34207)
 2023-02-28 10:16:36 +05:30
Sagar Sharma
7797645583 Merge pull request #34226 from frappe/mergify/bp/version-14-hotfix/pr-34225 
fix: set `from_warehouse` and `to_warehouse` while mapping SE (backport #34225)
 2023-02-27 13:21:03 +05:30
s-aga-r
80e23d035e fix: set from_warehouse and to_warehouse while mapping SE 
(cherry picked from commit c09a61f360)
 2023-02-27 07:23:21 +00:00
mergify[bot]
4d92d469e4 fix: currency in coa import (#34174) 
* fix: currency in coa import

(cherry picked from commit 19c0b7a523)

* chore: change column label

(cherry picked from commit e3c000d0be)

---------

Co-authored-by: vishnu <vishnuviswambaran2002@gmail.com>
 2023-02-27 12:19:12 +05:30
Sagar Sharma
14c248cfbc Merge pull request #34223 from frappe/mergify/bp/version-14-hotfix/pr-34212 
fix: Remove missing DocField in fetch_from (backport #34212)
 2023-02-27 12:15:43 +05:30
Brian Pond
dc6ae46d59 fix: Remove missing DocField in fetch_from 
(cherry picked from commit 83f3e317e1)
 2023-02-27 06:24:24 +00:00
mergify[bot]
88a781fa43 fix: german translations (#31732) 
fix: german translations (#31732)

(cherry picked from commit 6b510546ae)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-02-27 11:50:45 +05:30
Sagar Sharma
dd0876da17 Merge pull request #34208 from frappe/mergify/bp/version-14-hotfix/pr-34206 
fix: not able to repost gl entries (backport #34206)
 2023-02-27 10:27:00 +05:30
Sagar Sharma
e93bc94f0b Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-34206 2023-02-27 10:26:45 +05:30
ruthra kumar
17198844c0 fix(test): use standalone method to fetch work orders from SO 
(cherry picked from commit a11d3327df)
 2023-02-27 04:33:17 +00:00
ruthra kumar
3ea90ee5cb fix: permission error while calling get_work_order_items 
(cherry picked from commit b6bad728cd)
 2023-02-27 04:33:17 +00:00
Anand Baburajan
a9b8187dd0 Merge pull request #34205 from AnandBaburajan/manual_asset_schedule 
fix: asset manual depr schedule
 2023-02-26 20:07:50 +05:30
anandbaburajan
d56ca011fe chore: refactor long if conditions 2023-02-26 15:03:16 +05:30
anandbaburajan
75386e3653 chore: should prepare schedule if not draft 2023-02-25 21:17:18 +05:30
anandbaburajan
dda6baea3e fix: incorrect acc depr amount if multiple FBs with straight line or manual method 2023-02-25 14:43:24 +05:30
Rohit Waghchaure
ae0318ef74 fix: not able to repost gl entries 
(cherry picked from commit 7d10dd9ea8)
 2023-02-24 15:41:25 +00:00
anandbaburajan
b0d670a51d chore: handle change in opening_accumulated_depreciation properly 2023-02-24 20:35:29 +05:30
Anand Baburajan
e0ad1a305e Merge branch 'version-14-hotfix' into manual_asset_schedule 2023-02-24 18:14:03 +05:30
rohitwaghchaure
dddbfba6da Merge pull request #34200 from frappe/mergify/bp/version-14-hotfix/pr-34199 
fix: conversion factor not set (backport #34199)
 2023-02-24 17:53:03 +05:30
Anand Baburajan
149043e8d4 Merge branch 'version-14-hotfix' into manual_asset_schedule 2023-02-24 16:48:43 +05:30
anandbaburajan
971c0720e5 fix: manual depr schedule 2023-02-24 16:38:39 +05:30
Deepesh Garg
c6a46bc184 Merge pull request #34203 from frappe/mergify/bp/version-14-hotfix/pr-34202 
Revert "fix: Concurrency issues in Sales and Purchase returns" (backport #34202)
 2023-02-24 15:32:00 +05:30
Deepesh Garg
9341d3e60e Revert "fix: Concurrency issues in Sales and Purchase returns" (#34202) 
Revert "fix: Concurrency issues in Sales and Purchase returns (#34019)"

This reverts commit a67284e96d.

(cherry picked from commit e26c6dc76b)
 2023-02-24 09:58:40 +00:00
Rohit Waghchaure
089c7d0a37 fix: conversion factor not set 
(cherry picked from commit 8e46aebc50)
 2023-02-24 09:27:37 +00:00
rohitwaghchaure
230e345732 Merge pull request #34190 from frappe/mergify/bp/version-14-hotfix/pr-34189 
fix: user shouldn't able to make item price for item template (backport #34189)
 2023-02-24 09:23:22 +05:30
Rohit Waghchaure
fb8e45d3d9 fix: user shouldn't able to make item price for item template 
(cherry picked from commit 6417ae0ee8)
 2023-02-23 15:18:43 +00:00
rohitwaghchaure
b2582c56b7 Merge pull request #34177 from frappe/mergify/bp/version-14-hotfix/pr-34173 
fix: incorrect color in the BOM Stock Report (backport #34173)
 2023-02-23 20:47:24 +05:30
ruthra kumar
908d2f687e Merge pull request #34184 from frappe/mergify/bp/version-14-hotfix/pr-34022 
perf: Gross Profit report will fetch SLE's on demand and memoize (backport #34022)
 2023-02-23 12:54:25 +05:30
ruthra kumar
204f9a414f refactor: use docstatus from Delivery Note Item 
(cherry picked from commit 88d888d9d0)
 2023-02-23 06:26:15 +00:00
ruthra kumar
db1f17e5bc perf: fetch SLE's on demand and memoize 
(cherry picked from commit 3e5691072a)
 2023-02-23 06:26:15 +00:00
rohitwaghchaure
292f7c57c5 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-34173 2023-02-23 11:36:34 +05:30
rohitwaghchaure
b0103b85a0 Merge pull request #34181 from frappe/mergify/bp/version-14-hotfix/pr-34172 
fix: zero division error while making LCV (backport #34172)
 2023-02-23 11:25:03 +05:30
Rohit Waghchaure
1859be6fef fix: zero division error while making LCV 
(cherry picked from commit 80e94a08cf)
 2023-02-23 05:24:58 +00:00
ruthra kumar
b37695f2f3 Merge pull request #34180 from frappe/mergify/bp/version-14-hotfix/pr-34176 
fix: ui freeze upon item selection in sales invoice (backport #34176)
 2023-02-23 10:52:32 +05:30
ruthra kumar
1750ed4fb6 fix: ui freeze on item selection in sales invoice 
(cherry picked from commit 6412583e98)
 2023-02-23 05:06:51 +00:00
Rohit Waghchaure
001ed9e9ff fix: incorrect color in the BOM Stock Report 
(cherry picked from commit a8f03ebf7f)
 2023-02-23 04:25:45 +00:00
ruthra kumar
9c43e3a721 Merge pull request #34164 from frappe/mergify/bp/version-14-hotfix/pr-34102 
fix: check for duplicate pos invoices in closing entry (backport #34102)
 2023-02-21 20:03:08 +05:30
ruthra kumar
05d649087b fix: check for duplicate in pos closing and pos merge log entry 
(cherry picked from commit 47add0b751)
 2023-02-21 13:16:33 +00:00
mergify[bot]
74a3588e04 patch: reorder migration patches (#34071) 
chore: reorder migration patches.

'migrate_gl_to_payment_ledger',
'migrate_remarks_from_gl_to_payment_ledger' should always run last.

(cherry picked from commit 68202639f5)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-21 15:34:24 +05:30
mergify[bot]
0bd765b8ca refactor: clear records in batches in 'Transaction Deletion Record' (#34109) 
refactor: clear records in batches in 'Transaction Deletion Record' (#34109)

refactor: clear records in batches
(cherry picked from commit 4a7b1de2d8)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-21 15:06:45 +05:30
mergify[bot]
44c837f862 fix: Filters in item-wise sales history report (#34145) 
fix: Filters in item-wise sales history report (#34145)

(cherry picked from commit c88444a6c4)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-21 15:06:00 +05:30
mergify[bot]
65aec3e4ff fix: Use normal rounding for Tax Withholding Category (#34114) 
fix: Use normal rounding for Tax Withholding Category (#34114)

(cherry picked from commit 35cdd996a9)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-21 14:22:57 +05:30
mergify[bot]
00eb6329a7 feat: Editable Sales Invoice (#32625) 
* feat: Editable Sales Invoice

(cherry picked from commit 30da6ab2c1)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json

* chore: Update allow on submit for Sales Invoice fields

(cherry picked from commit e626107d3d)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

* chore: Break into smaller functions

(cherry picked from commit 42e4c37f15)

* chore: Update allow on submit fields

(cherry picked from commit 1105e52031)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json

* test: Add unit tests

(cherry picked from commit ed98015a56)

* chore: Update tests

(cherry picked from commit 1a980123a2)

* chore: Reset repost_required_flag on cancel

(cherry picked from commit 0966867c08)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py

* chore: Enable no-copy for repost required field

(cherry picked from commit 5fe55176ec)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json

* chore: Validate for deferred revenue invoices

(cherry picked from commit e29f756146)

* chore: Resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-21 14:21:36 +05:30
Anand Baburajan
ce817e97eb Merge pull request #34155 from frappe/mergify/bp/version-14-hotfix/pr-34153 
fix: fiscal year error for existing assets in fixed asset register (backport #34153)
 2023-02-21 14:18:21 +05:30
anandbaburajan
7074c2b161 fix: fiscal year error for existing assets in fixed asset register 
(cherry picked from commit 76861eb332)
 2023-02-21 08:25:46 +00:00
Sagar Sharma
0de0501a48 Merge pull request #34146 from frappe/mergify/bp/version-14-hotfix/pr-34138 
fix(ux): `ReferenceError: me is not defined` Delivery Note (backport #34138)
 2023-02-21 10:31:17 +05:30