Commit Graph

39942 Commits

Author SHA1 Message Date
Ankush Menat
8f0d10a1b7 chore: add crm module in issue template
[skip ci]
2022-01-11 18:45:53 +05:30
Ankush Menat
f8119563ca fix(patch): enable all uoms on recently created sites 2022-01-11 17:49:30 +05:30
Ankush Menat
33aad4b950 fix: UOM autocomplete broken
All new recent sites seem to have all UOMs as disabled by default. The
desired behaviour is exact opposite of this.
2022-01-11 17:49:30 +05:30
Deepesh Garg
d6ee678ec9
Merge pull request #29193 from ruthra-kumar/bug_deferred_report
fix: deferred report division by zero exception
2022-01-11 17:19:08 +05:30
Saqib Ansari
c45042c00e
feat: early payment discount on sales & purchase orders (#29101) 2022-01-11 15:03:07 +05:30
Rucha Mahabal
2b33e63d2c
fix: use get_all instead of get_list while fetching SLA doctypes (#29216)
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-01-11 14:40:08 +05:30
Ankush Menat
754596dfc1
fix: "update cost" should ignore overridden routing times #29154
fix: "update cost" should ignore overridden routing times
2022-01-11 14:20:44 +05:30
Saqib Ansari
75c8b2556e
fix(pos): cannot ignore pricing rule for one particular invoice (#29222) 2022-01-11 13:25:42 +05:30
Saqib Ansari
c62083653b
fix(gl-report): group by cost center only if include_dimensions is checked (#28883) 2022-01-11 12:45:40 +05:30
Deepesh Garg
962dd5eaec
Merge pull request #27318 from rtdany10/currency-exchange-settings
feat: currency exchange settings
2022-01-11 11:34:23 +05:30
Deepesh Garg
93d784dde3 Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings 2022-01-10 21:28:53 +05:30
Deepesh Garg
ca5ea5f55f fix: test cases 2022-01-10 21:28:29 +05:30
Marica
9d36e30ef7
Merge pull request #29131 from ankush/serial_no_patch
fix(patch): serial no whitespace trimming
2022-01-10 19:51:26 +05:30
Ankush Menat
f195f803ff test: account reports 2022-01-10 19:14:22 +05:30
Ankush Menat
2d76c05175 refactor: unnecessary joining of lists 2022-01-10 19:14:22 +05:30
Ankush Menat
fab7a58056 chore: remove misleading comment 2022-01-10 18:28:46 +05:30
Ankush Menat
2854f63caf fix!: drop python 3.7 support 2022-01-10 18:28:46 +05:30
Saqib Ansari
e5b649b588
fix: pos invoices consolidation case with permlevel (#29011) 2022-01-10 18:24:08 +05:30
Deepesh Garg
3fdd47e71f Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings 2022-01-10 17:32:15 +05:30
Deepesh Garg
e2dab6f421 fix: Cleanup and fixes 2022-01-10 17:31:38 +05:30
Ankush Menat
cbaa8fdade refactor: convert query to ORM 2022-01-10 16:13:52 +05:30
Ankush Menat
0faa116f97 fix(patch): serial no whitespace trimming
old data can contain trailing/leading whitespace which doesn't work well
with code to find last SLE for serial no.
2022-01-10 16:02:27 +05:30
Conn Campbell
31123436fb
fix: Task Depends on not removed from Gantt chart (#28309)
Co-authored-by: conncampbell <conncampbell@conzu.ca>
2022-01-10 10:28:10 +05:30
Ankush Menat
5b67dbf8d0 ci: only run label action once 2022-01-09 20:27:18 +05:30
Ankush Menat
55d00a3cf6 ci: fix auto label behaviour 2022-01-09 20:18:42 +05:30
Ankush Menat
23b0a3f546 ci: add auto labeller workflow 2022-01-09 20:11:19 +05:30
Ankush Menat
2fe919e746 chore: update CODEOWNERS 2022-01-09 20:11:19 +05:30
Shadrak Gurupnor
25c875e447
chore: remove framework patch for custom fields (#29117)
* chore: patches were breaking during migration

* fix: rewrote the query in query builder

* chore: removed patch from patches.txt
2022-01-07 18:54:50 +05:30
Deepesh Garg
68723c753f
Merge pull request #29191 from frappe/mergify/bp/develop/pr-29135
fix: Show GL balance in Accounts Receivable and Payable summary (backport #29135)
2022-01-07 18:51:01 +05:30
Deepesh Garg
b83608b029
Merge pull request #28994 from nextchamp-saqib/zero-qty-debit-note
fix: cannot create debit note with zero qty
2022-01-07 18:35:24 +05:30
Deepesh Garg
2de5122262
fix: Add iteritems back 2022-01-07 18:30:19 +05:30
Deepesh Garg
00055bb159
fix: Conflicts 2022-01-07 18:11:38 +05:30
ruthra
fe4d7f86ee fix: deferred report division by zero exception 2022-01-07 16:30:56 +05:30
Deepesh Garg
bf5930c4bb fix: Show GL balance in Accounts Receivable and payable summary
(cherry picked from commit 1d270dca05501b5a15d19e3270188029b48eafde)

# Conflicts:
#	erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
2022-01-07 09:35:19 +00:00
Deepesh Garg
f6f449ed18
Merge pull request #29176 from deepeshgarg007/outstanding_amount_anomaly
fix: Inconsistency in calculating outstanding amount
2022-01-07 13:28:52 +05:30
Deepesh Garg
a456cf4225
Merge pull request #29169 from deepeshgarg007/loan_repayment_salary_slip
fix: GL Entries for loan repayment via Salary
2022-01-07 12:54:25 +05:30
Deepesh Garg
d28d7119b0
Merge pull request #29171 from frappe/mergify/bp/develop/pr-29155
fix: Currency in KSA VAT report (backport #29155)
2022-01-06 19:00:38 +05:30
Deepesh Garg
9d3a5c3184 fix: Inconsistency in calculating outstanding amount 2022-01-06 18:58:49 +05:30
Ankush Menat
24fc487dd8
fix: incorrect serial no valuation report showing cancelled entries (#29172) 2022-01-06 17:03:34 +05:30
Deepesh Garg
fe929304cf fix: Currency in KSA VAT report
(cherry picked from commit 1d87e9d8f67e3611993d638f2d422fe66acf2c00)
2022-01-06 10:53:14 +00:00
Deepesh Garg
80dce1ab73
Merge pull request #29125 from nextchamp-saqib/fix-reverse-jv
fix: cannot create reverse journal entry
2022-01-06 13:30:50 +05:30
Deepesh Garg
f316aaf41e fix: GL Entries for loan repayment via Salary 2022-01-06 13:19:17 +05:30
Rucha Mahabal
26247be3b8
fix: Earned Leave allocation from Leave Policy Assignment (#29163)
* fix: Earned Leave allocation from Leave Policy Assignment

* test: Earned Leave Allocation from Leave Policy Assignment
2022-01-06 11:21:59 +05:30
Saqib Ansari
fcc5fa14c8
fix: failing tests of first response time (#29153) 2022-01-05 20:44:06 +05:30
Saqib Ansari
fbd706f232
fix: existing party link validation (#29159) 2022-01-05 17:55:08 +05:30
Rucha Mahabal
ac816f4fed
fix(UX): validate setup on clicking Mark Attendance button in Shift Type (#29146) 2022-01-04 21:46:31 +05:30
Deepesh Garg
ae3d2b4438
Merge pull request #29142 from ruchamahabal/accounting-dimension-mapping
fix: map Accounting Dimensions for Bank Entry against Payroll Entry
2022-01-04 20:27:22 +05:30
Rucha Mahabal
72ef35bace
Merge branch 'develop' into accounting-dimension-mapping 2022-01-04 19:59:02 +05:30
Subin Tom
3febca1a9a
fix: Modifying Opening invoice creation tool timestamp (#29127) 2022-01-04 19:37:44 +05:30
Rucha Mahabal
5eeb94db31 fix: map Accounting Dimensions for Bank Entry against Payroll Entry 2022-01-04 19:21:16 +05:30