CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-14 15:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,568 Commits 416 Branches 1,717 Tags
f2f06aaa560f62dc1027aa84434c36fe7318661c
Commit Graph

43568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sagar Sharma
f2f06aaa56 Merge pull request #33159 from frappe/mergify/bp/version-14-hotfix/pr-33136 
fix: reset `voucher_type` and `voucher_no` if `based_on` is set to `Transaction` (backport #33136)
 2022-11-29 13:24:53 +05:30
s-aga-r
5728300f03 chore: make posting_date and posting_time read-only if based_on is set to Transaction 
(cherry picked from commit 4e10352b48)
 2022-11-29 06:44:35 +00:00
s-aga-r
e530f0b2fb fix: reset voucher_type and voucher_no if based_on is set to Item and Warehouse 
(cherry picked from commit eeec008547)
 2022-11-29 06:44:35 +00:00
rohitwaghchaure
8ebf34629d Merge pull request #33158 from frappe/mergify/bp/version-14-hotfix/pr-33013 
fix: validate repost item valuation against accounts freeze date (backport #33013)
 2022-11-29 12:06:29 +05:30
Sagar Sharma
72351e38f2 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33013 2022-11-29 11:16:53 +05:30
Deepesh Garg
6fa81089d6 Merge pull request #33152 from frappe/mergify/bp/version-14-hotfix/pr-33143 
fix: Auto repeat date validations (backport #33143)
 2022-11-29 11:07:46 +05:30
Deepesh Garg
fb6791abe3 Merge pull request #33153 from frappe/mergify/bp/version-14-hotfix/pr-33115 
fix: remove product schema block from additional info section on item template (backport #33115)
 2022-11-29 11:07:23 +05:30
Deepesh Garg
bf833c4f09 Merge pull request #33151 from frappe/mergify/bp/version-14-hotfix/pr-33138 
fix(ux): Action buttons in Bank Reconciliation (backport #33138)
 2022-11-29 11:06:48 +05:30
Deepesh Garg
5848147a92 Merge pull request #33155 from frappe/mergify/bp/version-14-hotfix/pr-33098 
fix(pos): warehouse selection (backport #33098)
 2022-11-29 11:06:21 +05:30
Deepesh Garg
150319d0cb Merge pull request #33156 from frappe/mergify/bp/version-14-hotfix/pr-33116 
fix: only show serial no batch selector only once (backport #33116)
 2022-11-29 11:06:08 +05:30
Deepesh Garg
b9ff172e13 Merge pull request #33154 from frappe/mergify/bp/version-14-hotfix/pr-33112 
fix(pos): filter on customer groups (backport #33112)
 2022-11-29 11:05:54 +05:30
Dany Robert
5854f1791c chore: pre-commit 
(cherry picked from commit 88a0aa4077)
 2022-11-29 05:11:39 +00:00
Dany Robert
c9c7222ded fix: check for session user rather than owner 
(cherry picked from commit b482e3876d)
 2022-11-29 05:11:39 +00:00
Dany Robert
68d9161a66 chore: pre-commit 
(cherry picked from commit be15419bd5)
 2022-11-29 05:11:38 +00:00
Dany Robert
04f50ea76a feat: validate repost item valuation against accounts freeze date 
(cherry picked from commit 61f05132db)
 2022-11-29 05:11:38 +00:00
rohitwaghchaure
4928058ed8 Merge pull request #33149 from frappe/mergify/bp/version-14-hotfix/pr-33144 
fix: incorrect balance qty (backport #33144)
 2022-11-29 10:41:36 +05:30
Shariq Ansari
8d0f715087 fix: only show serial no batch selector only once 
(cherry picked from commit 0f87d329d6)
 2022-11-29 04:51:19 +00:00
Sabu Siyad
c379baf7a2 feat(pos): invoice: fitler warehouse by company 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 4ad0e2ed7e)
 2022-11-29 04:46:19 +00:00
Sabu Siyad
c03ec80d1a fix(pos): warehouse should be in company 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 95a620a30d)
 2022-11-29 04:46:19 +00:00
Sabu Siyad
c1ae5b0af5 fix(pos): filter on customer groups 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit cc63415887)
 2022-11-29 04:26:25 +00:00
ruthra kumar
cdd13cd95f fix: remove duplicate schema 
(cherry picked from commit 2c18a95115)
 2022-11-29 04:06:25 +00:00
Deepesh Garg
5abcb478d0 chore: Update condition 
(cherry picked from commit 6a47fb6c9e)
 2022-11-29 03:59:09 +00:00
Deepesh Garg
2aada1a0d9 fix: Auto repeat date validations 
(cherry picked from commit fa15221455)
 2022-11-29 03:59:09 +00:00
Deepesh Garg
e093c32d06 Merge pull request #33128 from frappe/mergify/bp/version-14-hotfix/pr-33022 
feat: Incoterms in buying and selling (backport #33022)
 2022-11-29 09:28:59 +05:30
Deepesh Garg
93b8cc3042 fix(ux): Action buttons in Bank Reconciliation 
(cherry picked from commit 6ebe8ad60d)
 2022-11-29 03:54:02 +00:00
Rohit Waghchaure
93ec57dd44 test: test case for serialized batched item 
(cherry picked from commit b606a9684b)
 2022-11-29 03:18:53 +00:00
Rohit Waghchaure
f92b5011da fix: incorrect balance qty 
(cherry picked from commit b2105a8be7)
 2022-11-29 03:18:53 +00:00
Raffael Meyer
7477bb96c8 chore: resolve merge conflict 2022-11-28 18:51:40 +01:00
Deepesh Garg
6c3fbf03f9 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33022 2022-11-28 23:06:23 +05:30
Deepesh Garg
0d8112af76 Merge pull request #33133 from frappe/mergify/bp/version-14-hotfix/pr-33129 
chore: Supplier invoice no field description (backport #33129)
 2022-11-28 22:48:45 +05:30
Deepesh Garg
088c168f96 Merge pull request #33142 from frappe/mergify/bp/version-14-hotfix/pr-33107 
feat: german tax templates (backport #33107)
 2022-11-28 22:48:20 +05:30
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
barredterra
5652af04ba feat: german tax templates 
(cherry picked from commit 7fd2639e68)
 2022-11-28 16:25:02 +00:00
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
Deepesh Garg
6e3ad109d2 chore: Supplier invoice no field description 
(cherry picked from commit 4f2ece34df)
 2022-11-28 07:36:10 +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
barredterra
21deb02d81 chore: resolve merge conflicts 2022-11-27 16:30:19 +01:00
Raffael Meyer
978924a7e4 fix: remove obsolete comment 
(cherry picked from commit 491857b3c8)
 2022-11-27 15:24:20 +00:00
barredterra
89b9a06204 feat: add connections to Incoterm doctype 
(cherry picked from commit a5966b6f84)
 2022-11-27 15:24:19 +00:00
barredterra
f7988dea1b feat: add german translations for incoterm titles 
(cherry picked from commit ffd287d5a6)
 2022-11-27 15:24:19 +00:00
barredterra
88346b17e9 feat: add incoterm to purchasing transactions 
(cherry picked from commit 77105306f2)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 2022-11-27 15:24:18 +00:00
barredterra
fcfe0cb9e9 feat: add incoterm to sales transactions 
(cherry picked from commit 029f22c549)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 2022-11-27 15:24:17 +00:00
barredterra
93e029df91 feat: create Incoterm records after install 
(cherry picked from commit ce83f02f24)
 2022-11-27 15:24:16 +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
barredterra
b7119318a6 feat: add doctype Incoterm 
(cherry picked from commit 1a1bfc8db9)
 2022-11-27 15:24:15 +00:00
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