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
|
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 |
|
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 |
|
Saqib Ansari
|
3aa1817f7b
|
fix: cannot create reverse journal entry
|
2022-01-04 14:43:02 +05:30 |
|
Nabin Hait
|
11cfa16158
|
fix: future recurring period calculation (#29083)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2022-01-04 11:38:49 +05:30 |
|
Saqib Ansari
|
7e777356ee
|
Merge pull request #28160 from resilient-tech/fix-invoice-statuses
refactor: `update_invoice_status` with query builder
|
2022-01-03 17:59:11 +05:30 |
|
Saqib Ansari
|
842a6cda5d
|
Merge pull request #28907 from nemesis189/pos-batch-no-stock-validation
fix: Validation in POS for item batch no stock quantity
|
2022-01-03 17:36:21 +05:30 |
|
Subin Tom
|
7385497219
|
fix: using get_batch_qty method to get available_qty
|
2022-01-03 16:57:00 +05:30 |
|
Subin Tom
|
267da48889
|
fix: added Sum() in query
|
2022-01-03 16:40:11 +05:30 |
|
Saqib Ansari
|
568550874d
|
Merge branch 'develop' into pos-batch-no-stock-validation
|
2022-01-03 14:46:29 +05:30 |
|
rohitwaghchaure
|
f02e6b4631
|
fix: incorrect posting time fetching incorrect qty (#29103)
|
2022-01-03 14:28:34 +05:30 |
|
Saqib Ansari
|
d0f5beeb34
|
fix: filter query in bank reconciliation tool (#29098)
|
2022-01-03 11:33:03 +05:30 |
|
rohitwaghchaure
|
650b388bc1
|
Merge pull request #28458 from anupamvs/crm-carry-forward-communication-comments
feat: carry forward communication and comments throughout the sales c…
|
2022-01-03 10:19:56 +05:30 |
|
Conor
|
d2074b16db
|
ci: postgres unittests configurations (#28952)
Co-authored-by: Ankush Menat <ankush@frappe.io>
|
2022-01-02 23:33:10 +05:30 |
|
Deepesh Garg
|
f56deebb97
|
Merge pull request #29094 from frappe/mergify/bp/develop/pr-29092
fix(India): Tax and Charges template not getting fetched based on tax category assigned (backport #29092)
|
2022-01-02 19:42:38 +05:30 |
|
Deepesh Garg
|
c3d890f3f1
|
fix: get fiscal year based on date
|
2022-01-02 19:10:49 +05:30 |
|
Deepesh Garg
|
4b6217a683
|
fix: Test Case
(cherry picked from commit 342658ea7028cc0d890200364cc08cf97e55d6d0)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
|
2022-01-02 13:36:43 +00:00 |
|
Deepesh Garg
|
466e549842
|
fix(India): Tax and Charges template not getting fetched based on tax category assigned
(cherry picked from commit 7a5937a98c3d74bdb1da79c3d5a8f49ef76ded2d)
|
2022-01-02 13:36:41 +00:00 |
|
Deepesh Garg
|
db829a0610
|
Merge pull request #29050 from mohsinalimat/patch-1
feat: Add currency in import download statement
|
2022-01-02 17:15:01 +05:30 |
|
Deepesh Garg
|
ebc1039610
|
Merge pull request #29070 from frappe/pr-addded-to-po-dashboard
refactor: Payment Request added to PO Dashboard
|
2022-01-02 17:04:12 +05:30 |
|
Deepesh Garg
|
9c1773f56e
|
Merge pull request #28812 from rtdany10/ledger-merger
feat: ledger merger
|
2022-01-02 16:45:48 +05:30 |
|
Deepesh Garg
|
9199513de4
|
Merge pull request #29037 from wojosc/patch-20
feat: update de.csv
|
2022-01-02 16:29:43 +05:30 |
|
Raffael Meyer
|
a4e3d79bc1
|
revert: german translation of "Minute"
|
2021-12-31 17:43:10 +01:00 |
|
Raffael Meyer
|
538dffa617
|
fix: apply suggestions from review
|
2021-12-31 14:12:28 +01:00 |
|
Vaibhav Chopra
|
dbbc8d8aed
|
fix: leave_allocation variable not being defined (#29086)
|
2021-12-31 13:34:20 +05:30 |
|