Deepesh Garg
|
6bea91e9fe
|
Merge pull request #29182 from ruthra-kumar/project_in_purchase_invoice
fix: get project from PO into payment entry
|
2022-01-17 15:04:03 +05:30 |
|
Deepesh Garg
|
09172002e7
|
fix: Linting issues
|
2022-01-17 15:01:17 +05:30 |
|
Ankush Menat
|
3db8d908dc
|
Merge pull request #29278 from shariquerik/update-workspace-json
fix: Updating public workspace json based on new design
|
2022-01-17 13:25:16 +05:30 |
|
Deepesh Garg
|
1e34300f69
|
Merge branch 'develop' into project_in_purchase_invoice
|
2022-01-15 21:00:14 +05:30 |
|
Deepesh Garg
|
14e0d00a61
|
Merge pull request #29115 from deepeshgarg007/deferred_revenue_multi_currency_jv
fix: Deferred revenue booking for multi currency invoices via JV
|
2022-01-15 18:55:41 +05:30 |
|
Deepesh Garg
|
fd922f1617
|
fix: Remove unwanted test
|
2022-01-15 18:27:40 +05:30 |
|
Deepesh Garg
|
b9b4c9aff7
|
Merge pull request #29270 from nextchamp-saqib/change-fieldtype
fix: threshold fields shows incorrect currency
|
2022-01-14 14:50:45 +05:30 |
|
Deepesh Garg
|
08f26de3df
|
fix: Remove comment
|
2022-01-13 23:05:27 +05:30 |
|
Deepesh Garg
|
24bb1e8987
|
fix: Test case
|
2022-01-13 19:44:26 +05:30 |
|
Shariq Ansari
|
bc187c121a
|
fix: updated standard workspace json files
|
2022-01-13 19:24:11 +05:30 |
|
Saqib Ansari
|
0e1b8322c1
|
fix: threshold fields shows incorrect currency
|
2022-01-13 12:06:03 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
Deepesh Garg
|
9d3a5c3184
|
fix: Inconsistency in calculating outstanding amount
|
2022-01-06 18:58:49 +05:30 |
|
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 |
|
ruthra
|
ca17c7226c
|
fix: get project from PO into payment entry
|
2022-01-06 11:34:47 +05:30 |
|
Saqib Ansari
|
fbd706f232
|
fix: existing party link validation (#29159)
|
2022-01-05 17:55:08 +05:30 |
|
Subin Tom
|
3febca1a9a
|
fix: Modifying Opening invoice creation tool timestamp (#29127)
|
2022-01-04 19:37:44 +05:30 |
|
Saqib Ansari
|
f4db474be0
|
fix: minor issues (#29130)
|
2022-01-04 19:12:19 +05:30 |
|
Chillar Anand
|
0900c3d655
|
refactor: Removed agriculture module from ERPNext (#29022)
|
2022-01-04 17:26:11 +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 |
|
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 |
|
Saqib Ansari
|
568550874d
|
Merge branch 'develop' into pos-batch-no-stock-validation
|
2022-01-03 14:46:29 +05:30 |
|
Saqib Ansari
|
d0f5beeb34
|
fix: filter query in bank reconciliation tool (#29098)
|
2022-01-03 11:33:03 +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
|
db829a0610
|
Merge pull request #29050 from mohsinalimat/patch-1
feat: Add currency in import download statement
|
2022-01-02 17:15:01 +05:30 |
|