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,303 Commits 424 Branches 1,723 Tags
47f8f3d9dd457fcd631444f53df079f14930bf11
Commit Graph

38303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ankush Menat
271dad941b fix: pass company while fetching valuation rate 
If company is not supplied and valuation rate is 0, then default
company is used for checking if perpetual inventory is enabled or not.
This makes little sense as different companies can have different
setting for perpetual inventory.

(cherry picked from commit a0727b2e82)
 2021-11-01 15:31:11 +05:30
Rohit Waghchaure
e9d1cbb339 fix: COGS account in purchase receipt 
(cherry picked from commit 2a14f255cf)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2021-11-01 07:26:09 +00:00
mergify[bot]
18dddfdea9 fix: remove duplicate field from selling_settings (#28174) 
fix https://github.com/frappe/erpnext/issues/28155

(cherry picked from commit 1cc4eddacb)

Co-authored-by: ahmadRagheb <ahmedragheb75@gmail.com>
 2021-11-01 11:11:40 +05:30
Deepesh Garg
978d1cde2d Merge pull request #28165 from frappe/mergify/bp/version-13-pre-release/pr-28162 
fix: Error for missing PAN no field (backport #28162)
 2021-10-31 18:50:10 +05:30
rohitwaghchaure
feaae330d5 Merge pull request #28170 from frappe/mergify/bp/version-13-pre-release/pr-28168 
fix: patch update_category_in_ltds_certificate (backport #28168)
 2021-10-31 10:28:09 +05:30
Rohit Waghchaure
060127663a fix: patch update_category_in_ltds_certificate 
(cherry picked from commit cae29b71d8)
 2021-10-31 04:27:51 +00:00
rohitwaghchaure
88bf748275 Merge pull request #28159 from rohitwaghchaure/merge-hotfix-to-pre-release-for-13-14 
chore: merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2021-10-30 22:33:26 +05:30
Deepesh Garg
aa464cc615 fix: Error for missing PAN no field 
(cherry picked from commit 541c892f97)
 2021-10-30 14:00:07 +00:00
Rohit Waghchaure
8581b5cdea chore: merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-10-30 15:15:19 +05:30
mergify[bot]
9abb467127 fix: Make status filter optional (#28151) 2021-10-29 18:16:23 +05:30
mergify[bot]
f16e0e17cc fix: POS consolidated invoice rounded total issue (#28146) 2021-10-29 18:05:49 +05:30
Deepesh Garg
fe59c313d6 Merge pull request #28148 from frappe/mergify/bp/version-13-hotfix/pr-28145 
fix: COA importer importing all accounts as group (backport #28145)
 2021-10-29 18:03:58 +05:30
Ankush Menat
9e9f730dd1 fix: sort by creation to break tie 
(cherry picked from commit ff9cfe0d14)
 2021-10-29 17:42:05 +05:30
Ankush Menat
264ffe05b4 refactor: simplify sr no fetching 
(cherry picked from commit f4b60a48f5)
 2021-10-29 17:42:05 +05:30
Ankush Menat
42686f92e9 fix: fetch serial nos from ledger unconditionally 
(cherry picked from commit 2aa019ae4c)
 2021-10-29 17:42:05 +05:30
Noah Jacob
7931cfd77b refactor: replaced db.sql with qb 
(cherry picked from commit deb6b38fab)
 2021-10-29 17:42:05 +05:30
Noah Jacob
835d96c727 fix: incorrect amount of serial_nos fetched 
(cherry picked from commit b44945380d)
 2021-10-29 17:42:05 +05:30