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

Commit Graph

  • 4173203382
         Merge pull request #39578 from deepeshgarg007/fix_ci Deepesh Garg 2024-01-26 19:25:22 +05:30
  • dbd4dae3d9 test: Internal transfer using purchase receipt Deepesh Garg 2024-01-26 18:42:29 +05:30
  • 99b839d2b6 chore: failing ci tests Deepesh Garg 2024-01-26 10:46:44 +05:30
  • ab99414242
         Merge pull request #39577 from frappe/mergify/bp/version-15-hotfix/pr-39511 Deepesh Garg 2024-01-26 10:04:23 +05:30
  • fa8fb7a49e
         Merge pull request #39575 from frappe/mergify/bp/version-15-hotfix/pr-39108 Deepesh Garg 2024-01-26 09:46:01 +05:30
  • 4fc3a264f9 refactor(Sales Invoice): set account for mode of payment barredterra 2024-01-23 13:11:06 +01:00
  • 30cc65d2b7
         Merge pull request #39511 from barredterra/set-account-for-mode-of-payments Deepesh Garg 2024-01-26 09:44:11 +05:30
  • 722ee53fb1 Merge branch 'develop' of https://github.com/frappe/erpnext into copy-emails-to-customer Deepesh Garg 2024-01-26 09:39:13 +05:30
  • 6173b34b10 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation-to-customer Deepesh Garg 2024-01-26 09:35:38 +05:30
  • 5df2f5d523 feat: In words in payment entry Deepesh Garg 2024-01-03 13:34:22 +05:30
  • f7a3af7473
         Merge pull request #39532 from GursheenK/type-error-in-transaction-js Deepesh Garg 2024-01-26 09:30:53 +05:30
  • d491036f2d
         Merge pull request #39108 from deepeshgarg007/in_words_pe Deepesh Garg 2024-01-26 09:30:26 +05:30
  • d2057588dd Merge branch 'develop' of https://github.com/frappe/erpnext into type-error-in-transaction-js Deepesh Garg 2024-01-26 09:29:05 +05:30
  • e0c35d60b4
         fix: incorrect amount in the material request item (backport #39567) (#39569) mergify[bot] 2024-01-25 17:22:31 +05:30
  • 2bdfdeeb9a
         fix: incorrect amount in the material request item (#39567) rohitwaghchaure 2024-01-25 16:49:12 +05:30
  • 14aa9d3d0f
         Merge pull request #39564 from frappe/mergify/bp/version-15-hotfix/pr-39557 Gursheen Kaur Anand 2024-01-25 16:39:39 +05:30
  • 3bdd1e9514 fix: fetch correct quantity and amount for grouped asset Nabin Hait 2024-01-22 16:58:31 +05:30
  • 171586db9b fix: make SO item code reqd Gursheen Anand 2024-01-25 14:26:01 +05:30
  • be074a2972
         Merge pull request #39489 from nabinhait/grouped-asset-value Nabin Hait 2024-01-25 16:20:35 +05:30
  • 2b3cc5ba2d
         Merge pull request #39557 from GursheenK/validate-item-code-with-prevdoc Gursheen Kaur Anand 2024-01-25 16:19:23 +05:30
  • 06f48c678b fix: fetch correct quantity and amount for grouped asset Nabin Hait 2024-01-22 16:58:31 +05:30
  • 53b44ccf29 fix: enqueue JV submission when more than 100 accounts Gursheen Anand 2024-01-25 16:13:24 +05:30
  • 69db569ca5
         Merge pull request #39446 from GursheenK/payment-reco-company-field Deepesh Garg 2024-01-25 15:06:10 +05:30
  • 7f8303a493 fix: make SO item code reqd Gursheen Anand 2024-01-25 14:26:01 +05:30
  • dfda5ad673
         ci: Add fake passing tests when CI is skipped (#39555) Ankush Menat 2024-01-25 14:18:27 +05:30
  • 1e89c1c875
         Merge pull request #39535 from ruthra-kumar/rename_advance_doctype_variable_hook ruthra kumar 2024-01-25 13:25:56 +05:30
  • c3557a87ef
         Merge pull request #39552 from frappe/mergify/bp/version-15-hotfix/pr-38218 ruthra kumar 2024-01-25 13:25:15 +05:30
  • 4853ab1fec
         fix: default enable closing stock balance (backport #39551) (#39554) mergify[bot] 2024-01-25 12:51:55 +05:30
  • d1fb90edff
         fix: default enable closing stock balance (#39551) rohitwaghchaure 2024-01-25 12:42:16 +05:30
  • ed032b3224 chore: avoid explicit escaping for precision Dany Robert 2023-12-09 09:30:17 +05:30
  • 8b7900e6a7 chore: change f-string to sql params Dany Robert 2023-11-21 12:46:56 +00:00
  • e0a38207f6 fix: honour currency precision while fetching balance Dany Robert 2023-11-20 09:43:02 +00:00
  • 4f215f1b70
         Merge pull request #38218 from rtdany10/account-balance-mismatch ruthra kumar 2024-01-25 12:28:36 +05:30
  • 53b844f173 chore(release): Bumped to Version 15.10.6 Frappe PR Bot 2024-01-25 06:48:53 +00:00
  • 34e581715a
         Merge pull request #39550 from frappe/mergify/bp/version-15/pr-39549 rohitwaghchaure 2024-01-25 12:17:43 +05:30
  • 83c120849f fix: Item Tax template is not working for e-commerce Rohit Waghchaure 2024-01-24 23:45:06 +05:30
  • e08c7bad63
         Merge pull request #39549 from frappe/mergify/bp/version-15-hotfix/pr-39547 rohitwaghchaure 2024-01-25 11:53:30 +05:30
  • 3f383d81bd
         Merge branch 'develop' into payment-reco-company-field Gursheen Kaur Anand 2024-01-25 11:44:53 +05:30
  • 2905db19e5 fix: Item Tax template is not working for e-commerce Rohit Waghchaure 2024-01-24 23:45:06 +05:30
  • c0a1188067
         Merge pull request #39547 from rohitwaghchaure/fixed-item-tax-template-not-working-for-e-commerce rohitwaghchaure 2024-01-25 11:36:48 +05:30
  • ca02dfa652
         Merge pull request #39498 from nabinhait/asset-cancellation-fix Nabin Hait 2024-01-25 11:36:19 +05:30
  • 7d3240ae3a fix: Item Tax template is not working for e-commerce Rohit Waghchaure 2024-01-24 23:45:06 +05:30
  • 93681cfa24 Merge branch 'develop' into pr/38218 ruthra kumar 2024-01-25 09:58:54 +05:30
  • bd7e8ed230
         Merge pull request #39538 from frappe/mergify/bp/version-15-hotfix/pr-39331 ruthra kumar 2024-01-24 16:27:29 +05:30
  • b2e0d24954 fix: Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template Florian HENRY 2024-01-11 16:00:48 +01:00
  • 4f1e729b7c
         Merge pull request #39331 from FHenry/dev_fix_payment_terms_status_for_sales_order_report ruthra kumar 2024-01-24 16:11:52 +05:30
  • 735576ab27
         Merge branch 'develop' into dev_fix_payment_terms_status_for_sales_order_report ruthra kumar 2024-01-24 15:45:46 +05:30
  • 23199a3271
         Merge pull request #39389 from rohitwaghchaure/fixed-incorrect-active-serial-nos rohitwaghchaure 2024-01-24 15:36:31 +05:30
  • 64cb1153de fix: incorrect active serial nos Rohit Waghchaure 2024-01-15 19:39:41 +05:30
  • 84a94cec6b
         Merge pull request #39531 from frappe/mergify/bp/version-15-hotfix/pr-39525 rohitwaghchaure 2024-01-24 14:49:28 +05:30
  • 9fcd89d456 refactor: use generic name for advance doctypes variable ruthra kumar 2024-01-24 13:27:31 +05:30
  • cc195777f4 chore(release): Bumped to Version 15.10.5 Frappe PR Bot 2024-01-24 07:59:52 +00:00
  • 60c10f4457
         Merge pull request #39534 from frappe/mergify/bp/version-15/pr-39529 ruthra kumar 2024-01-24 13:28:34 +05:30
  • 871dc6b0da
         Merge pull request #39533 from frappe/mergify/bp/version-15-hotfix/pr-39529 ruthra kumar 2024-01-24 13:28:22 +05:30
  • 3549cd39f1 fix: AttributeError in company transaction deletion ruthra kumar 2024-01-24 11:42:37 +05:30
  • 222005ca44 fix: AttributeError in company transaction deletion ruthra kumar 2024-01-24 11:42:37 +05:30
  • 4a4c4ba21b
         Merge pull request #39529 from ruthra-kumar/typeerror_on_company_transaction_deletion ruthra kumar 2024-01-24 13:09:49 +05:30
  • 030d35628d fix: type error on company doc Gursheen Anand 2024-01-24 12:46:15 +05:30
  • 98c56535d8 fix: email list for auto reorder material request Rohit Waghchaure 2024-01-24 11:45:15 +05:30
  • a552df8a9f
         Merge pull request #39525 from rohitwaghchaure/fixed-auto-mr-email-with-user-permissions-issue rohitwaghchaure 2024-01-24 12:35:35 +05:30
  • b127aa308e fix: AttributeError in company transaction deletion ruthra kumar 2024-01-24 11:42:37 +05:30
  • f6a779e1aa
         Merge pull request #39527 from frappe/mergify/bp/version-15-hotfix/pr-39521 rohitwaghchaure 2024-01-24 12:17:05 +05:30
  • 1f5dbebe68 fix: not able to edit address through portal Rohit Waghchaure 2024-01-24 10:29:55 +05:30
  • 02028becb3
         Merge pull request #39521 from rohitwaghchaure/fixed-not-able-to-edit-adddress rohitwaghchaure 2024-01-24 11:50:02 +05:30
  • 764f3422a0 fix: email list for auto reorder material request Rohit Waghchaure 2024-01-24 11:45:15 +05:30
  • 4073dfb90b
         Merge pull request #39522 from frappe/mergify/bp/version-15-hotfix/pr-39493 Gursheen Kaur Anand 2024-01-24 11:08:53 +05:30
  • e2d85c513c fix: skip liability account for internal transfer Gursheen Anand 2024-01-22 21:13:32 +05:30
  • 236c7e1e95
         Merge pull request #39493 from GursheenK/skip-liability-acc-for-internal-transfers Deepesh Garg 2024-01-24 10:34:19 +05:30
  • 9f1ddeb4e4
         Merge pull request #39520 from barredterra/fix-typos Deepesh Garg 2024-01-24 10:33:27 +05:30
  • b046d980ad fix: not able to edit address through portal Rohit Waghchaure 2024-01-24 10:29:55 +05:30
  • 880f648846
         Merge pull request #39513 from frappe/mergify/bp/version-15-hotfix/pr-39503 rohitwaghchaure 2024-01-24 10:27:23 +05:30
  • 806696a003 fix: typos barredterra 2024-01-24 02:59:52 +01:00
  • 77b044f1a6 fix: don't overwrite existing terms in transaction barredterra 2024-01-24 01:48:10 +01:00
  • 84d2a80f30
         Merge pull request #39516 from frappe/mergify/bp/version-15-hotfix/pr-39512 Raffael Meyer 2024-01-23 19:00:53 +01:00
  • fe41e2a341 refactor(Batch): use const instead of var barredterra 2024-01-23 15:02:42 +01:00
  • a97b8fd876 fix(Batch): reload doc after splitting barredterra 2024-01-23 14:57:23 +01:00
  • 6ed42e939b refactor: split batch barredterra 2024-01-23 14:23:32 +01:00
  • 7a6a789199
         Merge pull request #39512 from barredterra/refactor-split-batch Raffael Meyer 2024-01-23 17:54:28 +01:00
  • 252fae68df
         feat: use new bulk creation arguments and contrue a cut-off date selector for dn-from-so David Arnold 2024-01-23 17:46:12 +01:00
  • e5a5b6afc8
         feat: add better preselection (cut-off: tomorrow) to dn-from-so creation dialogue David Arnold 2024-01-23 17:45:40 +01:00
  • ffd38362d5
         feat: add an argument pass mechanism to bulk transactions David Arnold 2024-01-23 17:42:56 +01:00
  • 7a7a213285 refactor(Batch): use const instead of var barredterra 2024-01-23 15:02:42 +01:00
  • 34ec2f8a2b fix(Batch): reload doc after splitting barredterra 2024-01-23 14:57:23 +01:00
  • f9d1995954 fix: Serial No Ledger permission issue Rohit Waghchaure 2024-01-23 13:27:37 +05:30
  • 4832175341
         Merge pull request #39503 from rohitwaghchaure/fixed-serial-no-ledger-permission rohitwaghchaure 2024-01-23 19:06:40 +05:30
  • 3c7e7a76f0 refactor: split batch barredterra 2024-01-23 14:23:32 +01:00
  • 3815f07c33 refactor(Sales Invoice): set account for mode of payment barredterra 2024-01-23 13:11:06 +01:00
  • 028ae5b34f chore(release): Bumped to Version 15.10.4 Frappe PR Bot 2024-01-23 11:59:22 +00:00
  • ebaa5d3add
         Merge pull request #39054 from ruthra-kumar/provision_to_set_dimension_in_reconciliation_tool ruthra kumar 2024-01-23 17:28:21 +05:30
  • 2a7f7df3e5
         Merge pull request #39505 from frappe/version-15-hotfix ruthra kumar 2024-01-23 17:28:01 +05:30
  • 0d7dd93284
         Merge pull request #38560 from blaggacao/feat/so-po-advance-payment-status ruthra kumar 2024-01-23 16:39:22 +05:30
  • 9b4e757b0b test: advance payment status for Purchase Order ruthra kumar 2024-01-23 15:51:09 +05:30
  • 8de03ef836 test: advance payment status for Sales Order ruthra kumar 2024-01-23 15:50:52 +05:30
  • bd6a4ca1d7
         fix: move value initialization to ensure it is commited David Arnold 2024-01-22 22:54:36 +01:00
  • 7d8aa469d7
         fix: align with 'Partly/Fully X' nomenclature in so & po David Arnold 2024-01-22 22:46:03 +01:00
  • b1aef01a1f
         fix: always update the advance payment status David Arnold 2024-01-22 22:15:49 +01:00
  • c88ce55242
         fix: advance payment doctypes to keep input/output distinction David Arnold 2024-01-22 22:04:30 +01:00
  • 1a670ff266 fix: Serial No Ledger permission issue Rohit Waghchaure 2024-01-23 13:27:37 +05:30
  • 1331fb75a3
         Merge pull request #39496 from frappe/mergify/bp/version-15-hotfix/pr-39478 rohitwaghchaure 2024-01-23 13:18:16 +05:30
  • 1a686cb66d fix: Use db_set to set a value in on_cancel Nabin Hait 2024-01-23 12:46:15 +05:30