Mohammed Yusuf Shaikh
|
8b5827ed6d
|
fix: from time and to time not updated in drag and drop action #29114
fix: from time and to time not updated in drag and drop action
|
2022-01-12 18:49:33 +05:30 |
|
Marica
|
efcfb825d7
|
Merge pull request #29257 from marination/fix-reset-wh-defaults
fix: Avoid resetting Default wh fields for Manufacture Entry
|
2022-01-12 16:44:33 +05:30 |
|
Saqib Ansari
|
11fae15bec
|
fix(asset): check if fixed asset account is set against company (#29189)
|
2022-01-12 13:23:18 +05:30 |
|
rohitwaghchaure
|
71466c6456
|
Merge pull request #29179 from rohitwaghchaure/fixed-incorrect-scrap-qty-in-manufacture
fix: incorrect scrap item qty
|
2022-01-12 13:13:30 +05:30 |
|
Saqib Ansari
|
aef432ee2f
|
fix: description not fetched in sales order analytics report (#29230)
|
2022-01-12 13:11:21 +05:30 |
|
Rohit Waghchaure
|
8f0b2fa90e
|
fix: incorrect scrap item qty
|
2022-01-12 11:30:20 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
Deepesh Garg
|
e311667a25
|
fix: Test case
|
2022-01-04 16:24:24 +05:30 |
|
Saqib Ansari
|
3aa1817f7b
|
fix: cannot create reverse journal entry
|
2022-01-04 14:43:02 +05:30 |
|
Deepesh Garg
|
094158f287
|
fix: Add test case for multicurrency invoice
|
2022-01-04 14:04:18 +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 |
|
Deepesh Garg
|
98f294a8ae
|
fix: Deferred revenue booking for multi currency invoices via JV
|
2022-01-03 19:40:47 +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 |
|
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 |
|
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 |
|
Dany Robert
|
321730a88e
|
Merge branch 'develop' into ledger-merger
|
2021-12-31 13:02:12 +05:30 |
|
MohsinAli
|
72369092a3
|
Merge branch 'develop' into patch-1
|
2021-12-30 17:13:59 +05:30 |
|
Saqib Ansari
|
79ccf80faf
|
Merge branch 'develop' into zero-qty-debit-note
|
2021-12-29 17:32:16 +05:30 |
|
Kanchan Chauhan
|
8c4cdf7afc
|
refactor: Payment Request added to PO Dashboard
|
2021-12-29 16:44:20 +05:30 |
|
Pruthvi Patel
|
fc0dd3fcd7
|
Merge branch 'develop' into fix-invoice-statuses
|
2021-12-29 13:45:35 +05:45 |
|
Rohit Waghchaure
|
d9b9f4e8b7
|
fix: optimize patch for update bom in SO and MR
|
2021-12-29 10:14:03 +05:30 |
|
Deepesh Garg
|
b1d8815556
|
Merge pull request #28034 from deepeshgarg007/term_loan_enhancement
fix: Updates in term loan processing
|
2021-12-28 18:39:31 +05:30 |
|
Deepesh Garg
|
68d49817a1
|
fix: Add test for loan repayment cancellation
|
2021-12-28 18:10:52 +05:30 |
|
Deepesh Garg
|
f78bf4c6ef
|
fix: Test cases
|
2021-12-28 17:40:05 +05:30 |
|
Anupam Kumar
|
2fd870ff15
|
Merge branch 'develop' into crm-carry-forward-communication-comments
|
2021-12-28 17:21:51 +05:30 |
|
Deepesh Garg
|
be5e6f02ae
|
Merge branch 'develop' of https://github.com/frappe/erpnext into term_loan_enhancement
|
2021-12-28 17:14:24 +05:30 |
|
Rucha Mahabal
|
251ed3aa74
|
Merge branch 'develop' into multiple-cost-centers-against-employee
|
2021-12-28 17:10:32 +05:30 |
|
Rucha Mahabal
|
88df5ce530
|
fix: tests (#29051)
* fix(test): create salary slip as per timesheet dates for Project Profitability
* fix(test): reload salary slip before checking for payment days
|
2021-12-28 17:09:46 +05:30 |
|
Ankush Menat
|
087ebcae5a
|
Merge pull request #29014 from ankush/rename_sr_no
fix!: disable renaming on serial nos
|
2021-12-28 15:34:50 +05:30 |
|