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

Commit Graph

  • 30554301c9
         Merge pull request #36235 from resilient-tech/fix-tax-breakup-for-diff-tax-rates Deepesh Garg 2023-07-24 20:57:26 +05:30
  • 3f81e15672
         Merge pull request #36147 from deepeshgarg007/eslint Deepesh Garg 2023-07-24 20:55:07 +05:30
  • 1b8490dc98
         Merge branch 'develop' into fix-tax-breakup-for-diff-tax-rates Smit Vora 2023-07-24 20:20:19 +05:30
  • 1bc87a970a
         fix: set new purchase_receipt_amount on asset split (copy #36272) (#36280) mergify[bot] 2023-07-24 19:37:07 +05:30
  • 4867a767a2
         Merge pull request #36278 from resilient-tech/set-company-flag Deepesh Garg 2023-07-24 19:34:29 +05:30
  • 4205f564a0 fix(regional): set frappe.flags.company temporarily, where required Sagar Vora 2023-07-24 18:37:36 +05:30
  • 6f376cf103 fix: remove unused params DaizyModi 2023-07-24 18:02:42 +05:30
  • db49d53aaf fix: running balance after sorting Gursheen Anand 2023-07-24 17:42:13 +05:30
  • 164df33419
         Merge pull request #36274 from GursheenK/process-soa-customer-filter Deepesh Garg 2023-07-24 17:32:17 +05:30
  • 5224f13db2 fix: add patch for renaming tds payable report Gursheen Anand 2023-07-24 14:52:29 +05:30
  • 34d7fb388d fix: customer filter in process soa Gursheen Anand 2023-07-24 16:47:06 +05:30
  • 1436040d4c
         fix: allow both custodian and location while creating asset (copy #36263) (#36264) mergify[bot] 2023-07-24 15:51:24 +05:30
  • 4464b2a21b
         Merge pull request #36261 from ruthra-kumar/possible_missing_field_error_on_payment_entry ruthra kumar 2023-07-24 15:22:15 +05:30
  • 7f4dda1b06
         Merge pull request #36259 from rohitwaghchaure/fixed-report-default-email-outgoing-error rohitwaghchaure 2023-07-24 15:03:09 +05:30
  • 3dd119eeea refactor: apply terms based validation only on sales/purchase doctyp ruthra kumar 2023-07-24 14:50:11 +05:30
  • a785a6054e
         Merge pull request #36251 from ruthra-kumar/performance_tune_timsheet_adding_logic ruthra kumar 2023-07-24 14:01:07 +05:30
  • efb51526a9 fix: no default email account causing reposting issue Rohit Waghchaure 2023-07-24 14:00:20 +05:30
  • 8b4228d616 fix: removed duplicate code Ritvik Sardana 2023-07-24 13:59:24 +05:30
  • 5389dabe19 Merge branch 'develop' of https://github.com/frappe/erpnext into develop-ritvik-pos-dark Ritvik Sardana 2023-07-24 12:48:58 +05:30
  • 82b36e2ec8 fix: added test for pos closing without item code Ritvik Sardana 2023-07-24 12:47:29 +05:30
  • 203b8ec872
         Merge pull request #36220 from marination/dunning-patch-acc-frozen Deepesh Garg 2023-07-24 12:46:32 +05:30
  • 740f283ec1
         Merge pull request #36241 from ruthra-kumar/fix_allocation_logic_in_get_outstanding_invoices ruthra kumar 2023-07-24 12:35:25 +05:30
  • 4bb6db86f8 fix: Remove auto repeat (subscription) button from Sales and Purchase documents Deepesh Garg 2023-07-24 12:29:57 +05:30
  • 2f6d0bdcee fix: col names for party types Gursheen Anand 2023-07-24 12:20:58 +05:30
  • 38b501e004 fix: make party type filter mandatory Gursheen Anand 2023-07-24 12:13:47 +05:30
  • 3c92686f0a fix: Default year start and end dates in reports Deepesh Garg 2023-07-24 11:58:16 +05:30
  • b740cdfc00
         build(deps): update tweepy 3.10.0 -> 4.14.0 David Arnold 2023-07-23 22:15:02 -05:00
  • d066b5cd04
         fix(startup): coa drill down David Arnold 2023-07-23 22:43:41 -05:00
  • cdc9b62688 chore: Remove cur_frm from sales_invoice.js Deepesh Garg 2023-07-23 22:44:18 +05:30
  • 8d3d9493f0 chore: linting issues Deepesh Garg 2023-07-23 20:06:41 +05:30
  • d048365da3 refactor: refresh table once after loop ends ruthra kumar 2023-07-23 19:50:14 +05:30
  • 0d70ae2a21 chore: Ingnore issues Deepesh Garg 2023-07-23 19:34:08 +05:30
  • 8ccb8e3c5b chore: Move buying controller to utils Deepesh Garg 2023-07-23 18:50:44 +05:30
  • 7205fb9b97 chore: convert sales common to utils Deepesh Garg 2023-07-23 12:07:21 +05:30
  • ec7558b9e0 refactor: handle references without any template and payment_term ruthra kumar 2023-07-23 11:55:16 +05:30
  • 662ccd467c fix: allocation logic on 'Get Outstanding Invoices' btn in PE ruthra kumar 2023-07-22 11:18:11 +05:30
  • 4077254b01 chore: resolve undefined variables issue Deepesh Garg 2023-07-22 23:07:18 +05:30
  • 0b1e78e127 chore: Add landed cost taxes and charges common in bundles Deepesh Garg 2023-07-22 21:19:48 +05:30
  • 6b2dbdd394
         Merge branch 'develop' into skip_tcs Deepesh Garg 2023-07-22 18:38:45 +05:30
  • e6abe1b77f
         Merge pull request #36206 from ruthra-kumar/test_cases_for_payment_term_overallocation ruthra kumar 2023-07-22 10:41:01 +05:30
  • 93246043ec chore(test): enable multi-currency party for testing ruthra kumar 2023-07-22 10:01:59 +05:30
  • 8f9ef4ef5b chore: validation on multi-currency tran on company curtency account ruthra kumar 2023-07-22 09:16:03 +05:30
  • 5b37919574 chore: use flt for currency ruthra kumar 2023-07-22 08:15:03 +05:30
  • 6b4a81ee48 chore: test more scenarios ruthra kumar 2023-07-20 21:19:29 +05:30
  • 653117c2a9 test: fix test case for itemised tax breakup DaizyModi 2023-07-21 17:52:54 +05:30
  • b84deec601 fix: Correct Tax Breakup for different tax rates for same hsn code DaizyModi 2023-07-21 17:26:35 +05:30
  • 7069e2a5a0 fix: removed validate_item_code function in sales_invoice Ritvik Sardana 2023-07-21 17:18:35 +05:30
  • cc36af57bd
         Merge pull request #36229 from deepeshgarg007/naming_in_order Deepesh Garg 2023-07-21 16:05:31 +05:30
  • 7a7d32db81 fix: FY in naming series variable for orders Deepesh Garg 2023-07-21 16:03:17 +05:30
  • ec80dc6f09 fix: make column names more general Gursheen Anand 2023-07-21 15:55:31 +05:30
  • 1c5c310f5a fix: fetch acc dimension fieldname Gursheen Anand 2023-07-21 13:37:48 +05:30
  • 59a2a04fcc fix: check gl entry status using is_cancelled Gursheen Anand 2023-07-21 13:22:01 +05:30
  • 1c033ce635 chore: change column format for report Gursheen Anand 2023-07-21 11:00:19 +05:30
  • 33f8f7d7b3 fix: exclude cancelled gl entries for opening balance Gursheen Anand 2023-07-21 10:57:55 +05:30
  • 17ff395f9a fix: Reverse GL entries only for submitted Dunnings marination 2023-07-20 20:54:43 +05:30
  • de189c5f18
         Merge pull request #35950 from FHenry/dev_feat_adress_contact_report Deepesh Garg 2023-07-20 20:26:38 +05:30
  • aeae8d646a fix: Patch dunnings made after accounts were frozen marination 2023-07-20 19:00:39 +05:30
  • 76db0b63ba
         Merge pull request #36214 from deepeshgarg007/tb_cancelled_entries Deepesh Garg 2023-07-20 18:48:03 +05:30
  • 5d7dd9b0ec fix: project route permissions for user Gursheen Anand 2023-07-20 18:20:53 +05:30
  • 1084f0d97f
         Merge pull request #36209 from mohsinalimat/patch-2 rohitwaghchaure 2023-07-20 18:03:27 +05:30
  • 9a9939cfb3
         Merge pull request #36208 from rohitwaghchaure/fixed-filter-mandatory-for-batch-wise-balance-report rohitwaghchaure 2023-07-20 18:02:37 +05:30
  • fd58bbff6b fix: Trial Balance report considering cancelled entries Deepesh Garg 2023-07-20 17:51:54 +05:30
  • c21fd45883
         fix: Ambiguous column error while submitting stock entry MohsinAli 2023-07-20 13:51:17 +05:30
  • 610ead22e8 fix: show only projects with access in customer portal Gursheen Anand 2023-07-20 13:08:26 +05:30
  • 16498627ce fix: made item or warehouse filter mandatory Rohit Waghchaure 2023-07-20 12:55:10 +05:30
  • 3bc79eebe3
         Merge pull request #35689 from marination/payments-based-dunning Deepesh Garg 2023-07-20 12:06:36 +05:30
  • e7e3853f81 test: overallocation validation in payment entry ruthra kumar 2023-07-20 09:08:55 +05:30
  • 4b4d828260 fix: inserting of items with pricing rule with qty range HarryPaulo 2023-07-19 13:02:55 -03:00
  • 3f5afb9cac fix: reset dimension defaults when company changedin test Gursheen Anand 2023-07-19 18:15:59 +05:30
  • 23e56d3ec1 fix: clear dimension defaults after test Gursheen Anand 2023-07-19 16:07:32 +05:30
  • 781e57f5bf
         Merge pull request #36189 from deepeshgarg007/default_dashboard_dates Deepesh Garg 2023-07-19 13:28:04 +05:30
  • 3759a41b83 fix: Default fiscal year in accounting, buying and sellingcharts Deepesh Garg 2023-07-19 13:17:12 +05:30
  • 2f7b112736 fix: filter by party in opening row calculation Gursheen Anand 2023-07-19 12:36:44 +05:30
  • e19a6f5dcb fix: fetch acc dimensions correctly when fieldname is different from name Gursheen Anand 2023-07-19 12:26:57 +05:30
  • 0218f11f47 ci: dont run tests on branch Ankush Menat 2023-07-19 12:17:32 +05:30
  • b3f6d991b5 fix: duplicate acc dimension in test Gursheen Anand 2023-07-19 12:02:26 +05:30
  • dd37f6cbd6 fix: show tax withholding category details for customers Gursheen Anand 2023-07-19 11:51:45 +05:30
  • bccfd22fc0
         Merge pull request #36181 from ruthra-kumar/fix_broken_overallocation_validation_on_multi_term_payment_against_invoice ruthra kumar 2023-07-19 10:46:41 +05:30
  • ee83f94bb0 refactor: payment term outstanding in party account currency ruthra kumar 2023-07-19 09:26:39 +05:30
  • f8d4b19cb9 fix: broken overallocation validation in payment entry ruthra kumar 2023-07-18 17:36:38 +05:30
  • b4db5e9561
         fix: validate docs in closed accounting period on save (#36157) mergify[bot] 2023-07-18 17:40:49 +05:30
  • 77deac4fb9 test: PI offsetting entry for accounting dimension Gursheen Anand 2023-07-18 15:51:01 +05:30
  • fbea61bbc6
         fix: Trailing opening entries in Accounts closing balance (#36175) Deepesh Garg 2023-07-18 15:16:52 +05:30
  • 07d2b896c1 fix: log error during exotel migration Ankush Menat 2023-07-18 13:01:33 +05:30
  • 3a3ffa2307 fix: divide offsetting amount only when account exists Gursheen Anand 2023-07-18 12:51:09 +05:30
  • cfae52a40a
         fix: Opening balance in TB report (#36171) Deepesh Garg 2023-07-18 12:26:19 +05:30
  • 1e1e4b93c1 fix: divide offsetting amount for multiple dimensions Gursheen Anand 2023-07-18 12:12:24 +05:30
  • 9fb1533b8f
         fix(test): test_stock_reservation_against_sales_order (#36166) s-aga-r 2023-07-18 08:31:02 +05:30
  • 55d5469740
         Merge pull request #36168 from frappe/mergify/bp/develop/pr-36162 rohitwaghchaure 2023-07-17 22:44:02 +05:30
  • 9e791efc82 refactor: client side accounts controller Deepesh Garg 2023-07-17 21:44:43 +05:30
  • 43e65d91ea chore: Remove unused files Deepesh Garg 2023-07-17 21:26:40 +05:30
  • 7af3c3d0b6 fix: incorrect Reserved Qty for Production Plan in BIN for multi-uom case Rohit Waghchaure 2023-07-17 15:21:48 +05:30
  • ecaf0aba3c fix: rounding of percentage fields barredterra 2023-07-17 16:45:11 +02:00
  • ed3bef1840 fix: dict value for dimension for gl entries defined without the dimension Gursheen Anand 2023-07-17 18:40:52 +05:30
  • 4004427892 test: TB report balanced whenfiltered using acc dimension Gursheen Anand 2023-07-17 17:57:03 +05:30
  • 3b246fd7e6
         Merge pull request #36163 from resilient-tech/consistent-quotes Sagar Vora 2023-07-17 15:46:40 +05:30
  • bccb718cc2 chore: use consistent quotes Sagar Vora 2023-07-17 15:45:36 +05:30
  • 22ba12172f fix: make offsetting entry for all doctypes Gursheen Anand 2023-07-17 15:17:53 +05:30
  • 1c1e7380e3
         Merge branch 'develop' into payments-based-dunning Marica 2023-07-17 12:33:19 +05:30
  • ef19634a13 chore: fix build Deepesh Garg 2023-07-17 12:25:56 +05:30