CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-15 16:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,526 Commits 416 Branches 1,718 Tags
ae26e550d09376ffb503e26daa1306197d83d588
Commit Graph

43526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sagar Sharma
ae26e550d0 Merge pull request #33140 from frappe/mergify/bp/version-14-hotfix/pr-33139 
fix: reposting error `AttributeError: 'datetime.timedelta' object has no attribute 'replace'` (backport #33139)
 2022-11-28 22:06:21 +05:30
s-aga-r
4b0c9b6115 fix: reposting error AttributeError: 'datetime.timedelta' object has no attribute 'replace' 
(cherry picked from commit eeda264eb6)
 2022-11-28 16:01:39 +00:00
s-aga-r
65ac84e020 fix: validation msg in stock entry 
(cherry picked from commit ba77da0874)
 2022-11-28 16:01:39 +00:00
rohitwaghchaure
648a017eda Merge pull request #33137 from frappe/mergify/bp/version-14-hotfix/pr-33135 
feat: make Material Request for sub-assembly items (backport #33135)
 2022-11-28 18:32:54 +05:30
Rohit Waghchaure
5fc4dfaad6 feat: make Material Request for sub-assembly items 
(cherry picked from commit e02f35c8ff)
 2022-11-28 11:24:31 +00:00
mergify[bot]
0ba2a4d084 fix: opportunity list doesn't show assigned user (backport #33110) (#33131) 
fix: opportunity list doesn't show assigned user (#33110)

Because `db_update` is performed `_assign` property is not updated and
hence lead -> opportunity conversion makes it disappear from list view.

Steps to reproduce:

1. Create lead
2. Assign anyone
3. Create opportunity from lead.
4. Form view shows assigned user, list view wont.

(cherry picked from commit 63b9795d41)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-28 11:19:32 +05:30
Deepesh Garg
956b0520d7 Merge pull request #33113 from frappe/mergify/bp/version-14-hotfix/pr-33111 
fix: Loan disbursable amount on current security price (backport #33111)
 2022-11-27 20:50:09 +05:30
rohitwaghchaure
f365e6b4a2 Merge pull request #33127 from frappe/mergify/bp/version-14-hotfix/pr-33118 
fix: production plan UX (backport #33118)
 2022-11-27 18:47:39 +05:30
Sagar Sharma
9533a64f6a Merge pull request #33123 from frappe/mergify/bp/version-14-hotfix/pr-33120 
fix: `Work Order Summary` and `Job Card Summary` Report (backport #33120)
 2022-11-27 10:27:37 +05:30
Rohit Waghchaure
46075901ba fix: production plan UX 
(cherry picked from commit 8cb7112e72)
 2022-11-27 03:17:28 +00:00
s-aga-r
c9f4f60425 fix: production_item filter in Job Card Summary Report 
(cherry picked from commit ef7fd670fc)
 2022-11-26 16:24:52 +00:00
s-aga-r
9c6d020e49 fix: company name with , in Job Card Summary Report 
(cherry picked from commit 481149814e)
 2022-11-26 16:24:52 +00:00
s-aga-r
b1571932d0 fix: Work Order filter typo in Job Card Summary Report 
(cherry picked from commit 2e4f3e9317)
 2022-11-26 16:24:51 +00:00
s-aga-r
bc649b371f fix: company name with , in Work Order Summary Report 
(cherry picked from commit 87b39f045c)
 2022-11-26 16:24:50 +00:00
Sagar Sharma
6e5fd55ed4 Merge pull request #33108 from frappe/mergify/bp/version-14-hotfix/pr-33090 
fix: MR Item `item_name` and `description` gets reset on `qty` change (backport #33090)
 2022-11-26 10:07:50 +05:30
Abhinav Raut
5edaf83733 fix: disbursable amount on currrent security price 
(cherry picked from commit fe87c27acd)
 2022-11-25 09:48:42 +00:00
s-aga-r
85d108b810 fix: MR Item description and item_name gets reset on qty change 
(cherry picked from commit df0fee2312)
 2022-11-25 05:49:50 +00:00
Deepesh Garg
ae6ad1e47d Merge pull request #33096 from frappe/mergify/bp/version-14-hotfix/pr-33092 
fix: Debit and Credit not equal while submitting PI containing asset item (backport #33092)
 2022-11-24 21:22:44 +05:30
Deepesh Garg
98d5cb30d1 Merge pull request #33106 from frappe/mergify/bp/version-14-hotfix/pr-33103 
fix: job card "Qty to Manufacture" UX (backport #33103)
 2022-11-24 21:22:28 +05:30
Deepesh Garg
8cd2539755 Merge pull request #33104 from frappe/mergify/bp/version-14-hotfix/pr-33100 
fix: Dispatch address display (backport #33100)
 2022-11-24 21:22:02 +05:30
Rohit Waghchaure
59e2ab702f fix: job card for quantity UX 
(cherry picked from commit 87d37e90a2)
 2022-11-24 13:54:59 +00:00
Deepesh Garg
ef687e22b8 fix: Dispatch address display 
(cherry picked from commit 104fdcb9f9)
 2022-11-24 12:31:13 +00:00
Deepesh Garg
517e40e1b8 Merge pull request #33099 from frappe/mergify/bp/version-14-hotfix/pr-33097 
fix: precision in asset test_scrap_asset (backport #33097)
 2022-11-24 16:58:04 +05:30
anandbaburajan
0fe5e9a9d1 fix: precision in asset test_scrap_asset 
(cherry picked from commit 0e726609f1)
 2022-11-24 10:44:31 +00:00
Deepesh Garg
c11a31b390 fix: Debit and Credit not equal while submitting PI containing asset item 
(cherry picked from commit dc8d635120)
 2022-11-24 09:14:06 +00:00
Deepesh Garg
82e41a2721 Merge pull request #33089 from frappe/mergify/bp/version-14-hotfix/pr-33088 
fix: Valuation Rate column UX in stock ledger report (backport #33088)
 2022-11-23 18:22:15 +05:30
Rohit Waghchaure
5c065e8a64 fix: Valuation Rate column UX in stock ledger report 
(cherry picked from commit be19e4f621)
 2022-11-23 12:00:49 +00:00
rohitwaghchaure
188b18dc5b Merge pull request #33083 from frappe/mergify/bp/version-14-hotfix/pr-33077 
fix: UX for inventory dimension (backport #33077)
 2022-11-23 12:33:44 +05:30
Deepesh Garg
5d7c4c182a Merge pull request #33085 from frappe/mergify/bp/version-14-hotfix/pr-33062 
fix: create rounding gl entry for PCV during gle post processing (backport #33062)
 2022-11-23 11:50:26 +05:30
Deepesh Garg
798717b12b Merge pull request #33082 from frappe/mergify/bp/version-14-hotfix/pr-33063 
feat: item wise tds in purchase order (backport #33063)
 2022-11-23 11:47:54 +05:30
Deepesh Garg
7a9f384b18 chore: resolve conflicts 2022-11-23 10:58:47 +05:30
Nabin Hait
fd4bcd9f7f fix: create rounding gl entry for PCV during gle post processing 
(cherry picked from commit 022d8d5d79)
 2022-11-23 05:07:29 +00:00
Rohit Waghchaure
f1dd4d0449 fix: UX for inventory dimension 
(cherry picked from commit 0a69523940)
 2022-11-23 04:24:36 +00:00
niralisatapara
5f8f574e20 feat: item wise tds calculation for purchase order 
(cherry picked from commit 0fdde2e5c0)

# Conflicts:
#	erpnext/patches.txt
 2022-11-23 04:22:46 +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
niralisatapara
ba3643514e feat: item wise tds in purchase order 
(cherry picked from commit b9d0b4e2d3)
 2022-11-23 04:22:45 +00:00
Deepesh Garg
084d81025c Merge pull request #33078 from frappe/mergify/bp/version-14-hotfix/pr-33072 
chore: Rearrange supplier invoice section in Purchase Invoice (backport #33072)
 2022-11-22 20:41:10 +05:30
Deepesh Garg
995ad90b5a Merge pull request #33079 from frappe/mergify/bp/version-14-hotfix/pr-33068 
fix: Don't show payment button for invoices on hold (backport #33068)
 2022-11-22 20:40:53 +05:30
Deepesh Garg
f71f907b31 Merge pull request #33080 from frappe/mergify/bp/version-14-hotfix/pr-33069 
fix: Remove unnecessary filters from Journal Entry (backport #33069)
 2022-11-22 20:40:34 +05:30
Deepesh Garg
387665d221 fix: Remove unnecessary filters from Journal Entry 
(cherry picked from commit cd88a53533)
 2022-11-22 14:46:02 +00:00
Deepesh Garg
7487acdeb6 fix: Don't show payment button for invoices on hold 
(cherry picked from commit 1b9e83251f)
 2022-11-22 14:45:39 +00:00
Deepesh Garg
54317b56ea chore: Rearrange supplier invoice section in Purchase Invoice 
(cherry picked from commit e96be712b8)
 2022-11-22 14:45:05 +00:00
ruthra kumar
a2012cb710 Merge pull request #33073 from frappe/mergify/bp/version-14-hotfix/pr-33071 
fix: advance paid updated in account currency for SO/PO (backport #33071)
 2022-11-22 14:27:06 +05:30
ruthra kumar
48a3b3f6f3 test: fix test case for SO/PO advance amount 
(cherry picked from commit 541cf153f7)
 2022-11-22 08:15:57 +00:00
ruthra kumar
14235f24b2 fix: update advace paid in SO/PO in account currency 
(cherry picked from commit bf76b85dfd)
 2022-11-22 08:15:56 +00:00
Deepesh Garg
622c5837cf Merge pull request #33056 from frappe/mergify/bp/version-14-hotfix/pr-33051 
fix: Timesheet timer button (backport #33051)
 2022-11-21 14:04:47 +05:30
Deepesh Garg
db0b4d5966 Merge pull request #33055 from frappe/mergify/bp/version-14-hotfix/pr-33052 
fix: Viewing account ledger from party master (backport #33052)
 2022-11-21 12:49:28 +05:30
Deepesh Garg
53cf6b8c89 fix: Timesheet timer button 
(cherry picked from commit 64802d1220)
 2022-11-21 05:45:35 +00:00
Deepesh Garg
da2dfcc10b fix: Viewing account ledger from party master 
(cherry picked from commit 15e74c5d7b)
 2022-11-21 05:45:08 +00:00
Deepesh Garg
8215469b5e Merge pull request #33044 from frappe/mergify/bp/version-14-hotfix/pr-32958 
fix: link `Item Price` brand to `Brand` doctype. (backport #32958)
 2022-11-20 18:52:26 +05:30