nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-16 02:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,563 Commits 631 Branches 1,812 Tags
86856491b7de43e26dd688df239dc71edbd6eeb5
Commit Graph

7303 Commits

Author SHA1 Message Date
Deepesh Garg
86856491b7 Merge pull request #31235 from frappe/mergify/bp/version-13-hotfix/pr-31219 
fix: Parent dimension filters in orders (backport #31219)
 2022-06-06 20:53:33 +05:30
Deepesh Garg
60d378aed2 chore: Resolve conflicts 2022-06-06 20:36:40 +05:30
mergify[bot]
0badfc8748 fix(Sales Register): incorrect query with dimensions (backport #31242) (#31251) 
fix(Sales Register): incorrect query with dimensions

If accounting dimension is also part of the default filters then same
query is repeated with incorrect syntax.

e.g. `item_group = (child1, child2)` instead of `in` query.

fix: don't add default filter if they are part of dimensions to be
added.

(cherry picked from commit c3219ebad1)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-06 19:54:41 +05:30
Deepesh Garg
3c4cf5929f fix: Remove redundant query 
(cherry picked from commit a200e7e1fb)
 2022-06-06 06:54:41 +00:00
Deepesh Garg
b3cbcd871b fix: Parent dimension filters in orders 
(cherry picked from commit 3f376cc3a5)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.js
 2022-06-06 03:29:07 +00:00
Deepesh Garg
99917af73f Merge pull request #31156 from frappe/mergify/bp/version-13-hotfix/pr-30850 
fix(pos): freeze screen while processing pos invoices (backport #30850)
 2022-05-31 10:56:32 +05:30
Mitchy25
d8531f20a0 Ignore Cancelled GL Entries 
Profitability Analysis includes 'is_cancelled' GL Entries which means that the profit numbers are incorrect. This change will ensure that the profit figures ignore cancelled GL Entries.

(cherry picked from commit a0c412a0dd)
 2022-05-31 04:19:35 +00:00
HarryPaulo
a7bf236c28 fix(pos): freeze screen while processing pos invoices (#30850) 
(cherry picked from commit 4b04694c2c)
 2022-05-27 06:46:26 +00:00
Deepesh Garg
5748af7d53 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-26916 2022-05-26 09:23:46 +05:30
Deepesh Garg
68d1787eeb Merge pull request #31124 from nextchamp-saqib/fix-timesheet-fetch 
fix: timesheet fetching in sales invoice
 2022-05-25 20:15:19 +05:30
Deepesh Garg
a61d7558eb Merge pull request #31132 from frappe/mergify/bp/version-13-hotfix/pr-31039 
fix: Chart data for monthly periodicity in Cash Flow report (backport #31039)
 2022-05-25 20:10:08 +05:30
Deepesh Garg
14422eaf59 chore: Update test cases 2022-05-25 20:06:31 +05:30
xdlumertz
f14e9b7502 fix: Chart data for monthly periodicity in Cash Flow report (#31039) 
fix: Chart data for monthly periodicity in Cash Flow report
(cherry picked from commit c5e922c76b)
 2022-05-25 14:10:33 +00:00
Deepesh Garg
cd00cb2fb7 chore: Linting Issues 
(cherry picked from commit 9e4a36089e)
 2022-05-25 13:52:10 +00:00
Deepesh Garg
74ddf261e9 chore: Linting Issues 
(cherry picked from commit a1f53f8d31)
 2022-05-25 13:52:09 +00:00
Deepesh Garg
611d1af526 fix: Loan Doc query in Bank Reconciliation Statement 
(cherry picked from commit 147fc8fde7)
 2022-05-25 13:52:08 +00:00
Deepesh Garg
3fab8a2213 chore: Remove unintended changes 2022-05-25 19:20:09 +05:30
Deepesh Garg
f724f6d1bb chore: Resolve conflicts 2022-05-25 19:04:20 +05:30
Deepesh Garg
761669c7ca chore: Update test case 
(cherry picked from commit bc34737709)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2022-05-25 11:33:46 +00:00
Deepesh Garg
0628785c64 test: Update test cases 
(cherry picked from commit 65232edfd5)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
#	erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
 2022-05-25 11:33:45 +00:00
Deepesh Garg
4ca6cdca76 fix: Remove validation from Journal Entry 
(cherry picked from commit 5b8726405d)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.py
 2022-05-25 11:33:44 +00:00
Deepesh Garg
d10c2e50be fix: Party account validation in JV 
(cherry picked from commit 417d6abcf4)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.py
 2022-05-25 11:33:43 +00:00
Deepesh Garg
8f969fbd66 test: Update test cases for currency change validation 
(cherry picked from commit 60915e874d)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
#	erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
#	erpnext/healthcare/doctype/therapy_plan/therapy_plan.py
#	erpnext/non_profit/doctype/membership/membership.py
 2022-05-25 11:33:42 +00:00
Deepesh Garg
9d43a90eb0 Revert "fix: Add party account validation for journal entry" 
This reverts commit f00620a3ca.

(cherry picked from commit 0a618817dc)
 2022-05-25 11:33:39 +00:00
Deepesh Garg
7f853b1f0f fix: Add party account validation for journal entry 
(cherry picked from commit f00620a3ca)
 2022-05-25 11:33:38 +00:00
Saqib Ansari
216c32f4bc fix: timesheet fetching in sales invoice 2022-05-25 12:12:35 +05:30
mergify[bot]
0efbabe7cf fix: payments duplicate on pos closing entry (backport #30976) (#31005) 2022-05-19 14:27:19 +05:30
mergify[bot]
9c21eb5b94 feat: select multiple values for accounting dimension (backport #31015) (#31041) 
fix: select multiple values for accounting dimenssion

(cherry picked from commit 69be22ba7c)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2022-05-17 11:56:31 +05:30
Saqib Ansari
013ac26231 test: sales_invoice_with_disabled_account 
(cherry picked from commit 6c16422beb)
 2022-05-12 16:37:27 +00:00
Saqib Ansari
7c750571cd test: payment_entry_against_onhold_purchase_invoice 
(cherry picked from commit 92613777b9)
 2022-05-12 16:37:26 +00:00
Saqib Ansari
515e49bb90 fix: validate disabled accounts before posting ledger entries 
(cherry picked from commit 95b059a98c)
 2022-05-12 16:37:26 +00:00
Saqib Ansari
9fbd170fa4 fix: validate on hold purchase invoices in payment entry 
(cherry picked from commit b0f302e579)
 2022-05-12 16:37:24 +00:00
mergify[bot]
b7e873b55d fix: subtract change_amount from paid_amount field on POS Register (#30937) 
Co-authored-by: HarryPaulo <paulo_fabris@hotmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-05-10 14:54:19 +05:30
mergify[bot]
7bd5b2ba29 feat(india): generate qrcode button for e-invoice (#30946) 2022-05-10 12:29:52 +05:30
Deepesh Garg
189fc89e2d fix: Consider paryt and party type as well in group by consolidated view 
(cherry picked from commit c2d52a1ac0)
 2022-05-06 07:40:39 +00:00
Deepesh Garg
b7698aa210 chore: Linting issues 2022-05-06 13:08:09 +05:30
Deepesh Garg
4f4af523e0 fix: Show linked time sheets in sales invoice dashboard 
(cherry picked from commit 3e38dc7ea8)
 2022-05-04 14:24:57 +00:00
Deepesh Garg
57409b6ffd Merge pull request #30884 from deepeshgarg007/loan_repayment_clearance_v3 
fix: Ignore loan repayments made from salary slip
 2022-05-04 09:44:22 +05:30
Deepesh Garg
b7e1d40e43 fix: Ignore loan repayments made from salary slip 2022-05-03 12:55:04 +05:30
Deepesh Garg
366cd6171c chore: resolve conflicts 2022-05-03 12:21:06 +05:30
Deepesh Garg
0df96e1084 test: Add test for payment reconciliation 
(cherry picked from commit b440dabe12)
 2022-05-02 12:29:25 +00:00
Deepesh Garg
22e7f03a03 fix: Cost center filter on payment reconciliation 
(cherry picked from commit ab94b73e93)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
 2022-05-02 12:29:24 +00:00
Sherin KR
5a5b49b61a fix: Period Closing Voucher is considering GL entries with is_cancelled=1 (#30865) 
* fix: Period Closing Voucher - Period Closing Voucher is considering GL entry with is_cancelled=1 as well

* fix: condition

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-05-02 15:03:30 +05:30
Deepesh Garg
2e62d518e8 fix: Multi currency opening invoices 
(cherry picked from commit a8452c2ba2)
 2022-04-29 09:46:34 +00:00
Deepesh Garg
2f42cb6362 Merge branch 'version-13-pre-release' into version-13-hotfix 2022-04-26 11:47:34 +05:30
Deepesh Garg
4522826335 test: Unit test for round off entry dimensions 
(cherry picked from commit 3fa1c63479)
 2022-04-25 11:37:13 +00:00
Deepesh Garg
1834671d59 fix: Check if accounting dimension exists 
(cherry picked from commit c312cd3725)
 2022-04-25 11:37:13 +00:00
Deepesh Garg
dedb90ea72 fix: Add accounting dimensions for round off GL Entry 
(cherry picked from commit 015812b0b8)
 2022-04-25 11:37:12 +00:00
Deepesh Garg
fe9f32946c fix: Use parent cost center for Sales and Purchase Invoice 
(cherry picked from commit c42547d40f)
 2022-04-25 11:37:12 +00:00
Deepesh Garg
a2d95fc62b fix: First preference to parent cost center rather than round off cost center 
(cherry picked from commit 0ac11a5b30)
 2022-04-25 11:37:11 +00:00