nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-02 13:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,697 Commits 455 Branches 1,744 Tags
341709aa0a4bb28b8c1cb4b8f54ea42d02b382d1
Commit Graph

45697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Anand
341709aa0a fix: additional query cols for sales register 2023-07-25 15:57:17 +05:30
Gursheen Anand
95c6f4d40d fix: additional query cols for gst itemised registers 2023-07-25 14:32:24 +05:30
Gursheen Anand
e6d66fe5b0 fix: gst itemised registers for india compliance api call 2023-07-25 12:14:37 +05:30
Gursheen Anand
db49d53aaf fix: running balance after sorting 2023-07-24 17:42:13 +05:30
Gursheen Anand
59a2a04fcc fix: check gl entry status using is_cancelled 2023-07-21 13:22:01 +05:30
Gursheen Anand
1c033ce635 chore: change column format for report 2023-07-21 11:00:19 +05:30
Gursheen Anand
33f8f7d7b3 fix: exclude cancelled gl entries for opening balance 2023-07-21 10:57:55 +05:30
Gursheen Anand
2f7b112736 fix: filter by party in opening row calculation 2023-07-19 12:36:44 +05:30
Gursheen Anand
a93d7633d4 test: purchase register and ledger view 2023-07-14 17:16:39 +05:30
Gursheen Anand
b8a83f57b7 chore: fix typo 2023-07-14 16:25:58 +05:30
Gursheen Anand
0d89bfacdb fix: show additional table cols from india compliance api call 2023-07-14 13:03:22 +05:30
Gursheen Anand
c084fe6b3f refactor: filter accounting dimensions using qb 2023-07-14 11:05:50 +05:30
Gursheen Anand
944244ceff fix: modify rows and columns for ledger view 2023-07-14 10:50:12 +05:30
Gursheen Anand
c973e3c746 chore: remove debugging print statements 2023-07-12 17:40:27 +05:30
Gursheen Anand
bf08aa7529 fix: filtering through accounting dimensions 2023-07-12 17:17:58 +05:30
Gursheen Anand
f5027fdcaf refactor: move fn to fetch advance taxes to utils & use qb 2023-07-12 16:42:58 +05:30
Gursheen Anand
6c11ca1b75 refactor: use qb to fetch PE JV and Inv 2023-07-12 14:43:18 +05:30
Gursheen Anand
1e8b8b5b29 fix: linting issues 2023-07-12 11:14:03 +05:30
Gursheen Kaur Anand
1094319e3e Merge branch 'develop' into purchase-sales-register-with-PE/JE 2023-07-12 11:00:35 +05:30
Deepesh Garg
0a6c565eb3 fix: Ambiguous column error while submitting stock entry 
fix: Ambiguous column error while submitting stock entry
 2023-07-12 10:18:38 +05:30
mergify[bot]
8580287092 fix: allow manual asset receipt mov from nowhere (backport #36093) (#36094) 
fix: allow manual asset receipt mov from nowhere (#36093)

(cherry picked from commit 4aaa1a15d7)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-12 08:26:49 +05:30
rohitwaghchaure
59e54eabef Merge pull request #36088 from rohitwaghchaure/fixed-reposting-circulr-dependecy 
fix: circular dependency during reposting causing timeout error
 2023-07-11 18:28:39 +05:30
Ankush Menat
7e4b6683e6 fix: Dont bold URL parts 
closes https://github.com/frappe/frappe/issues/21445
 2023-07-11 18:19:50 +05:30
Rohit Waghchaure
c16a5814d4 fix: circular dependency during reposting causing timeout error 2023-07-11 17:51:44 +05:30
s-aga-r
be5881280f fix: incorrect status in MR created from PP (#36085) 2023-07-11 17:09:23 +05:30
Gursheen Anand
7650b0073a fix: validate party filter for fetching payments 2023-07-11 15:18:28 +05:30
Gursheen Anand
d5aa0e325e feat: fetch JV with PE 2023-07-11 14:47:23 +05:30
Deepesh Garg
ce9164ec69 fix: Validate for missing expense account (#36078) 
* fix: Validate for missing expense account

* fix: Validate for missing expense account
 2023-07-11 12:03:38 +05:30
ruthra kumar
e44615f52b Merge pull request #36076 from ruthra-kumar/possible_type_error_on_err_creation 
fix: possible type error on ERR creation
 2023-07-11 10:37:37 +05:30
ruthra kumar
176966daab fix: possible type error on ERR creation 2023-07-11 10:04:17 +05:30
Raffael Meyer
bf84e0d441 refactor: remove frappe.dynamic_link (#35096) 2023-07-10 21:22:06 +05:30
mergify[bot]
872a23c77d fix: also check on_hold (#35910) 
fix: also check on_hold (#35910)

(cherry picked from commit 5aa02b8571)

Co-authored-by: RJPvT <48353029+RJPvT@users.noreply.github.com>
 2023-07-10 20:34:54 +05:30
Dany Robert
361a357088 fix: payment entry voucher_type error (#35779) 
* fix: payment entry `voucher_type` error

* chore: linters
 2023-07-10 19:32:59 +05:30
Gursheen Anand
9c87997dae fix: fetch cost center for PE 2023-07-10 19:12:19 +05:30
Gursheen Anand
cbef6c30c3 refactor: move repeating code to common controller 2023-07-10 18:39:35 +05:30
Gursheen Anand
d7ffad1dd3 feat: fetch PE along with SI 2023-07-10 18:07:55 +05:30
Wolfram Schmidt
49c61e7ebb fix: Add company filter in list view (#36047) 
fix: Add company filter in list view
 2023-07-10 18:03:50 +05:30
rohitwaghchaure
06dcc4ed96 Merge pull request #36063 from rohitwaghchaure/fixed-valuation-for-dn-return 
fix: Delivery Note return valuation
 2023-07-10 17:48:41 +05:30
Rohit Waghchaure
6a10ae662c fix: Delivery Note return valuation 2023-07-10 17:06:02 +05:30
Dany Robert
5c820ecc20 fix: precision causing outstanding issue on partly paid invoices (#36030) 
* fix: precision causing outstanding issue on partly paid invoices

* chore: linters
 2023-07-10 16:20:45 +05:30
Gursheen Anand
44493707e2 refactor: use single qb query for PE and PI 2023-07-10 14:37:33 +05:30
mergify[bot]
b3a99e38cc chore: add asset depr posting error in error log (backport #36052) (#36055) 
chore: add asset depr posting error in error log (#36052)

(cherry picked from commit 0f9a6ee70a)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-10 14:31:19 +05:30
MohsinAli
2816076789 1052, "Column 'qty' in field list is ambiguous in work_order.py 2023-07-10 14:09:41 +05:30
rohitwaghchaure
22eee472dd Merge pull request #36001 from rohitwaghchaure/fixed-added-validation-for-rejected-warerhouse 
fix: accepted warehouse and rejected warehouse can't be same
 2023-07-10 13:55:20 +05:30
Gursheen Anand
4f0aa54c09 feat: add check for fetching PE along with Invoice details in Purchase Register 2023-07-10 13:38:30 +05:30
rohitwaghchaure
b16f364866 Merge pull request #36054 from rohitwaghchaure/fixed-incorrect-stock-levels 
fix: incorrect stock levels in the Batch
 2023-07-10 13:35:59 +05:30
Rohit Waghchaure
d618aaef32 fix: accepted warehouse and rejected warehouse can't be same 2023-07-10 13:19:17 +05:30
Rohit Waghchaure
aeaf8fd89c fix: incorrect stock levels in the Batch 2023-07-10 13:03:10 +05:30
ruthra kumar
3ef034dda8 Merge pull request #36051 from ruthra-kumar/auto_exchange_rate_revaluation_creation 
feat: Provision to auto create Exchange Rate Revaluation
 2023-07-10 12:59:23 +05:30
Ankush Menat
407642869a ci: auto release beta version 
[skip ci]
 2023-07-10 12:48:47 +05:30