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

Commit Graph

  • affca3a519 test: ignore_err filter out in General Ledger ruthra kumar 2024-02-01 15:03:02 +05:30
  • c077eda64e refactor: move ignore ERR filters from SOA to General Ledger ruthra kumar 2024-02-01 14:53:01 +05:30
  • 7f4cd3cd15 fix: correctly calculate diff amount for included taxes (#39655) Gursheen Kaur Anand 2024-02-01 10:13:29 +05:30
  • 772f540bef
         fix: correctly calculate diff amount for included taxes (#39655) Gursheen Kaur Anand 2024-02-01 10:13:29 +05:30
  • ba55d0ede7 chore: resolve conflicts barredterra 2024-01-31 13:19:19 +01:00
  • c74482a27c
         Merge pull request #39658 from frappe/mergify/bp/version-15-hotfix/pr-39643 rohitwaghchaure 2024-01-31 17:30:48 +05:30
  • 951023f434 perf: timeout for auto material request through reorder level Rohit Waghchaure 2024-01-31 11:32:17 +05:30
  • 510ab769f1
         chore: fix conflicts rohitwaghchaure 2024-01-31 15:23:14 +05:30
  • e9314325cc fix: conditionally display show btn setting Gursheen Anand 2024-01-31 13:37:01 +05:30
  • cea4ed6f88 fix(portal): show PO pay button if payments installed Gursheen Anand 2024-01-30 17:24:59 +05:30
  • 5e71d6ac4e
         Merge pull request #39643 from GursheenK/portal-po-pay-btn rohitwaghchaure 2024-01-31 14:44:25 +05:30
  • 7475233fa6
         Merge branch 'develop' into portal-po-pay-btn Gursheen Kaur Anand 2024-01-31 13:39:49 +05:30
  • 0c9572bb48 fix: conditionally display show btn setting Gursheen Anand 2024-01-31 13:37:01 +05:30
  • 29eb090528
         fix: Exchange rate on MR to PO creation for muticurrency POs (#39646) mergify[bot] 2024-01-31 12:49:48 +05:30
  • aebb0c7979
         chore: cleanup doctype descriptions (backport #39637) (#39652) mergify[bot] 2024-01-31 12:38:37 +05:30
  • 6b8f046fb4
         chore: cleanup doctype descriptions (#39637) Rucha Mahabal 2024-01-31 12:15:52 +05:30
  • 1ff473b615 fix: add ignore_permissions flag while creating a payment entry RitvikSardana 2024-01-31 11:34:20 +05:30
  • cfd1666181
         fix: Exchange rate on MR to PO creation for muticurrency POs (#39646) Deepesh Garg 2024-01-31 09:27:52 +05:30
  • dcdd3e8cc4 fix: don't overwrite existing terms in transaction barredterra 2024-01-24 01:48:10 +01:00
  • 0c6c650c08
         Merge pull request #39519 from barredterra/dont-override-tc Raffael Meyer 2024-01-31 01:12:27 +01:00
  • 31f586f716
         Merge pull request #38362 from rohitwaghchaure/feat-visual-plant-floor rohitwaghchaure 2024-01-30 22:35:42 +05:30
  • 6fea9d6dfe feat: make material request for job card from workstation dashboard Rohit Waghchaure 2023-12-05 15:28:40 +05:30
  • 212d656d85
         Merge pull request #39468 from blaggacao/feat/payment-request-failure-reason Raffael Meyer 2024-01-30 15:58:42 +01:00
  • f84f82c7d7 chore(release): Bumped to Version 15.11.0 Frappe PR Bot 2024-01-30 14:14:58 +00:00
  • 32f77eae5d
         Merge pull request #39639 from frappe/version-15-hotfix rohitwaghchaure 2024-01-30 19:42:27 +05:30
  • 9a705169fd
         fix: remove empty dn from bulk creation if date filter renders them empty David Arnold 2024-01-30 12:59:26 +01:00
  • 00a915b741
         feat: hanled payment request failure reasons David Arnold 2024-01-20 06:38:43 +01:00
  • ae7be84d87 fix(portal): show PO pay button if payments installed Gursheen Anand 2024-01-30 17:24:59 +05:30
  • f8a9554bbd
         Merge pull request #38157 from blaggacao/fix/notification-comply-with-upstream Raffael Meyer 2024-01-30 12:33:25 +01:00
  • d86186ec47
         fix: correct receiver field David Arnold 2024-01-30 12:12:15 +01:00
  • 3fd43cd6bb
         chore: remove old md files David Arnold 2024-01-30 10:54:29 +01:00
  • d785c6ce3e
         fix: perf issue while submitting stock entry (backport #39634) (#39642) mergify[bot] 2024-01-30 15:43:50 +05:30
  • 12a4f2761c
         Merge branch 'develop' into feat/add-delivery-cutoff-date-on-so mergify[bot] 2024-01-30 09:56:24 +00:00
  • e9dfb45fca
         Merge branch 'develop' into fix/notification-comply-with-upstream mergify[bot] 2024-01-30 09:49:57 +00:00
  • b14886b227
         fix: perf issue while submitting stock entry (#39634) rohitwaghchaure 2024-01-30 15:16:52 +05:30
  • 2e49423d3f
         Merge branch 'develop' into dont-override-tc Raffael Meyer 2024-01-30 10:44:16 +01:00
  • ddecbeba75 fix: test JV totals using back calculation logic Gursheen Anand 2024-01-30 12:39:40 +05:30
  • bc8ab51f9d
         Merge pull request #39633 from frappe/mergify/bp/version-15-hotfix/pr-39559 ruthra kumar 2024-01-30 11:20:25 +05:30
  • 5c9c3bee70 test: debit note account mismatch ruthra kumar 2024-01-25 14:29:07 +05:30
  • c9ea83591f test: account mismatch validation ruthra kumar 2024-01-25 14:21:18 +05:30
  • 10fcf5af5f refactor: prevent '{debit/credit}_to' account mismatch ruthra kumar 2024-01-25 14:05:42 +05:30
  • 2e5d716408
         Merge pull request #39559 from ruthra-kumar/prevent_cr_note_with_different_account_to_sales_invoice ruthra kumar 2024-01-30 11:00:44 +05:30
  • bdca718103 test: debit note account mismatch ruthra kumar 2024-01-25 14:29:07 +05:30
  • 8bdc760733 test: account mismatch validation ruthra kumar 2024-01-25 14:21:18 +05:30
  • 6f2fae1b61 refactor: prevent '{debit/credit}_to' account mismatch ruthra kumar 2024-01-25 14:05:42 +05:30
  • 91b913b5bb
         chore: regenerate pot file (#39627) Raffael Meyer 2024-01-30 04:02:55 +01:00
  • e4230cf6d9
         feat: Partly billed status in Purchase Receipt (#39543) mergify[bot] 2024-01-29 22:41:09 +05:30
  • 53c705506b
         fix: not able to save BOM (duplicate key error) (backport #39620) (#39623) mergify[bot] 2024-01-29 21:22:34 +05:30
  • 960443d268
         fix: not able to submit subcontracting pr (old flow) (backport #39622) (#39625) mergify[bot] 2024-01-29 21:22:21 +05:30
  • 5cf47ae5f9
         fix: not able to submit subcontracting pr (old flow) (#39622) rohitwaghchaure 2024-01-29 20:41:26 +05:30
  • a673220feb
         feat: Partly billed status in Purchase Receipt (#39543) Deepesh Garg 2024-01-29 19:56:46 +05:30
  • 4e182b89ce
         fix: not able to save BOM (duplicate key error) (#39620) rohitwaghchaure 2024-01-29 19:35:05 +05:30
  • 68c997aa06 feat: visual plant floor Rohit Waghchaure 2023-10-06 17:45:26 +05:30
  • f71af209c0
         Merge pull request #39618 from frappe/mergify/bp/version-15-hotfix/pr-39616 Gursheen Kaur Anand 2024-01-29 16:53:39 +05:30
  • 6b20a7eed1 fix: qtn tests using delivery date Gursheen Anand 2024-01-29 14:19:25 +05:30
  • 5cdc22adf3 fix: do not auto-populate item delivery date Gursheen Anand 2024-01-29 13:15:00 +05:30
  • 866df9f1c7
         Merge pull request #39616 from GursheenK/item-delivery-date-from-qtn Gursheen Kaur Anand 2024-01-29 15:50:23 +05:30
  • 079cd30b9c fix: qtn tests using delivery date Gursheen Anand 2024-01-29 14:19:25 +05:30
  • 9e36ab7de7
         fix amount not updated when change rate in material request (backport #39606) (#39615) mergify[bot] 2024-01-29 13:36:27 +05:30
  • 49cb11c1f3 fix: do not auto-populate item delivery date Gursheen Anand 2024-01-29 13:15:00 +05:30
  • efade9b9ae
         fix amount not updated when change rate in material request (#39606) Jeffry Suryadharma 2024-01-29 14:27:49 +07:00
  • daafe45dd4
         Merge pull request #39612 from frappe/mergify/bp/version-15-hotfix/pr-39562 Gursheen Kaur Anand 2024-01-29 11:55:58 +05:30
  • 706d1111ad
         Merge pull request #39610 from frappe/mergify/bp/version-15-hotfix/pr-39598 Gursheen Kaur Anand 2024-01-29 11:42:17 +05:30
  • da33079f12 fix: return doc obj after submit Gursheen Anand 2024-01-26 20:03:21 +05:30
  • 07bcc24e35 fix: enqueue JV submission when more than 100 accounts Gursheen Anand 2024-01-25 16:13:24 +05:30
  • 0f0a5b73f6
         Merge pull request #39566 from frappe/mergify/bp/version-15-hotfix/pr-39489 Nabin Hait 2024-01-29 11:38:33 +05:30
  • 0aa73e31ce fix: check page obj before adding menu Gursheen Anand 2024-01-27 23:30:17 +05:30
  • 2a46799188 fix: handle partial invoice against provisional entry Gursheen Anand 2024-01-29 11:34:06 +05:30
  • a3d4f63ba1 chore(release): Bumped to Version 15.10.8 Frappe PR Bot 2024-01-29 04:39:51 +00:00
  • ff166e8104
         fix: not able to save subcontracting purchase receipt (old flow) (backport #39590) (backport #39592) (#39608) mergify[bot] 2024-01-29 10:08:40 +05:30
  • 50d56db0c2
         fix: specify precision for net_amount (#39481) Dany Robert 2024-01-29 09:32:44 +05:30
  • a118417645
         refactor: provision to filter on dimensions in reconciliation tool (#39054) mergify[bot] 2024-01-28 13:50:08 +05:30
  • a83f3106f3
         feat: New financial views - Growth and margin views for P&L and balance sheet (#39588) mergify[bot] 2024-01-28 13:48:55 +05:30
  • 16404110a8
         Merge pull request #39588 from CitrusLeafSoft/New-Financial-report-views Deepesh Garg 2024-01-28 11:36:55 +05:30
  • 6a63a8997d
         Merge branch 'develop' into fix/notification-comply-with-upstream mergify[bot] 2024-01-28 05:42:37 +00:00
  • 88ff945e40
         Merge pull request #39562 from GursheenK/JV-timeout-issue Deepesh Garg 2024-01-28 10:30:25 +05:30
  • 8f6c23cb53
         Merge pull request #39598 from GursheenK/type-error-dashboard-report Deepesh Garg 2024-01-28 09:55:49 +05:30
  • 4c197c8dbd
         Merge branch 'develop' into copy-emails-to-customer mergify[bot] 2024-01-28 04:23:49 +00:00
  • f2891229ab
         Merge pull request #38643 from barredterra/quotation-to-customer Deepesh Garg 2024-01-28 09:53:15 +05:30
  • 2486b646a1 fix: check page obj before adding menu Gursheen Anand 2024-01-27 23:30:17 +05:30
  • 6d4ca6a1ee
         fix: prevent extra transfer against inter transfer transaction (backport #39213) (#39596) mergify[bot] 2024-01-27 23:25:13 +05:30
  • 8fdc244e16
         fix: prevent extra transfer against inter transfer transaction (#39213) rohitwaghchaure 2024-01-27 21:37:58 +05:30
  • ebec463166
         Merge pull request #39594 from frappe/mergify/bp/version-15-hotfix/pr-39591 ruthra kumar 2024-01-27 13:19:27 +05:30
  • 10488520e7 test: future payment with foreign currency ruthra kumar 2024-01-27 11:14:29 +05:30
  • 9e15a3c981 refactor: do currency conversion on future amount columns ruthra kumar 2024-01-27 09:55:26 +05:30
  • 5be868c7f6
         Merge pull request #39591 from ruthra-kumar/conversion_on_future_payments ruthra kumar 2024-01-27 12:52:18 +05:30
  • 63eef680d0
         fix: not able to save subcontracting purchase receipt (old flow) (backport #39590) (#39592) mergify[bot] 2024-01-27 12:15:11 +05:30
  • 67d828dab3
         fix: not able to save subcontracting purchase receipt (old flow) (#39590) rohitwaghchaure 2024-01-27 12:00:06 +05:30
  • 7def475eb1
         fix: incorrect active serial nos (backport #39389) (#39589) mergify[bot] 2024-01-27 11:57:58 +05:30
  • 7b37389115 test: future payment with foreign currency ruthra kumar 2024-01-27 11:14:29 +05:30
  • 0de4197c88 refactor: do currency conversion on future amount columns ruthra kumar 2024-01-27 09:55:26 +05:30
  • 92649de5c6 Adding growth and margin views for P&L and balance sheet financial reports in collaboration with Sapcon Instruments Pvt Ltd nitmit 2024-01-27 10:18:35 +05:30
  • 0e2f57ba89 chore(release): Bumped to Version 15.10.7 Frappe PR Bot 2024-01-27 04:43:59 +00:00
  • 30bdba4801
         fix: incorrect amount in the material request item (backport #39567) (backport #39569) (#39587) mergify[bot] 2024-01-27 10:12:45 +05:30
  • ed06f0cd1b
         refactor: BOM creator item selector with short description (backport #39433) (#39435) mergify[bot] 2024-01-27 09:51:14 +05:30
  • 9abc07e34b
         Merge pull request #39585 from frappe/mergify/bp/version-15-hotfix/pr-39532 Gursheen Kaur Anand 2024-01-26 23:46:57 +05:30
  • a7d13686c7 fix: type error on company doc Gursheen Anand 2024-01-24 12:46:15 +05:30
  • 3e59c66806 fix: provisional reverse entry amount Gursheen Anand 2024-01-26 21:46:19 +05:30
  • fc677811b7 fix: return doc obj after submit Gursheen Anand 2024-01-26 20:03:21 +05:30
  • 19ff10dfeb
         Merge branch 'develop' into quotation-to-customer mergify[bot] 2024-01-26 13:56:08 +00:00