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

Commit Graph

  • 3a66aefd2c
         fix: show item name as title instead of item group in BOM (#38478) Gughan Ravikumar 2023-12-01 11:07:17 +05:30
  • 54f7cf59fd chore: version bump Ankush Menat 2023-12-01 10:37:35 +05:30
  • b9a42a3b1b
         Merge pull request #38472 from frappe/mergify/bp/version-15-hotfix/pr-38455 rohitwaghchaure 2023-11-30 19:25:14 +05:30
  • abe3e41a17 fix: incorrect requested quantity for the subcontracting order Rohit Waghchaure 2023-11-30 10:25:22 +05:30
  • ba10f7d04c
         Merge pull request #38455 from rohitwaghchaure/fixed-incorrect-requested-qty-in-mr-for-sco rohitwaghchaure 2023-11-30 19:07:55 +05:30
  • 691e3bb24f fix: incorrect requested quantity for the subcontracting order Rohit Waghchaure 2023-11-30 10:25:22 +05:30
  • 2d9ba88870
         fix(ux): make valuation field read only when it can't be modified (backport #38450) (#38464) mergify[bot] 2023-11-30 17:30:35 +05:30
  • 832734ff4c
         Merge pull request #38450 from s-aga-r/FIX-38151 s-aga-r 2023-11-30 17:22:54 +05:30
  • 03013a8433
         Merge pull request #38461 from frappe/mergify/bp/version-15-hotfix/pr-38457 ruthra kumar 2023-11-30 16:42:58 +05:30
  • 3d4156cc7d fix(ux): make PI rate field read-only having PR ref s-aga-r 2023-11-30 16:28:03 +05:30
  • f44bb0df50 refactor: use flt on outstanding on AR/AP summary report ruthra kumar 2023-11-30 15:57:57 +05:30
  • cc053ad894
         Merge pull request #38457 from ruthra-kumar/use_flt_on_outstanding_on_ar_ap_summary ruthra kumar 2023-11-30 16:23:28 +05:30
  • ae294ee470 fix(ux): make PR rate field read-only having PO ref s-aga-r 2023-11-30 16:16:12 +05:30
  • e4bdd3a28d refactor: use flt on outstanding on AR/AP summary report ruthra kumar 2023-11-30 15:57:57 +05:30
  • 5e6a4d257e
         feat: enable automatic type annotations (backport #38452) (#38454) mergify[bot] 2023-11-30 14:43:16 +05:30
  • 63313eef6f
         feat: enable automatic type annotations (#38452) Ankush Menat 2023-11-30 13:53:48 +05:30
  • 7f4d2b707a
         refactor: Simpler log settings setup (backport #38449) (#38451) mergify[bot] 2023-11-30 13:30:15 +05:30
  • 1da9087cc4
         refactor: Simpler log settings setup (#38449) Ankush Menat 2023-11-30 13:28:55 +05:30
  • 05da5bfc9a
         Merge pull request #38448 from frappe/mergify/bp/version-15-hotfix/pr-38446 ruthra kumar 2023-11-30 13:18:52 +05:30
  • 7a1744691f refactor: pass on filter to upfront outstanding query as well ruthra kumar 2023-11-30 12:22:55 +05:30
  • de3795a7d4
         Merge pull request #38446 from ruthra-kumar/filter_bug_on_payment_reconciliation ruthra kumar 2023-11-30 12:54:46 +05:30
  • cfd3230c75 refactor: pass on filter to upfront outstanding query as well ruthra kumar 2023-11-30 12:22:55 +05:30
  • e06669847d
         fix: exploded items in Subcontracting Receipt (backport #38441) (#38445) mergify[bot] 2023-11-30 12:16:07 +05:30
  • a50e872820
         fix: use docstatus instead of status (backport #38439) (#38443) mergify[bot] 2023-11-30 12:12:02 +05:30
  • 7005d51af3
         feat: auto create PR on SCR submission (backport #38290) (#38428) mergify[bot] 2023-11-30 12:11:05 +05:30
  • e38b06bf2d
         Merge pull request #38441 from s-aga-r/FIX-38434 s-aga-r 2023-11-30 12:10:18 +05:30
  • 7cb0b1b7c3
         Merge pull request #38439 from s-aga-r/FIX-38433 s-aga-r 2023-11-30 12:09:43 +05:30
  • 62b4a263f8 fix: exploded items in Subcontracting Receipt s-aga-r 2023-11-30 12:07:52 +05:30
  • 96b13c59c1 fix(pe): show split alert only on splitting Dany Robert 2023-11-30 06:20:15 +00:00
  • 1423b38d50 fix: use docstatus instead of status s-aga-r 2023-11-30 11:43:28 +05:30
  • 277e81c68e
         Merge pull request #38431 from frappe/mergify/bp/version-15-hotfix/pr-38429 Deepesh Garg 2023-11-30 08:15:11 +05:30
  • ff27cccff4 refactor: get outstanding journal entry using query builder Devin Slauenwhite 2023-11-29 20:59:23 +00:00
  • abc7d30024 fix(ux): make basic_rate field read-only based on purpose s-aga-r 2023-11-29 19:49:58 +05:30
  • de7e1ab237 fix: set cwip account before asset tests Gursheen Anand 2023-11-29 18:25:52 +05:30
  • 591f4ebdca
         Merge pull request #38429 from GursheenK/set-cwip-account-for-asset-tests Deepesh Garg 2023-11-29 18:50:05 +05:30
  • ef8e4191cd fix: set cwip account before asset tests Gursheen Anand 2023-11-29 18:25:52 +05:30
  • f1456d072c
         Merge pull request #38423 from frappe/mergify/bp/version-15-hotfix/pr-38250 Deepesh Garg 2023-11-29 18:21:30 +05:30
  • cf97e3c21f
         Merge pull request #38427 from Nandhinidevi123/stock_entry rohitwaghchaure 2023-11-29 18:11:22 +05:30
  • 2e8739fff7
         Merge pull request #38290 from s-aga-r/FIX-36704 s-aga-r 2023-11-29 17:57:11 +05:30
  • 3da0aa6a0b fix(test): test_auto_create_purchase_receipt s-aga-r 2023-11-29 17:35:21 +05:30
  • 97be527ee9 fix:change default qty Nandhinidevi123 2023-11-29 17:21:51 +05:30
  • cac3b4a0d8 Merge branch 'develop' of https://github.com/Nandhinidevi123/erpnext into develop Nandhinidevi123 2023-11-29 17:20:38 +05:30
  • 96f31847b2 fix: set cwip account for company before tests Gursheen Anand 2023-11-29 16:04:36 +05:30
  • 0e50e77d8e fix: unset discount amount based on coupon code Gursheen Anand 2023-11-21 15:14:55 +05:30
  • 85f9f8d176
         Merge pull request #38250 from GursheenK/unset-discount-amount-based-on-coupon-code Deepesh Garg 2023-11-29 15:53:46 +05:30
  • 7b0cd03f88 test: auto create PR on SCR submit s-aga-r 2023-11-29 14:10:48 +05:30
  • 68585f6f2b test: auto create SCO on PO submit s-aga-r 2023-11-29 13:58:21 +05:30
  • 857f2b5a01 chore: linter s-aga-r 2023-11-29 13:39:02 +05:30
  • 258148b615
         Merge pull request #38365 from Nandhinidevi123/sales_register rohitwaghchaure 2023-11-29 13:37:22 +05:30
  • 7145b040f1 fix(ux): hide Create Purchase Receipt button for Subcontract Return s-aga-r 2023-11-29 13:21:24 +05:30
  • 874766a82f fix: map warehouses in return SCR s-aga-r 2023-11-29 13:07:39 +05:30
  • d0f1dec573
         Merge pull request #38411 from frappe/mergify/bp/version-15-hotfix/pr-38165 rohitwaghchaure 2023-11-29 13:05:03 +05:30
  • 4bb1cb50ba
         Merge pull request #38419 from frappe/mergify/bp/version-15-hotfix/pr-38415 rohitwaghchaure 2023-11-29 13:02:53 +05:30
  • 096a2c8cd0 chore: PR ref in SCR connections s-aga-r 2023-11-29 12:46:31 +05:30
  • 4a047fefb8
         Merge branch 'develop' into make-against-field-dynamic Gursheen Kaur Anand 2023-11-29 12:30:20 +05:30
  • 71fe2bcc28 fix: incorrect ordered qty for Subcontracting Order (#38415) rohitwaghchaure 2023-11-29 12:21:11 +05:30
  • fddf341f44
         fix: incorrect ordered qty for Subcontracting Order (#38415) rohitwaghchaure 2023-11-29 12:21:11 +05:30
  • 12ad1ec71a
         feat: shift depreciation for assets (backport #38327) (#38417) mergify[bot] 2023-11-29 12:15:53 +05:30
  • fe5fc5bd3a
         feat: shift depreciation for assets (#38327) Anand Baburajan 2023-11-29 12:14:12 +05:30
  • 0255e09285 test: ledger pre and post reconciliation on advance as liability ruthra kumar 2023-11-29 10:57:28 +05:30
  • 80afeca229
         fix: OperationalError while selecting Serial No in Warranty Claim (backport #38394) (#38414) mergify[bot] 2023-11-29 10:40:41 +05:30
  • 2b0b15f4d1
         Merge pull request #38394 from s-aga-r/FIX-38330 s-aga-r 2023-11-29 10:37:07 +05:30
  • 95f9cc99b9 fix: make create button translatable (#38165) Patrick Eissler 2023-11-29 05:52:47 +01:00
  • 8e4b591ea2
         fix: make create button translatable (#38165) Patrick Eissler 2023-11-29 05:52:47 +01:00
  • 4a243ce5b7
         fix(regional): use net figures for sales calc (#38260) mergify[bot] 2023-11-29 09:08:50 +05:30
  • b9f26ae849
         fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342) mergify[bot] 2023-11-29 09:06:34 +05:30
  • 663bb8726c
         fix(regional): use net figures for sales calc (#38260) Dany Robert 2023-11-29 09:03:47 +05:30
  • 2add802d0d refactor(test): advance allocation on purchase invoice ruthra kumar 2023-11-29 08:59:14 +05:30
  • adfcdb3b65
         fix: don't consider cancelled entries Devin Slauenwhite 2023-11-28 13:19:49 -05:00
  • d4a3d6bbe0 chore(release): Bumped to Version 15.4.0 Frappe PR Bot 2023-11-28 16:24:28 +00:00
  • 4bfdab93ad
         Merge pull request #38383 from frappe/version-15-hotfix rohitwaghchaure 2023-11-28 21:53:16 +05:30
  • c1018555a0
         fix: no fstring in translation (backport #38381) (#38387) mergify[bot] 2023-11-28 21:36:05 +05:30
  • 9fadf5f426 refactor: don't use cur_frm s-aga-r 2023-11-28 21:34:07 +05:30
  • 9f873749e2
         Merge pull request #38400 from frappe/mergify/bp/version-15-hotfix/pr-38398 Shariq Ansari 2023-11-28 20:45:34 +05:30
  • 3e6306348a refactor: redefine dr_or_cr for unallocated amount ruthra kumar 2023-11-28 20:04:47 +05:30
  • b1b065daf1 fix: create contact if existing customer doesn't have contact Shariq Ansari 2023-11-28 19:24:15 +05:30
  • 458dd51af7
         Merge pull request #38398 from shariquerik/create-contact-only-if-not-exist Shariq Ansari 2023-11-28 19:49:22 +05:30
  • 23b0b8ba36 fix: create contact if existing customer doesn't have contact Shariq Ansari 2023-11-28 19:24:15 +05:30
  • 33b3355cb3
         Merge pull request #38396 from frappe/mergify/bp/version-15-hotfix/pr-38392 Gursheen Kaur Anand 2023-11-28 19:21:37 +05:30
  • b65c22579d
         fix: serial no status (backport #38391) (#38397) mergify[bot] 2023-11-28 18:31:23 +05:30
  • 592fc81260
         fix: serial no status (#38391) rohitwaghchaure 2023-11-28 18:28:48 +05:30
  • 573c4d2bfc chore: fix imports for renamed report Gursheen Anand 2023-11-28 17:11:35 +05:30
  • c232acbe9b
         Merge pull request #38392 from GursheenK/report-rename-import Gursheen Kaur Anand 2023-11-28 18:22:59 +05:30
  • 640dfab827 refactor: use frm.set_query to add filters s-aga-r 2023-11-28 17:45:17 +05:30
  • 01044ca8e9 refactor: use DocType Fetch From instead of frm.add_fetch s-aga-r 2023-11-28 17:33:27 +05:30
  • 2633d7dca3 refactor: 'partial' flag to only cancel unlinked ledger entries ruthra kumar 2023-11-28 17:05:29 +05:30
  • ecb533c4d1 refactor: return the newly added reference upon reconciliation ruthra kumar 2023-11-28 17:04:07 +05:30
  • 5fc19dab54 refactor: 'make_advance_gl_entries' method ruthra kumar 2023-11-28 17:13:43 +05:30
  • 58114e7b24 refactor: use different GL build logic for advance as liability ruthra kumar 2023-11-28 16:50:22 +05:30
  • 1763824e5f refactor: use arrow function s-aga-r 2023-11-28 17:19:21 +05:30
  • aee2e12f39 chore: fix imports for renamed report Gursheen Anand 2023-11-28 17:11:35 +05:30
  • 500573067a Merge branch 'develop' into FIX-36704 s-aga-r 2023-11-28 17:01:48 +05:30
  • 8052103197 feat: provision to create PR from SCR s-aga-r 2023-11-28 16:28:54 +05:30
  • 78ab11f991 refactor: post to GL and Payment Ledger on advance as liability ruthra kumar 2023-09-20 13:05:04 +05:30
  • 3263f2023c test: assert ledger entries on partial reconciliation ruthra kumar 2023-09-20 09:36:18 +05:30
  • 8f00481c5f
         fix: no fstring in translation (#38381) Raffael Meyer 2023-11-28 10:35:28 +01:00
  • 922aef665b
         fix: Server Error while creating Product Bundle (backport #38377) (#38380) mergify[bot] 2023-11-28 14:54:05 +05:30
  • 9872e371a2
         Merge pull request #38377 from s-aga-r/FIX-PB-SEARCH-INPUT s-aga-r 2023-11-28 14:34:26 +05:30
  • 37b3ac7952 feat: SCR Item ref in PR Item s-aga-r 2023-11-28 13:39:15 +05:30
  • d891bd7fac feat: Subcontracting Receipt ref in Purchase Receipt s-aga-r 2023-11-28 13:17:24 +05:30