Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,046 Commits 3 Branches 0 Tags 1 GiB
c3e890e59f
Commit Graph

40046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ruthra
8026f86548 refactor: get project from basic transactions 
- sales order, sales invoice, purchase order and purchase order
- if project not found in transaction, get from items
 2022-01-10 12:58:58 +05:30
Deepesh Garg
7d85755595 fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report 2022-01-10 12:50:34 +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
Deepesh Garg
18c4ddadf1 fix: Test case 2022-01-07 20:57:15 +05:30
Deepesh Garg
30a647ff80 fix: Handle frozen books while handling 2022-01-07 19:52:38 +05:30
Deepesh Garg
2aea078699 Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_multi_currency_jv 2022-01-07 19:06:16 +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
Deepesh Garg
14689a51f4 Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_multi_currency_jv 2022-01-07 16:49:57 +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
Dany Robert
2e5f22a370
patch: run field creation patch 2022-01-07 13:01:19 +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
Dany Robert
63a4c1d926
chore: linter style 2022-01-06 18:48:02 +05:30
Dany Robert
00b2dede14
fix: function name issue 2022-01-06 18:42:56 +05:30
Dany Robert
90eb046ce6
fix: remove unwanted fields from KSA setup 2022-01-06 18:15:40 +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
ruthra
ca17c7226c fix: get project from PO into payment entry 2022-01-06 11:34:47 +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
Subin Tom
19bb01c973
fix: POS items added to cart despite low qty (#29126) 2022-01-04 19:14:40 +05:30
Saqib Ansari
f4db474be0
fix: minor issues (#29130) 2022-01-04 19:12:19 +05:30
Anupam Kumar
08dcbd6fce
feat: allow user to change the parent company 2022-01-04 19:05:36 +05:30
Ankush Menat
733c9defdf
fix: update idx after updating items in so/po (#29134) 2022-01-04 18:39:30 +05:30
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext (#29022) 2022-01-04 17:26:11 +05:30
Ankush Menat
e73c51bee6 test: fix test broken by todo schema change 2022-01-04 17:23:03 +05:30