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

Commit Graph

  • 120bfdf33d Merge branch 'develop' of https://github.com/frappe/erpnext into revert_dynamic_splitting Deepesh Garg 2024-01-17 12:33:07 +05:30
  • 73625a2622
         Revert "fix(minor): financial statements period end date" Gursheen Kaur Anand 2024-01-17 12:25:03 +05:30
  • 011c5a69f0 fix: Cancel asset capitalisation record on cancellation of asset and vice-versa Nabin Hait 2024-01-15 17:54:47 +05:30
  • e3cd35b959 fix: WDV as per IT Act: calculate yearly amount first and then split it based on months Nabin Hait 2024-01-15 16:54:19 +05:30
  • 9f2b62dd1c
         Merge pull request #39386 from nabinhait/asset-capitalisation-calcellation Nabin Hait 2024-01-17 12:14:15 +05:30
  • 60f52adc90
         Merge pull request #39385 from nabinhait/wdv-as-per-income-tax-act Nabin Hait 2024-01-17 12:13:23 +05:30
  • 7eefedfb11 fix: Update subscription period Deepesh Garg 2024-01-17 10:57:19 +05:30
  • 53f61f1ad1
         fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item (backport #38322) (#39417) mergify[bot] 2024-01-17 10:45:57 +05:30
  • af80d253db
         fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item (#38322) HENRY Florian 2024-01-17 06:13:36 +01:00
  • c939aa5cf8
         Merge pull request #39409 from frappe/mergify/bp/version-15-hotfix/pr-39406 rohitwaghchaure 2024-01-16 16:55:50 +05:30
  • 93a861fac5
         Merge pull request #39412 from frappe/mergify/bp/version-15-hotfix/pr-39402 ruthra kumar 2024-01-16 16:49:56 +05:30
  • ab939cc6e8 refactor: Credit Note and its Exc gain/loss JE inherits dimensions ruthra kumar 2024-01-15 16:13:26 +05:30
  • 5a65a10dba refactor: better ordering of query result ruthra kumar 2024-01-16 14:35:06 +05:30
  • 1b8f572e80 fix(test): test case for project query ruthra kumar 2024-01-16 14:28:09 +05:30
  • 07e2901e4b fix: project query controller logic ruthra kumar 2024-01-16 13:38:53 +05:30
  • ca9413bc64
         Merge pull request #39402 from ruthra-kumar/fix_project_query ruthra kumar 2024-01-16 16:24:02 +05:30
  • bfe42fdccb refactor: better ordering of query result ruthra kumar 2024-01-16 14:35:06 +05:30
  • 8816b2740a fix: permission issue for the BIN Rohit Waghchaure 2024-01-16 15:12:28 +05:30
  • ce2dd28a25
         Merge pull request #39406 from rohitwaghchaure/fixed-bin-permission-issue rohitwaghchaure 2024-01-16 15:50:46 +05:30
  • 96dcfba65a Merge branch 'develop' of https://github.com/frappe/erpnext into revert_dynamic_splitting Deepesh Garg 2024-01-16 15:42:02 +05:30
  • 6e4d4a55cd fix: permission issue for the BIN Rohit Waghchaure 2024-01-16 15:12:28 +05:30
  • 3349dde5e2 fix(test): test case for project query ruthra kumar 2024-01-16 14:28:09 +05:30
  • 4eefb445a7 fix: project query controller logic ruthra kumar 2024-01-16 13:38:53 +05:30
  • ed927f102e
         perf: use unbuffered_cursor for stock_ageing report (#39399) Ankush Menat 2024-01-16 11:43:35 +05:30
  • 82026f780d
         Merge pull request #39400 from ruthra-kumar/fix_broken_subscription_test ruthra kumar 2024-01-16 11:39:42 +05:30
  • bcf8053fd9
         Merge pull request #39383 from frappe/mergify/bp/version-15-hotfix/pr-39332 ruthra kumar 2024-01-16 11:19:37 +05:30
  • e5aeab7e7e fix: broken multi currency test case in subscription ruthra kumar 2024-01-16 11:07:26 +05:30
  • 32738637ce
         Merge pull request #39394 from noec764/Fix_UntranslatedColumnsInGlobalLedger Deepesh Garg 2024-01-16 11:03:47 +05:30
  • cd1820f680 refactor(test): set default currency for party ruthra kumar 2024-01-16 10:47:51 +05:30
  • 80f5026208
         fix: translate (#39395) Alexandre Lumertz Damiani 2024-01-16 02:16:00 -03:00
  • 00619342e1
         fix: translate (#39396) Alexandre Lumertz Damiani 2024-01-16 02:14:59 -03:00
  • b719585a2f
         fix: translate (#39397) Alexandre Lumertz Damiani 2024-01-16 02:14:17 -03:00
  • 4970b5d5bc
         fix: translate (#39398) Alexandre Lumertz Damiani 2024-01-16 02:13:33 -03:00
  • bdd382bdfd fix: Untranslated columns in Global Ledger Noé 2024-01-15 16:40:45 +01:00
  • 235e3893a0
         Merge pull request #39393 from frappe/mergify/bp/version-15-hotfix/pr-39391 ruthra kumar 2024-01-15 20:49:48 +05:30
  • 80956b7956 fix: possible typerror in utils.js ruthra kumar 2024-01-15 20:22:30 +05:30
  • 92a5cda61a
         Merge pull request #39391 from ruthra-kumar/multiple_typeerror_fixes ruthra kumar 2024-01-15 20:45:27 +05:30
  • 60b26ad8b2 fix: possible typerror in utils.js ruthra kumar 2024-01-15 20:22:30 +05:30
  • efe9f6656f fix: Cancel asset capitalisation record on cancellation of asset and vice-versa Nabin Hait 2024-01-15 17:54:47 +05:30
  • 9897c26ae6
         Merge pull request #39285 from frappe/mergify/bp/version-15-hotfix/pr-39052 Nabin Hait 2024-01-15 16:58:45 +05:30
  • 22bd6a54b2 fix: WDV as per IT Act: calculate yearly amount first and then split it based on months Nabin Hait 2024-01-15 16:54:19 +05:30
  • a36b6cb102
         Merge pull request #39384 from deepeshgarg007/income_account_filter Deepesh Garg 2024-01-15 16:52:39 +05:30
  • d91813c277 feat: Income account filter in item-wise reports Deepesh Garg 2024-01-15 16:50:14 +05:30
  • 0ec17590ae fix: typo's and parameter changes ruthra kumar 2024-01-15 14:56:51 +05:30
  • 2154502955 refactor: partial change on outstanding invoice popup ruthra kumar 2024-01-02 11:33:02 +05:30
  • 32afe7de31 refactor(test): supply default currency for subscription plans ruthra kumar 2024-01-14 18:00:45 +05:30
  • c288db0356 refactor: making currency mandatory for subcscription plans ruthra kumar 2024-01-14 17:59:43 +05:30
  • 61f073f8b1 refactor: prevent foreign currency subscription for a party ruthra kumar 2024-01-12 12:43:54 +05:30
  • a4ddf93492
         Merge pull request #39332 from ruthra-kumar/validate_subscription_billing_currency ruthra kumar 2024-01-15 15:05:31 +05:30
  • 9c5a79209e refactor: replace sql with query builder for Jourals query ruthra kumar 2023-12-29 17:42:41 +05:30
  • 5dc22e1811 refactor: pass dimension details to query ruthra kumar 2023-12-20 17:19:27 +05:30
  • ad8475cb8b refactor: set query filters for dimensions ruthra kumar 2023-12-19 17:07:54 +05:30
  • ff60ec85b8 refactor: pass dimension filters to query ruthra kumar 2023-12-15 17:25:02 +05:30
  • c1fe4bcc64 refactor: handle dimension filters ruthra kumar 2023-12-15 16:02:12 +05:30
  • 20576e0f47 refactor: column break in dimension section ruthra kumar 2023-12-14 13:33:24 +05:30
  • 20e0acc20a refactor: dimensions filter section in payment reconciliation ruthra kumar 2023-12-14 12:39:13 +05:30
  • cfb3d87267 refactor: update dimension doctypes in hooks ruthra kumar 2023-12-14 12:16:50 +05:30
  • 1cde804c77 refactor: dimensions section in allocation table in reconciliation ruthra kumar 2023-11-30 13:11:11 +05:30
  • 1387b0ba7f refactor(test): supply default currency for subscription plans ruthra kumar 2024-01-14 18:00:45 +05:30
  • 2e03af7ac4
         perf: use iterator for stock ageing report (#39346) Ankush Menat 2024-01-15 14:35:28 +05:30
  • 8a356cbe51 chore(release): Bumped to Version 15.10.1 Frappe PR Bot 2024-01-15 06:47:45 +00:00
  • 1503ba92e3
         ci: bump node in release workflow (backport #39377) (backport #39378) (#39380) mergify[bot] 2024-01-15 12:12:35 +05:30
  • e282ba78c1
         ci: bump node in release workflow (backport #39377) (#39378) mergify[bot] 2024-01-15 12:08:44 +05:30
  • 749c735627
         Merge pull request #39377 from s-aga-r/BUMP-NODE s-aga-r 2024-01-15 11:58:51 +05:30
  • aef87cced7 ci: bump node in release workflow s-aga-r 2024-01-15 11:54:26 +05:30
  • 1b8b92b8d7
         Merge pull request #39376 from frappe/mergify/bp/version-15-hotfix/pr-39336 ruthra kumar 2024-01-15 10:41:26 +05:30
  • f2e19ca6fd
         Merge pull request #39375 from frappe/mergify/bp/version-15-hotfix/pr-39371 ruthra kumar 2024-01-15 10:40:54 +05:30
  • 32c6111728 refactor(test): supply default currency to Bank Transaction ruthra kumar 2024-01-14 18:09:19 +05:30
  • f609b8ae5d refactor: better error message ruthra kumar 2024-01-14 18:04:15 +05:30
  • dbbba046ab refactor: disallow bank transactions on different currencies ruthra kumar 2024-01-12 16:33:41 +05:30
  • 6bb2d9195f
         Merge pull request #39336 from ruthra-kumar/better_validation_on_bank_transaction ruthra kumar 2024-01-15 10:01:50 +05:30
  • b43f70325c fix: incorrect sql error if account name has '%' ruthra kumar 2024-01-14 15:52:37 +05:30
  • 28ebc4cfee
         Merge pull request #39371 from ruthra-kumar/fix_customer_ledger_summary_report ruthra kumar 2024-01-15 09:38:50 +05:30
  • 3f5b1bcd05
         Merge pull request #39373 from frappe/mergify/bp/version-15-hotfix/pr-39372 rohitwaghchaure 2024-01-15 06:34:11 +05:30
  • 1394a1c5e9 fix: batches not coming correctly in the batch selector Rohit Waghchaure 2024-01-14 23:23:55 +05:30
  • ad5906916d
         Merge pull request #39372 from rohitwaghchaure/fixed-get-query-for-batch-no-field rohitwaghchaure 2024-01-14 23:48:48 +05:30
  • 114f2b4326 fix: batches not coming correctly in the batch selector Rohit Waghchaure 2024-01-14 23:23:55 +05:30
  • a27a4db3de refactor(test): supply default currency to Bank Transaction ruthra kumar 2024-01-14 18:09:19 +05:30
  • b4354cbc8d refactor: better error message ruthra kumar 2024-01-14 18:04:15 +05:30
  • 02fde73545 fix: Against account variable Deepesh Garg 2024-01-14 18:01:44 +05:30
  • 19975dcb7b refactor: making currency mandatory for subcscription plans ruthra kumar 2024-01-14 17:59:43 +05:30
  • 7ca9ffbaa7
         Merge pull request #39329 from frappe/mergify/bp/version-15-hotfix/pr-38974 Deepesh Garg 2024-01-14 17:55:32 +05:30
  • 641c3de0ca fix: incorrect sql error if account name has '%' ruthra kumar 2024-01-14 15:52:37 +05:30
  • 137ce76a35
         Merge pull request #39369 from frappe/mergify/bp/version-15-hotfix/pr-39224 rohitwaghchaure 2024-01-14 11:59:41 +05:30
  • cd870ee30c fix: modified date rohitwaghchaure 2024-01-14 10:45:43 +05:30
  • 2dc8686a81 fix: modified date was not set rohitwaghchaure 2024-01-14 10:15:50 +05:30
  • 6bdf944ecf Update purchase_taxes_and_charges.json label Rate to Tax Rate mahsem 2024-01-08 18:45:39 +01:00
  • cf6b52e543
         Merge pull request #39224 from mahsem/patch-1 rohitwaghchaure 2024-01-14 11:26:35 +05:30
  • 9500254861 Revert "chore: orderby in gle" Deepesh Garg 2024-01-14 11:25:58 +05:30
  • 13e5578bc6 Revert "fix: check for unmerged gle in purchase receipt test" Deepesh Garg 2024-01-14 11:25:50 +05:30
  • 24137ff54f Revert "fix: subcontracting receipt gle test" Deepesh Garg 2024-01-14 11:25:39 +05:30
  • 9a13842751 Revert "fix: check for split entries in stock entry test" Deepesh Garg 2024-01-14 11:25:30 +05:30
  • 13b4ddec63 Revert "fix: query for against types" Deepesh Garg 2024-01-14 11:25:09 +05:30
  • 39c8507dc2 fix: query for against types Gursheen Anand 2023-12-03 22:36:54 +05:30
  • 9842fb5b64
         Merge pull request #39361 from frappe/mergify/bp/version-15-hotfix/pr-39225 rohitwaghchaure 2024-01-14 11:24:20 +05:30
  • 0b1cc7fad1 Revert "fix: fetch against link value in gl report" Deepesh Garg 2024-01-14 11:24:00 +05:30
  • c548c57207
         Merge pull request #39365 from frappe/mergify/bp/version-15-hotfix/pr-39359 rohitwaghchaure 2024-01-14 11:24:00 +05:30
  • 8bc1efcf8b Revert "refactor: set against account link for jv" Deepesh Garg 2024-01-14 11:23:34 +05:30
  • 1a67d7d95f Revert "refactor: use both fields to store against values" Deepesh Garg 2024-01-14 11:22:50 +05:30
  • 4dad4b50fb Revert "refactor: keep old against fields intact" Deepesh Garg 2024-01-14 11:21:19 +05:30