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

Commit Graph

  • 31592b8f3a fix: cancellation of asset/asset capitalization Nabin Hait 2024-01-23 12:42:54 +05:30
  • ca93f671df fix: auto create serial no on scan Rohit Waghchaure 2024-01-22 12:50:24 +05:30
  • c76145985d fix: UX improvements for Serial and Batch Bundle Rohit Waghchaure 2024-01-21 20:46:57 +05:30
  • f8675817e2
         Merge pull request #39478 from rohitwaghchaure/fixed-ux-improvement-for-SABB rohitwaghchaure 2024-01-23 11:57:03 +05:30
  • a6b4d5b101
         Merge pull request #39492 from frappe/mergify/bp/version-15-hotfix/pr-39488 rohitwaghchaure 2024-01-23 11:54:54 +05:30
  • 236b73565e fix: skip liability account for internal transfer Gursheen Anand 2024-01-22 21:13:32 +05:30
  • 72614fe9e1 Merge branch 'develop' into pr/38560 ruthra kumar 2024-01-22 17:26:35 +05:30
  • c7d5857014 fix: UOM needs to be whole number not being checked in quotations Rohit Waghchaure 2024-01-22 16:43:54 +05:30
  • 60809ced85
         Merge pull request #39488 from rohitwaghchaure/fixed-validate-stock-uom-integer-value rohitwaghchaure 2024-01-22 17:24:32 +05:30
  • b53e072082
         Merge pull request #39483 from frappe/mergify/bp/version-15-hotfix/pr-39462 Gursheen Kaur Anand 2024-01-22 17:05:48 +05:30
  • dc88614f89
         Merge pull request #39486 from frappe/mergify/bp/version-15-hotfix/pr-39484 ruthra kumar 2024-01-22 16:48:52 +05:30
  • aaf83da3e9 fix: UOM needs to be whole number not being checked in quotations Rohit Waghchaure 2024-01-22 16:43:54 +05:30
  • 0acbbefa8b refactor: move 'project' set_query to sales_common.js ruthra kumar 2024-01-22 14:43:15 +05:30
  • 4c20a4710b
         Merge pull request #39484 from ruthra-kumar/move_project_filter_to_common ruthra kumar 2024-01-22 15:50:17 +05:30
  • 52814724eb refactor: move 'project' set_query to sales_common.js ruthra kumar 2024-01-22 14:43:15 +05:30
  • 9a0834987c fix: party field in pdf html Gursheen Anand 2024-01-19 17:08:02 +05:30
  • fc0d2aeeff fix: auto create serial no on scan Rohit Waghchaure 2024-01-22 12:50:24 +05:30
  • 7c2cb70387 refactor: handle dynamic dimension in order query ruthra kumar 2024-01-22 12:06:07 +05:30
  • ec0f17ca8b refactor: update dimensions, only if provided ruthra kumar 2024-01-22 11:59:20 +05:30
  • 3e9449d511
         Merge pull request #39480 from frappe/mergify/bp/version-15-hotfix/pr-39457 ruthra kumar 2024-01-22 10:44:04 +05:30
  • f8bbb0619c refactor: dynamic dimension filters in pop up ruthra kumar 2024-01-19 18:00:31 +05:30
  • 80e3597338 refactor: delete transactions in background ruthra kumar 2024-01-18 18:03:16 +05:30
  • b17e632a85
         Merge pull request #39457 from ruthra-kumar/background_job_transaction_deletion ruthra kumar 2024-01-22 09:57:25 +05:30
  • 13aae34e9c Merge branch 'develop' of https://github.com/frappe/erpnext into in_words_pe Deepesh Garg 2024-01-22 09:33:46 +05:30
  • 6d8949adea
         Merge pull request #39462 from GursheenK/pdf-party-ap-ar Deepesh Garg 2024-01-22 09:31:34 +05:30
  • 3c84d5ec02
         Merge pull request #39479 from frappe/mergify/bp/version-15-hotfix/pr-39476 rohitwaghchaure 2024-01-22 07:36:55 +05:30
  • b0e872aad4 test: fixed test Rohit Waghchaure 2024-01-21 20:59:38 +05:30
  • 96e1db80ac fix: added button to make serial / batch from Purchase Invoice Rohit Waghchaure 2024-01-21 19:47:53 +05:30
  • 35d3edfca4
         Merge pull request #39477 from frappe/mergify/bp/version-15-hotfix/pr-39475 rohitwaghchaure 2024-01-21 22:23:26 +05:30
  • faab225126
         Merge pull request #39476 from rohitwaghchaure/fixed-added-button-to-create-serial-batch-from-PI rohitwaghchaure 2024-01-21 22:22:42 +05:30
  • 63ffce58cc test: fixed test Rohit Waghchaure 2024-01-21 20:59:38 +05:30
  • 5d94f0bde5 fix: UX improvements for Serial and Batch Bundle Rohit Waghchaure 2024-01-21 20:46:57 +05:30
  • b4393bc03d fix: added button to make serial / batch from Purchase Invoice Rohit Waghchaure 2024-01-21 19:47:53 +05:30
  • b4981f8816 fix: key error during reposting Rohit Waghchaure 2024-01-21 18:05:20 +05:30
  • da0ad3bc00
         Merge pull request #39475 from rohitwaghchaure/fixed-key-error-during-reposting rohitwaghchaure 2024-01-21 19:51:43 +05:30
  • 9fc5c0cc58
         Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status David Arnold 2024-01-21 15:16:13 +01:00
  • ebc8230d45 fix: key error during reposting Rohit Waghchaure 2024-01-21 18:05:20 +05:30
  • e9526b112d test: journals in withholding report Gursheen Anand 2024-01-21 18:04:47 +05:30
  • a6afe50a92
         Merge branch 'frappe:develop' into JVs-in-withholding-report Gursheen Kaur Anand 2024-01-21 17:55:56 +05:30
  • 7c666435a2
         Merge pull request #39474 from frappe/mergify/bp/version-15-hotfix/pr-39229 Gursheen Kaur Anand 2024-01-21 14:23:12 +05:30
  • b388adcb2e fix: use most reliable section reference per report line David Arnold 2024-01-08 22:07:46 +01:00
  • 273bc1b1e3
         Merge pull request #39229 from blaggacao/fix/tds-report Gursheen Kaur Anand 2024-01-21 13:39:38 +05:30
  • 3ba413a150
         Merge pull request #39471 from frappe/mergify/bp/version-15-hotfix/pr-39424 Gursheen Kaur Anand 2024-01-20 18:51:34 +05:30
  • ddb84d9036 Revert "fix(minor): financial statements period end date" Gursheen Kaur Anand 2024-01-17 12:25:03 +05:30
  • c40719caa5
         Merge pull request #39424 from frappe/revert-38556-period-end-date-for-financial-statements Gursheen Kaur Anand 2024-01-20 17:57:46 +05:30
  • b2d9380596 fix: party field in pdf html Gursheen Anand 2024-01-19 17:08:02 +05:30
  • fcf4687c52 test: dimension inheritance on adv allocation ruthra kumar 2024-01-19 16:50:54 +05:30
  • cbd443a78a refactor: pass dimensions on advance allocation ruthra kumar 2024-01-19 16:44:20 +05:30
  • 6148fb024b test: dimension inheritance in PE reconciliation ruthra kumar 2024-01-18 17:08:30 +05:30
  • 00a3ee313b
         refactor(UX): Accounts workspace cleanup (backport #39232) (#39456) mergify[bot] 2024-01-19 12:40:25 +05:30
  • 9678d050a4
         Merge pull request #39426 from GursheenK/insufficient-permissions-for-manager Gursheen Kaur Anand 2024-01-19 11:54:20 +05:30
  • d468accb02
         Merge branch 'frappe:develop' into payment-reco-company-field Gursheen Kaur Anand 2024-01-19 11:52:34 +05:30
  • a50808a077 refactor: delete transactions in background ruthra kumar 2024-01-18 18:03:16 +05:30
  • 125847c69f Merge branch 'develop' into revert-38556-period-end-date-for-financial-statements Gursheen Anand 2024-01-19 11:40:50 +05:30
  • 4ca63c07f6
         Merge branch 'frappe:develop' into insufficient-permissions-for-manager Gursheen Kaur Anand 2024-01-19 11:19:32 +05:30
  • 35067282cf
         refactor(UX): Accounts workspace cleanup (#39232) Rucha Mahabal 2024-01-19 11:13:09 +05:30
  • f8d7ca515c
         Merge pull request #39451 from frappe/mergify/bp/version-15-hotfix/pr-39449 Gursheen Kaur Anand 2024-01-19 10:57:35 +05:30
  • 550213b4f4 chore(release): Bumped to Version 15.10.3 Frappe PR Bot 2024-01-19 00:44:51 +00:00
  • a962657c7b
         Merge pull request #39444 from frappe/mergify/bp/version-15/pr-39443 rohitwaghchaure 2024-01-19 06:13:35 +05:30
  • c44eb432a5 refactor: pass dimension values to Gain/Loss journal ruthra kumar 2024-01-18 14:35:06 +05:30
  • 86f3f62e00 fix: linting issue Gursheen Anand 2024-01-18 15:05:19 +05:30
  • 74613c7fe8 fix: set unallocated amount after base tax Gursheen Anand 2024-01-18 14:33:10 +05:30
  • 871a1f4565
         Merge pull request #39449 from GursheenK/payment-entry-unallocated-amount-after-taxes Gursheen Kaur Anand 2024-01-18 16:13:31 +05:30
  • 99b94af49f fix: linting issue Gursheen Anand 2024-01-18 15:05:19 +05:30
  • e9bc63aacf fix: set unallocated amount after base tax Gursheen Anand 2024-01-18 14:33:10 +05:30
  • ba5a7c8cd8 test: dimension inheritance for cr note reconciliation ruthra kumar 2024-01-18 13:20:06 +05:30
  • 527cfcd87f fix: ignore user permissions for company field Gursheen Anand 2024-01-18 11:58:06 +05:30
  • ef7aefeb45
         ci: split pre-commit and semgrep jobs (#39445) Ankush Menat 2024-01-18 11:29:53 +05:30
  • 0c222aa504 fix: duplicate name error while making variant Rohit Waghchaure 2024-01-17 20:52:16 +05:30
  • 3244ef3a68
         Merge pull request #39443 from frappe/mergify/bp/version-15-hotfix/pr-39436 rohitwaghchaure 2024-01-18 06:52:17 +05:30
  • b649c50ecc fix: duplicate name error while making variant Rohit Waghchaure 2024-01-17 20:52:16 +05:30
  • 45aea56198
         Merge pull request #39436 from rohitwaghchaure/fixed-duplicate-name-error-for-variant-creation rohitwaghchaure 2024-01-18 06:50:50 +05:30
  • d5c26efb8c chore(release): Bumped to Version 15.10.2 Frappe PR Bot 2024-01-17 17:06:29 +00:00
  • e00533ff4e
         Merge pull request #39405 from frappe/version-15-hotfix Deepesh Garg 2024-01-17 22:34:57 +05:30
  • 6509548474
         Merge pull request #39438 from frappe/mergify/bp/version-15-hotfix/pr-39429 Nabin Hait 2024-01-17 22:13:50 +05:30
  • c8b3478fe1
         Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-39429 mergify[bot] 2024-01-17 16:26:04 +00:00
  • f453aaeab0
         Merge pull request #39439 from nabinhait/test-case-fix-asset-depr Nabin Hait 2024-01-17 21:54:55 +05:30
  • ff1647a1d2 fix: test for asset depreciation Nabin Hait 2024-01-17 21:53:00 +05:30
  • 8bc8bc1822 fix: composite asset capitalization using asset components Nabin Hait 2024-01-17 16:17:53 +05:30
  • daf954057f
         Merge pull request #39429 from nabinhait/composite-asset-using-asset Nabin Hait 2024-01-17 21:04:49 +05:30
  • d7e6b83e64 fix: duplicate name error while making variant Rohit Waghchaure 2024-01-17 20:52:16 +05:30
  • 80dc5a7b1c
         Merge pull request #39433 from FHenry/dev_better_display_item_BomCreator rohitwaghchaure 2024-01-17 20:28:50 +05:30
  • 0f881bc90a refactor: BOM creator item selector with short description Florian HENRY 2024-01-17 13:37:22 +01:00
  • 6efa92de70
         Merge branch 'develop' into composite-asset-using-asset mergify[bot] 2024-01-17 12:20:05 +00:00
  • 9f86b92eb7
         Merge pull request #39431 from frappe/mergify/bp/version-15-hotfix/pr-39427 Nabin Hait 2024-01-17 17:38:46 +05:30
  • 04c8e9b355
         Merge pull request #39422 from frappe/mergify/bp/version-15-hotfix/pr-39386 Nabin Hait 2024-01-17 17:33:21 +05:30
  • fbfd0a6db0
         Merge pull request #39420 from frappe/mergify/bp/version-15-hotfix/pr-39385 Nabin Hait 2024-01-17 17:29:12 +05:30
  • 9e33216c24 fix: Asset module tests Nabin Hait 2024-01-17 14:20:43 +05:30
  • 2adb710751
         Merge pull request #39427 from nabinhait/test-fix333 Nabin Hait 2024-01-17 17:21:47 +05:30
  • 97f69986ff fix: Asset module tests Nabin Hait 2024-01-17 14:20:43 +05:30
  • 5df40661d2 fix: composite asset capitalization using asset components Nabin Hait 2024-01-17 16:17:53 +05:30
  • 62f7d984be
         Merge pull request #39425 from frappe/mergify/bp/version-15-hotfix/pr-39423 Deepesh Garg 2024-01-17 15:03:51 +05:30
  • 889d67bcee
         Merge pull request #39367 from deepeshgarg007/revert_dynamic_splitting Deepesh Garg 2024-01-17 15:03:13 +05:30
  • 8b91287034 fix: account and stock manager read perm Gursheen Anand 2024-01-17 13:09:51 +05:30
  • e219042304 fix: Update subscription period Deepesh Garg 2024-01-17 10:57:19 +05:30
  • 1148ed1566
         Merge pull request #39423 from deepeshgarg007/fix_subscription_period_update Deepesh Garg 2024-01-17 12:57:40 +05:30
  • e3c44231ab chore: test dimension filter output ruthra kumar 2024-01-17 12:50:05 +05:30
  • 188ff8cde7 refactor: apply dimension filters on cr/dr notes ruthra kumar 2024-01-17 12:37:43 +05:30
  • 3aa17fa0d6 chore: freezing date check Deepesh Garg 2024-01-17 12:47:27 +05:30
  • 4f3aeaefc1 chore: Remove unwanted changes Deepesh Garg 2024-01-17 12:42:22 +05:30