Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 60c33ac3e6
         Merge pull request #39097 from ruthra-kumar/make_loyalty_program_editable ruthra kumar 2024-01-03 09:46:43 +05:30
  • 73ecf51a27 test: balance sheet barredterra 2024-01-02 20:39:32 +01:00
  • 0d3a77dce9 fix: calculation of P/L in balance sheet barredterra 2023-12-31 14:13:59 +01:00
  • 56d510b878
         Merge branch 'version-15' into version-15-hotfix rohitwaghchaure 2024-01-02 17:34:56 +05:30
  • 1bc74bde29 refactor: flag to control loyalty point creation at invoice level ruthra kumar 2024-01-02 15:18:15 +05:30
  • 12c40ef2e4
         Merge pull request #39093 from rmehta/rename-workspace Rushabh Mehta 2024-01-02 15:52:45 +05:30
  • b250a21a2b fix(minor): remove "hide_workspaces" from erpnext/install.py Rushabh Mehta 2024-01-02 15:50:54 +05:30
  • 4e28b5a199 fix(minor): Rename "ERPNext Settings" to "Settings" and remove "ERPNext Integrations" workspace Rushabh Mehta 2024-01-02 15:27:41 +05:30
  • 57bcf9f568
         perf: index item_code in bom explosion item (backport #39085) (#39088) mergify[bot] 2024-01-02 14:43:10 +05:30
  • 739434b727
         perf: index item_code in bom explosion item (#39085) Ankush Menat 2024-01-02 14:31:41 +05:30
  • 9ea963bfe9
         fix: Variant Items, List View Enabled to Variant Status Change (#38468) Parameshwari Palanisamy 2024-01-02 14:04:56 +05:30
  • f52d7c7665 fix: Pricing rule application/removal on qty change Deepesh Garg 2024-01-02 13:37:39 +05:30
  • 2e0abbd274
         fix: on cancellation of document cancel the serial and batch bundle (backport #39076) (#39082) mergify[bot] 2024-01-02 13:28:43 +05:30
  • 6e5484ea03
         fix: on cancellation of document cancel the serial and batch bundle (#39076) rohitwaghchaure 2024-01-02 12:54:18 +05:30
  • 73c0f3703c
         fix: Unable to save Sales Invoice (#39059) mergify[bot] 2024-01-01 19:28:29 +05:30
  • f3088e08bb
         Merge pull request #39072 from frappe/mergify/bp/version-15-hotfix/pr-39067 ruthra kumar 2024-01-01 17:42:45 +05:30
  • 21f90011bc fix: select options should dynamically load dimensions ruthra kumar 2024-01-01 17:32:33 +05:30
  • 9fdf5c8091 fix: undefined error in Budget Variance and Profitability report ruthra kumar 2024-01-01 14:46:15 +05:30
  • d048644327
         Merge pull request #39067 from ruthra-kumar/fix_undefined_error_in_budget_variance_report ruthra kumar 2024-01-01 17:37:07 +05:30
  • 1a9e091d12 fix: select options should dynamically load dimensions ruthra kumar 2024-01-01 17:32:33 +05:30
  • 7539623fb9
         Merge pull request #39069 from frappe/mergify/bp/version-15-hotfix/pr-39023 ruthra kumar 2024-01-01 16:29:25 +05:30
  • cbaa617d20 refactor(perf): replace account subquery with 'in' condition ruthra kumar 2023-12-29 13:35:18 +05:30
  • 1b0d9643cd
         Merge pull request #39023 from ruthra-kumar/refactor_customer_ledger_summary ruthra kumar 2024-01-01 15:42:24 +05:30
  • 92bc962f60 fix: undefined error in Budget Variance and Profitability report ruthra kumar 2024-01-01 14:46:15 +05:30
  • d85dad7198
         feat: group by Asset in Asset Depreciations and Balances report (backport #38923) (#39066) mergify[bot] 2024-01-01 15:05:04 +05:30
  • a9576f0cf6
         feat: group by Asset in Asset Depreciations and Balances report (#38923) Anand Baburajan 2024-01-01 15:03:21 +05:30
  • 4f8a16848f
         chore: default_roles hook doesn't exist anymore (#39032) David Arnold 2024-01-01 09:04:36 +01:00
  • e5d73c780b
         feat: voucher subtype for general ledger (#38822) mergify[bot] 2024-01-01 13:30:29 +05:30
  • bacf2b7431
         fix: Unable to save Sales Invoice (#39059) Deepesh Garg 2024-01-01 13:23:26 +05:30
  • 34d8bc4701
         chore: disable v13 auto releases Ankush Menat 2024-01-01 13:13:25 +05:30
  • 8ad7fafe2a
         fix(DX): capture tracebacks with context (backport #39060) (#39063) mergify[bot] 2024-01-01 13:12:07 +05:30
  • 510fdf7bf6
         fix(DX): capture tracebacks with context (#39060) Ankush Menat 2024-01-01 13:10:03 +05:30
  • 2e932754e0
         fix: take quantity into account when setting asset's gross purchase amt (backport #39056) (#39058) mergify[bot] 2024-01-01 11:27:55 +05:30
  • 0346f47c1d
         fix: take quantity into account when setting asset's gross purchase amt (#39056) Anand Baburajan 2024-01-01 11:24:42 +05:30
  • 026824880d fix: asset WDV depreciation calc according to IT act anandbaburajan 2024-01-01 00:23:19 +05:30
  • 3f9693b31f
         fix: GL values in transaction currency via JV (#38914) Deepesh Garg 2023-12-31 20:00:03 +05:30
  • d8cf994e94
         fix: enqueue demo data setup on setup complete (backport #39043) (#39044) mergify[bot] 2023-12-31 18:25:15 +05:30
  • 877cc7255d
         fix: enqueue demo data setup on setup complete (#39043) Smit Vora 2023-12-31 10:54:07 +05:30
  • 89d1069472
         fix: non stock uom validation for serial and batch (backport #39018) (#39026) mergify[bot] 2023-12-29 20:54:49 +05:30
  • 3a7506ecbc
         fix: work order with multi level, fetch operting cost from sub-assembly (backport #38992) (#39028) mergify[bot] 2023-12-29 20:54:26 +05:30
  • 70abedc57a
         fix: work order with multi level, fetch operting cost from sub-assembly (#38992) rohitwaghchaure 2023-12-29 16:50:31 +05:30
  • 0c6de4ecb2
         fix: non stock uom validation for serial and batch (#39018) rohitwaghchaure 2023-12-29 16:50:01 +05:30
  • f3254c2010
         fix: Validate account in Sales/Purchase Taxes and Charges Template (#39013) mergify[bot] 2023-12-29 16:16:02 +05:30
  • a517125d64 refactor(perf): replace account subquery with 'in' condition ruthra kumar 2023-12-29 13:35:18 +05:30
  • 2a390ac2de
         fix: purchase return without item code not working (backport #39014) (#39015) mergify[bot] 2023-12-29 13:07:38 +05:30
  • b7f283b2f0
         feat: skip disabled accounts in COA (#38551) Gursheen Kaur Anand 2023-12-29 12:55:37 +05:30
  • 5158884dc9
         fix: Multiple subscription fixes (#39005) mergify[bot] 2023-12-29 12:52:41 +05:30
  • cd37fd790b
         fix: Validate account in Sales/Purchase Taxes and Charges Template (#39013) Deepesh Garg 2023-12-29 12:52:22 +05:30
  • f983e09f92
         fix: purchase return without item code not working (#39014) rohitwaghchaure 2023-12-29 12:06:04 +05:30
  • 3b4b2275de
         fix: Multiple subscription fixes (#39005) Deepesh Garg 2023-12-29 08:25:38 +05:30
  • c86deceaba fix(ux): default parent delivery_date or schedule_date Devin Slauenwhite 2023-12-08 19:57:34 +00:00
  • ec436c18a3 chore(release): Bumped to Version 15.8.3 Frappe PR Bot 2023-12-28 13:31:04 +00:00
  • 17bae5a5a1
         fix: auto fetch not working if bundle exists (backport #39002) (backport #39004) (#39006) mergify[bot] 2023-12-28 18:59:38 +05:30
  • 027a75bcb0
         fix: serial and batch bundle company mandatory error (backport #38994) (backport #38999) (#39003) mergify[bot] 2023-12-28 18:59:20 +05:30
  • 2e919344df
         fix: auto fetch not working if bundle exists (backport #39002) (#39004) mergify[bot] 2023-12-28 18:54:38 +05:30
  • b5340c5ec0
         fix: auto fetch not working if bundle exists (#39002) rohitwaghchaure 2023-12-28 18:32:27 +05:30
  • d2580be4fd
         fix: serial and batch bundle company mandatory error (backport #38994) (#38999) mergify[bot] 2023-12-28 18:22:14 +05:30
  • 10074e9980
         fix: serial and batch bundle company mandatory error (#38994) rohitwaghchaure 2023-12-28 17:56:24 +05:30
  • e0755f9a9a
         fix: Opening balance in bank reconciliation tool (#38977) mergify[bot] 2023-12-28 17:53:44 +05:30
  • bbee9b5637
         fix: Opening balance in bank reconciliation tool (#38977) Deepesh Garg 2023-12-28 17:50:16 +05:30
  • c4794c95df chore(release): Bumped to Version 15.8.2 Frappe PR Bot 2023-12-28 12:16:55 +00:00
  • 12c5f0b6b5
         Merge pull request #38996 from frappe/mergify/bp/version-15/pr-38995 ruthra kumar 2023-12-28 17:45:35 +05:30
  • 0a3e378f5e fix: undefined error in consolidated financial report ruthra kumar 2023-12-28 17:36:00 +05:30
  • 1b399e83be
         Merge pull request #38995 from ruthra-kumar/undefined_error_in_consolidated_report ruthra kumar 2023-12-28 17:42:18 +05:30
  • 49f93f9fa1 fix: undefined error in consolidated financial report ruthra kumar 2023-12-28 17:36:00 +05:30
  • d2fe221bc7
         Merge pull request #38990 from frappe/mergify/bp/version-15-hotfix/pr-38969 ruthra kumar 2023-12-28 17:09:43 +05:30
  • a3cecb892a test: profit and loss report output ruthra kumar 2023-12-28 11:39:55 +05:30
  • 7c7c3c932f fix: incorrect total when Accumulating values ruthra kumar 2023-12-27 16:32:57 +05:30
  • 915d864166
         Merge pull request #38969 from ruthra-kumar/bug_in_p_l_report ruthra kumar 2023-12-28 16:23:21 +05:30
  • 8555617295 test: profit and loss report output ruthra kumar 2023-12-28 11:39:55 +05:30
  • 46035ed9ca
         fix: remove bad defaults (backport #38986) (#38988) mergify[bot] 2023-12-28 14:22:18 +05:30
  • b71b0d5997
         fix: remove bad defaults (#38986) Ankush Menat 2023-12-28 14:15:40 +05:30
  • 37767738b0
         fix(Report): Increased the column width in the Account Balance Report Indrajith.vs 2023-12-28 12:12:52 +05:30
  • 7e7eb95934 chore(release): Bumped to Version 15.8.1 Frappe PR Bot 2023-12-28 05:55:23 +00:00
  • 83e62bbaad
         fix: not able to cancel sales invoice (backport #38979) (backport #38980) (#38981) mergify[bot] 2023-12-28 11:24:16 +05:30
  • f8625f3eb7
         fix: not able to cancel sales invoice (backport #38979) (#38980) mergify[bot] 2023-12-28 11:21:51 +05:30
  • a117ef3cb8
         fix: not able to cancel sales invoice (#38979) rohitwaghchaure 2023-12-28 11:14:27 +05:30
  • 4e2304818b
         feat: Merge taxes from mapped docs (#38346) mergify[bot] 2023-12-28 08:28:02 +05:30
  • 33b631e395
         Merge pull request #38805 from barredterra/remove-unused-coa Raffael Meyer 2023-12-28 00:06:50 +01:00
  • 517bedeb7e test: cancel voucher linked to Bank Transaction barredterra 2023-12-28 00:00:04 +01:00
  • 0a95b38166 fix: unreconcile Bank Transaction on cancel of payment voucher barredterra 2023-12-27 23:05:37 +01:00
  • 9b1c22250f
         feat: Merge taxes from mapped docs (#38346) Deepesh Garg 2023-12-27 22:37:01 +05:30
  • 3caabf23a5
         fix : correct logic for overlap error (backport #38967) (#38968) mergify[bot] 2023-12-27 20:40:03 +05:30
  • 43fed29514 fix: use child table values instead of global min max Gursheen Anand 2023-12-27 19:32:48 +05:30
  • 4feecb69d8
         ci: lock old resolved issue/PRs Ankush Menat 2023-12-27 19:31:45 +05:30
  • 12560e2407
         Merge pull request #38496 from ruthra-kumar/bisect_accounting_reports ruthra kumar 2023-12-27 17:54:36 +05:30
  • 0890b414b1 chore: resolve linter issues ruthra kumar 2023-12-27 17:31:34 +05:30
  • d54f8318fb fix: incorrect total when Accumulating values ruthra kumar 2023-12-27 16:32:57 +05:30
  • fe77b9d633
         fix : correct logic for overlap error (#38967) VihangT 2023-12-27 16:11:29 +05:30
  • 76c6b501f9
         fix: use Stock Qty while getting POS Reserved Qty (backport #38962) (#38965) mergify[bot] 2023-12-27 15:31:58 +05:30
  • f3ab5a33c7 chore(release): Bumped to Version 15.8.0 Frappe PR Bot 2023-12-27 08:41:36 +00:00
  • e2bf03bdb2
         Merge pull request #38952 from frappe/version-15-hotfix rohitwaghchaure 2023-12-27 14:10:09 +05:30
  • 5874be0f79
         fix: incorrect qty in serial batch bundle against pick list (backport #38964) (#38966) mergify[bot] 2023-12-27 14:06:55 +05:30
  • 47ee801d37
         fix: incorrect qty in serial batch bundle against pick list (#38964) rohitwaghchaure 2023-12-27 13:09:23 +05:30
  • 705ae7da14
         Merge pull request #38962 from s-aga-r/FIX-38781 s-aga-r 2023-12-27 12:50:37 +05:30
  • 7223106417 fix: use Stock Qty while getting POS Reserved Qty s-aga-r 2023-12-27 10:27:11 +05:30
  • ab9fce333d
         fix: min order qty optional in production plan (backport #38956) (#38958) mergify[bot] 2023-12-26 21:55:23 +05:30
  • 5a5758423e Merge remote-tracking branch 'upstream/develop' into remove-unused-coa barredterra 2023-12-26 16:06:43 +01:00
  • b09c9354fb
         fix: min order qty optional in production plan (#38956) rohitwaghchaure 2023-12-26 20:11:58 +05:30
  • 0e48ef7ace
         fix: not able to import serial batch bundle using csv (backport #38950) (#38955) mergify[bot] 2023-12-26 16:29:34 +05:30