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

Commit Graph

  • efd31a429c
         Merge pull request #38257 from ruthra-kumar/optimize_ple_outstanding_query ruthra kumar 2023-11-23 09:41:21 +05:30
  • 728cc9f725 fix: fiscal year using future date Gursheen Anand 2023-11-22 19:28:57 +05:30
  • 52305e3000 fix: annual income and expenses in digest Gursheen Anand 2023-11-22 18:38:33 +05:30
  • 1657337887 chore: linting issues Gursheen Anand 2023-11-22 16:45:14 +05:30
  • 362f377f61 fix: skip disabled bundles for non-report utils Gursheen Anand 2023-11-22 16:26:09 +05:30
  • 8bdb61cb87 fix: condition in other bundle utils Gursheen Anand 2023-11-22 16:17:23 +05:30
  • 67f43d37df fix: validation for existing bundles Gursheen Anand 2023-11-22 16:10:49 +05:30
  • 3543f86c63 fix: has_product_bundle util to only check for enabled bundles Gursheen Anand 2023-11-22 16:04:05 +05:30
  • 627165dc7c fix: Supplier Primary Contact s-aga-r 2023-11-22 15:26:45 +05:30
  • 874774fe6c fix: filter bundle items based on disabled check Gursheen Anand 2023-11-22 15:24:56 +05:30
  • ee76af7681 feat: add disabled field in product bundle Gursheen Anand 2023-11-22 15:23:17 +05:30
  • f9713eeb56 fix: skip fixed assets in parent Gursheen Anand 2023-11-22 15:22:42 +05:30
  • 0ca7527f7a
         fix: patch - Duplicate entry quality inspection parameter (#38262) rohitwaghchaure 2023-11-22 14:02:01 +05:30
  • 2a41da94d4 fix(ux): no need to select rows to unreserve the stock s-aga-r 2023-11-21 11:34:53 +05:30
  • 73586fd9b2 fix: use field sales_order_item instead name s-aga-r 2023-11-22 11:37:14 +05:30
  • 9c889b37fb fix(ux): no need to select rows to reserve the stock s-aga-r 2023-11-20 18:33:56 +05:30
  • b11ae4b54c
         chore: remove dead link Ankush Menat 2023-11-22 10:26:50 +05:30
  • e3af1dc864
         Merge pull request #38258 from ruthra-kumar/rename_unreconcile ruthra kumar 2023-11-22 10:03:13 +05:30
  • 8b04c1d4f6 refactor: optimize outstanding vouchers query ruthra kumar 2023-11-22 09:59:32 +05:30
  • 74f9e34182 chore: update new unreconcile doctype name in JS and PY files ruthra kumar 2023-11-21 16:51:06 +05:30
  • 1fddc30350
         Merge pull request #38081 from GursheenK/validate-repost-ledger-settings-for-editable-invoices ruthra kumar 2023-11-22 05:22:59 +05:30
  • 33869a231c chore(release): Bumped to Version 15.3.0 Frappe PR Bot 2023-11-21 18:57:56 +00:00
  • de783da2b6
         Merge pull request #38248 from frappe/version-15-hotfix Deepesh Garg 2023-11-22 00:26:18 +05:30
  • c60aaa799a
         fix: set asset's valuation_rate according to asset quantity (backport #38254) (#38256) mergify[bot] 2023-11-21 22:57:34 +05:30
  • e2bb4e2baa
         fix: set asset's valuation_rate according to asset quantity (#38254) Anand Baburajan 2023-11-21 22:32:43 +05:30
  • 383a4b132e chore: change f-string to sql params Dany Robert 2023-11-21 12:46:56 +00:00
  • 9006c9b747 chore: rename 'unreconcile payments' to 'unreconcile payment' ruthra kumar 2023-11-21 16:44:01 +05:30
  • 6518582ed3 fix: unset discount amount based on coupon code Gursheen Anand 2023-11-21 15:14:55 +05:30
  • 07c0ed127a
         Merge pull request #38236 from frappe/mergify/bp/version-15-hotfix/pr-38234 ruthra kumar 2023-11-21 15:00:40 +05:30
  • ed7b845a55
         fix: valuation rate for FG item for subcontracting receipt (backport #38244) (#38245) mergify[bot] 2023-11-21 14:53:03 +05:30
  • 5c308a4f9a
         fix: valuation rate for FG item for subcontracting receipt (#38244) rohitwaghchaure 2023-11-21 14:42:26 +05:30
  • c84c97577f
         Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-38234 ruthra kumar 2023-11-21 13:43:58 +05:30
  • 1f2f5d8cf6
         fix(Timesheet): warn user if billing hours > actual hours instead of resetting (backport #38239) (#38241) mergify[bot] 2023-11-21 13:41:50 +05:30
  • bb77546849
         Merge pull request #38237 from frappe/mergify/bp/version-15-hotfix/pr-37586 ruthra kumar 2023-11-21 13:26:39 +05:30
  • ac91030b31
         fix(Timesheet): warn user if billing hours > actual hours instead of resetting (#38239) Rucha Mahabal 2023-11-21 13:18:34 +05:30
  • 2bec89a5bf chore: fix flakiness test_sales_order_partial_advance_payment ruthra kumar 2023-10-24 08:09:22 +05:30
  • 034375b4f5 refactor(test): make use of utility methods ruthra kumar 2023-10-19 14:57:05 +05:30
  • 9600a2cdb7 test: overalloction on reconciliation when PO is involved ruthra kumar 2023-10-19 14:03:21 +05:30
  • 337707b9cc fix: overallocation on Payment with PO/SO ruthra kumar 2023-10-19 11:32:21 +05:30
  • 15f40a7af6 test: prevent rounding loss based validation error ruthra kumar 2023-11-21 11:46:45 +05:30
  • 9680edfcc3
         Merge pull request #38234 from ruthra-kumar/test_case_for_rounding_issue ruthra kumar 2023-11-21 12:09:54 +05:30
  • 56e991b7f4 test: prevent rounding loss based validation error ruthra kumar 2023-11-21 11:46:45 +05:30
  • 99bf63ec0f
         fix: set default asset quantity as 1 [dev] (backport #38223) (#38226) mergify[bot] 2023-11-20 22:49:38 +05:30
  • 9903049c7a
         fix: set default asset quantity as 1 [dev] (#38223) Anand Baburajan 2023-11-20 22:27:16 +05:30
  • f34ffc2062 fix: exclude invoice_doctypes from party advance Dany Robert 2023-11-20 11:10:56 +00:00
  • bfaa93b0ca fix: honour currency precision while fetching balance Dany Robert 2023-11-20 09:43:02 +00:00
  • 491e9b4fd5
         Merge pull request #38214 from frappe/mergify/bp/version-15-hotfix/pr-38210 ruthra kumar 2023-11-20 15:02:24 +05:30
  • f88ec533e6
         Merge pull request #38216 from frappe/mergify/bp/version-15-hotfix/pr-38212 ruthra kumar 2023-11-20 14:49:33 +05:30
  • afaf6afd27 refactor: update scheduled job for bulk transaction ruthra kumar 2023-11-20 13:26:02 +05:30
  • f50d933a25
         Merge pull request #38212 from ruthra-kumar/update_hook ruthra kumar 2023-11-20 14:16:11 +05:30
  • 1ed65524e5 refactor: add flag to POS Invoice ruthra kumar 2023-11-20 12:27:43 +05:30
  • 5da9a22e4c refactor: set default for 'update_billed_amount_in_delivery_note' ruthra kumar 2023-11-20 11:52:26 +05:30
  • ce092bf23b
         Merge pull request #38210 from ruthra-kumar/set_default_on_billed_amt_update ruthra kumar 2023-11-20 14:05:45 +05:30
  • fb06ad7330 refactor: update scheduled job for bulk transaction ruthra kumar 2023-11-20 13:26:02 +05:30
  • e272041872
         fix(ux): Task creation from Timesheet (backport #38207) (#38211) mergify[bot] 2023-11-20 12:44:26 +05:30
  • 3f57a7e9f0
         fix: TypeError in Subcontracting Receipt (backport #38200) (#38208) mergify[bot] 2023-11-20 12:40:41 +05:30
  • 80ab4eea8c
         Merge pull request #38207 from s-aga-r/FIX-37809 s-aga-r 2023-11-20 12:39:30 +05:30
  • 2186e1cce4
         Merge pull request #38197 from frappe/mergify/bp/version-15-hotfix/pr-38159 ruthra kumar 2023-11-20 12:31:44 +05:30
  • 83a13e22b7 refactor: add flag to POS Invoice ruthra kumar 2023-11-20 12:27:43 +05:30
  • ee0c64215d refactor: set default for 'update_billed_amount_in_delivery_note' ruthra kumar 2023-11-20 11:52:26 +05:30
  • 5ac8bd7f08
         Merge pull request #38200 from s-aga-r/FIX-38188 s-aga-r 2023-11-20 12:14:23 +05:30
  • 2f3fc12c08 fix: add route options for new Task s-aga-r 2023-11-20 12:05:25 +05:30
  • 331ad62f3c fix(ux): enable Quick Entry for Task s-aga-r 2023-11-20 12:03:54 +05:30
  • 7622a2791e
         Merge pull request #38199 from frappe/mergify/bp/version-15-hotfix/pr-37963 Sagar Vora 2023-11-20 11:47:01 +05:30
  • 88b62a0a61 chore: resolve conflicts Sagar Vora 2023-11-20 11:41:42 +05:30
  • f6e93f084a fix: TypeError in Subcontracting Receipt s-aga-r 2023-11-20 10:23:35 +05:30
  • aef955c920 fix: Supplier Quotation fields (#37963) Vishakh Desai 2023-11-09 18:26:34 +05:30
  • c2cb86b40a refactor: add substring logic in ar/ap report ruthra kumar 2023-11-18 10:35:56 +05:30
  • 9ee8a78083 refactor: provision to set remarks length in accounts settings ruthra kumar 2023-11-18 09:04:36 +05:30
  • 7b2eacd4d8
         Merge pull request #38159 from ruthra-kumar/provision_to_truncate_remarks ruthra kumar 2023-11-20 10:07:10 +05:30
  • a9bf906545 refactor: add substring logic in ar/ap report ruthra kumar 2023-11-18 10:35:56 +05:30
  • 97090ff367 refactor: provision to set remarks length in accounts settings ruthra kumar 2023-11-18 09:04:36 +05:30
  • 0f227aa883
         Merge pull request #38191 from frappe/mergify/bp/version-15-hotfix/pr-38171 Deepesh Garg 2023-11-19 19:44:23 +05:30
  • fc1ee1b3ed
         Merge pull request #38174 from frappe/mergify/bp/version-15-hotfix/pr-38147 Deepesh Garg 2023-11-19 19:21:36 +05:30
  • cf7d0ab8a5
         Merge pull request #38176 from frappe/mergify/bp/version-15-hotfix/pr-38163 Deepesh Garg 2023-11-19 19:20:56 +05:30
  • c29bc8c97f
         chore: linting issues Deepesh Garg 2023-11-19 19:20:06 +05:30
  • eab18e6f71 fix: test case for rounded total with cash disc Dany Robert 2023-11-19 02:53:09 +00:00
  • 70eccf7da0 fix: wrong round off and rounded total Dany Robert 2023-11-18 13:32:04 +00:00
  • 6c8b6de4c9
         Merge pull request #38171 from rtdany10/rounded-total Deepesh Garg 2023-11-19 19:18:38 +05:30
  • d0ae566e38
         Merge pull request #38189 from frappe/mergify/bp/version-15-hotfix/pr-38177 Deepesh Garg 2023-11-19 19:10:59 +05:30
  • 384d6b516c fix: payment entry rounding error Devin Slauenwhite 2023-11-18 14:36:20 +00:00
  • f91752cad2
         Merge pull request #38177 from pps190/fix-pe-precision Deepesh Garg 2023-11-19 18:46:00 +05:30
  • 13d965276f
         Merge pull request #38180 from frappe/mergify/bp/version-15-hotfix/pr-38161 Deepesh Garg 2023-11-19 18:44:50 +05:30
  • 7be7c6a479
         Merge pull request #38173 from frappe/mergify/bp/version-15-hotfix/pr-38142 Deepesh Garg 2023-11-19 17:08:04 +05:30
  • cc60c328fe fix: test case for rounded total with cash disc Dany Robert 2023-11-19 02:53:09 +00:00
  • ff5b1b7ded
         style: remove trailing whitespace (#38183) Raffael Meyer 2023-11-18 18:45:14 +01:00
  • a1ff7cab7e
         Merge pull request #38178 from barredterra/item-modified-timestamp Raffael Meyer 2023-11-18 18:07:11 +01:00
  • f71234e3af fix: valuation rate in report Item Prices (#38161) Patrick Eissler 2023-11-18 15:54:34 +01:00
  • 32f622ef80
         fix: valuation rate in report Item Prices (#38161) Patrick Eissler 2023-11-18 15:54:34 +01:00
  • a492e574de fix: update modified timestamp barredterra 2023-11-18 15:43:23 +01:00
  • 969616ed09 fix: update modified timestamp barredterra 2023-11-18 15:43:23 +01:00
  • 00b9c2326c fix: attributes were mandatory for manufacturers PatrickDenis-stack 2023-11-18 11:16:06 +01:00
  • ca62cde9aa
         Merge pull request #38163 from PatrickDEissler/fix/table-was-mandatory-for-manufacturer Raffael Meyer 2023-11-18 15:37:51 +01:00
  • 3d1e3a9cde fix: payment entry rounding error Devin Slauenwhite 2023-11-18 14:36:20 +00:00
  • 3172448c31 chore: Resolve conflicts Deepesh Garg 2023-11-18 19:58:10 +05:30
  • 2b9448962f fix: Suppier name was not taken when creating address from supplier Kunhi 2023-11-17 11:43:36 +04:00
  • aaccfeb918 fix: issue occured when creating supplier with contact details kunhi 2023-11-17 11:22:08 +04:00
  • 184848edf9
         Merge pull request #38147 from kunhimohamed/develop Deepesh Garg 2023-11-18 19:47:38 +05:30
  • 7d4ac7e7ff feat: Add accounting dimensions to Supplier Quotation Deepesh Garg 2023-11-17 12:37:14 +05:30
  • 65ba5b3000
         Merge pull request #38142 from deepeshgarg007/supplier_quotation_ad Deepesh Garg 2023-11-18 19:40:42 +05:30