CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 18:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,320 Commits 424 Branches 1,723 Tags
fa2f1348ec8872ca79fdaa44a5fbb42c7e7f46d9
Commit Graph

38320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
fa2f1348ec fix(India setup): setup company independent fixtures for patch (#28304) 
(cherry picked from commit 88b5bda34b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-09 19:50:14 +05:30
rohitwaghchaure
346c76cf38 Merge pull request #28290 from frappe/mergify/bp/version-13-pre-release/pr-28150 
feat: provision to close the Work Order (backport #28150)
 2021-11-09 16:38:10 +05:30
rohitwaghchaure
81e7ebc112 Merge pull request #28293 from frappe/mergify/bp/version-13-pre-release/pr-28219 
feat: provision to have limited parameters for in-process quality inspection (backport #28219)
 2021-11-09 16:37:37 +05:30
Diksha Jadhav
bb9713a7b2 refactor: use fetch from property for qi template on job card 
(cherry picked from commit 467324c87f)
 2021-11-09 10:23:00 +00:00
Diksha Jadhav
ac54e80856 feat: provision to have limited parameters for in-process quality inspection 
(cherry picked from commit 6c45f8b2c4)
 2021-11-09 10:22:59 +00:00
Diksha Jadhav
3c78ac21d9 feat(manufacturing): add link field for quality inspection template on operation 
(cherry picked from commit 281a9cc749)
 2021-11-09 10:22:58 +00:00
Anupam
515b8dd8ca fix: get_planned_qty chnages 
(cherry picked from commit 663a7afe4d)
 2021-11-09 10:16:26 +00:00
Anupam
dac0d87e16 fix: test cases 
(cherry picked from commit 27709a1c71)
 2021-11-09 10:16:25 +00:00
Anupam
365572f5ea fix: testcases: 
(cherry picked from commit 7044ae5e39)
 2021-11-09 10:16:25 +00:00
Anupam
029e66709d fix: linter isuue 
(cherry picked from commit cc15cf6ae2)
 2021-11-09 10:16:24 +00:00
Anupam
8851b7adcf fix: sider isuue 
(cherry picked from commit ba47bd02b6)
 2021-11-09 10:16:24 +00:00
Anupam
116210dcea fix: validate job card 
(cherry picked from commit 9b4c7e4796)
 2021-11-09 10:16:23 +00:00
Anupam
dce943b41f fix: test cases 
(cherry picked from commit 9c0906f1b5)
 2021-11-09 10:16:23 +00:00
Anupam
cb209d9b57 fix: linter issues 
(cherry picked from commit e36da4d137)
 2021-11-09 10:16:23 +00:00
Anupam
7c7493c91d fix: linter issues 
(cherry picked from commit 59e4fd980c)
 2021-11-09 10:16:22 +00:00
Anupam
f3da88e301 fix: added testcase 
(cherry picked from commit 530a0f481e)
 2021-11-09 10:16:22 +00:00
Anupam
8ddeb83191 fix: sider issue 
(cherry picked from commit 264b0df9ff)
 2021-11-09 10:16:21 +00:00
Anupam
47f8f3d9dd fix: sider issue 
(cherry picked from commit 55e97dce8a)
 2021-11-09 10:16:20 +00:00
Anupam
44c53deb90 fix: sider issue 
(cherry picked from commit e290fe0721)
 2021-11-09 10:16:20 +00:00
Anupam
d43aecbe13 feat: added confirm dialog on closing of workorder 
(cherry picked from commit 5d4c5652af)
 2021-11-09 10:16:19 +00:00
Anupam
e8ef54f4d7 feat: provision to close the Work Order 
(cherry picked from commit 23af036894)
 2021-11-09 10:16:18 +00:00
mergify[bot]
eacf26d618 fix: show full item name in search widget (#28283) (#28285) 
(cherry picked from commit 34f5283c17)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-09 12:14:54 +05:30
mergify[bot]
40b5bb1d15 fix: do not generate multiple invoices (#28216) 2021-11-08 20:07:57 +05:30
Deepesh Garg
5d46f765a6 Merge pull request #28276 from frappe/mergify/bp/version-13-pre-release/pr-28262 
fix: Taxjar customer_address fix, currency fix (backport #28262)
 2021-11-08 19:04:06 +05:30
Deepesh Garg
2654098ce2 Merge pull request #28274 from frappe/mergify/bp/version-13-pre-release/pr-28272 
fix: KSA VAT setup issues (backport #28272)
 2021-11-08 18:52:20 +05:30
Subin Tom
a403200516 fix: company condition fix, added company field 
(cherry picked from commit 7ad2717acc)
 2021-11-08 13:12:00 +00:00
Subin Tom
1dc7cb8ad1 fix: fixed company field, updated patch 
(cherry picked from commit 7f2d304f32)
 2021-11-08 13:12:00 +00:00
Subin Tom
abe6ef4cd4 fix: Added company field, filtered account heads 
(cherry picked from commit 902c03cd37)
 2021-11-08 13:12:00 +00:00
Subin Tom
3d1b833f35 fix: Fixed customer address variable, sales invoice item field currency issue 
(cherry picked from commit 904010ab64)
 2021-11-08 13:11:59 +00:00
Deepesh Garg
2dc12505b2 fix: Resolve conflicts 2021-11-08 18:16:46 +05:30
Deepesh Garg
f5251b5a86 fix: Add patch to make custom fields 
(cherry picked from commit 508832e90a)

# Conflicts:
#	erpnext/patches.txt
 2021-11-08 12:39:55 +00:00
Deepesh Garg
aa6caa00bf fix: KSA VAT setup issues 
(cherry picked from commit c81d4734c4)
 2021-11-08 12:39:54 +00:00
Deepesh Garg
35bd31e939 Merge pull request #28270 from frappe/mergify/bp/version-13-pre-release/pr-28166 
feat(Print Format): KSA VAT Invoice (backport #28166)
 2021-11-08 17:15:49 +05:30
ahmadpak
0ba59049f9 update(Print Format): Sales Invoice 
- KSA VAT Invoice
Customer Identification Number Added

(cherry picked from commit 8df50cf1e0)
 2021-11-08 09:58:11 +00:00
ahmadpak
9f6b0dbfdf new (Print Format): KSA VAT Invoice 
(cherry picked from commit 2a5beec885)
 2021-11-08 09:58:11 +00:00
mergify[bot]
79be341ea4 feat: replace newline in remarks (DATEV report) (#28152) (#28248) 
(cherry picked from commit 114028e473)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2021-11-05 11:15:18 +05:30
Saqib
9a3c6694b9 Merge pull request #28221 from frappe/mergify/bp/version-13-pre-release/pr-27946 
fix(Payment Entry): splitting outstanding rows as per payment terms (backport #27946)
 2021-11-03 15:41:29 +05:30
Anuja Pawar
2c9266807a fix(Payment Entry): splitting outstanding rows as per payment terms (#27946) 
(cherry picked from commit d72709dd81)
 2021-11-03 09:18:40 +00:00
mergify[bot]
94905df774 fix: ignore unsupported methods while resyncing (#28210) (#28214) 
(cherry picked from commit 72a050fb0b)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-03 09:47:00 +05:30
Marica
fa5cee479f Merge pull request #28204 from frappe/mergify/bp/version-13-pre-release/pr-28202 
fix: Serial Nos not set in the row after scanning in popup (backport #28202)
 2021-11-02 20:41:33 +05:30
Deepesh Garg
885f1e0fd8 Merge pull request #28207 from frappe/mergify/bp/version-13-pre-release/pr-28205 
fix: Error on LDC creation (backport #28205)
 2021-11-02 20:29:43 +05:30
Deepesh Garg
e358d34c4f fix: Error on LDC creation 
(cherry picked from commit 66348e1a03)
 2021-11-02 14:59:10 +00:00
marination
093d9f4a70 fix: Serial Nos not set in the row after scanning in popup 
- Avoid whitspaces while calculating length of serial nos

(cherry picked from commit 734b57deec)
 2021-11-02 14:48:40 +00:00
mergify[bot]
50fbc167f3 fix(Payment Reconciliation): clear child tables on company/party change (#28194) 2021-11-02 17:12:11 +05:30
Marica
0731454f50 Merge pull request #28196 from frappe/mergify/bp/version-13-pre-release/pr-28195 
fix: (ux) Remove warehouse filter on Batch field for Material Receipt (backport #28195)
 2021-11-02 16:28:02 +05:30
marination
b81dfdcd26 chore: Add comment above fix for future reference 
(cherry picked from commit 48886ee705)
 2021-11-02 10:40:02 +00:00
marination
68809159ba fix: Remove warehouse filter on Batch field for Material Receipt 
(cherry picked from commit 048210a8f6)
 2021-11-02 10:40:00 +00:00
Deepesh Garg
982960fc0a Merge pull request #28177 from frappe/mergify/bp/version-13-pre-release/pr-26735 
fix: COGS account in purchase receipt (backport #26735)
 2021-11-01 16:51:11 +05:30
Deepesh Garg
bb7d661a04 fix: Resolve conflicts 2021-11-01 16:23:39 +05:30
Ankush Menat
c6557a136c fix: use warehouse to find company 
(cherry picked from commit f7ffe04a4b)
 2021-11-01 15:31:11 +05:30