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

Commit Graph

  • bd4c7c533c Updated Addess py file production Landry 2024-11-11 15:07:55 +00:00
  • 888c1f9bd4 Revert "Test changing contract code" master PAlexanderFranklin 2024-06-04 17:39:22 -07:00
  • 3d1ce9d85c Test changing contract code PAlexanderFranklin 2024-06-04 17:36:57 -07:00
  • 0110ad0a0f Remove reference to IDESETUP.md, add note about style to README.md PAlexanderFranklin 2024-06-03 18:45:56 -07:00
  • 9e412b4f41 Remove IDESetup file PAlexanderFranklin 2024-06-03 18:38:24 -07:00
  • 2bb22f5e72 Service Appointment Doctype Created Landry 2024-06-03 22:29:46 +00:00
  • 77cb64ce34 removed custom modules and doctypes Landry 2024-05-30 11:59:50 +00:00
  • 6fda96983b Test swtich to master Landry 2024-05-22 22:45:58 +00:00
  • 867070c6a7 Module and doctype creation Landry 2024-05-22 14:18:12 +00:00
  • 5ccb068d4a Test Doctypes and Module develop Landry 2024-05-22 12:54:08 +00:00
  • e368e66a40 Remove changes that were for testing updates PAlexanderFranklin 2024-05-16 15:06:07 -07:00
  • 16c97ff1e7 Test bench update PAlexanderFranklin 2024-05-16 14:15:12 -07:00
  • c968703f0c Yet another edit PAlexanderFranklin 2024-05-16 14:08:05 -07:00
  • 67d05e9c45 Test another edit PAlexanderFranklin 2024-05-06 10:50:13 -07:00
  • c854b7f52e Remove extension from IDESETUP PAlexanderFranklin 2024-04-08 15:38:25 -07:00
  • b29425e604 Add My Edit to projects.html PAlexanderFranklin 2024-04-03 16:05:15 -07:00
  • 1c1193215c remove apostraphe PAlexanderFranklin 2024-03-28 16:52:50 -07:00
  • f3da1b0747 change readme PAlexanderFranklin 2024-03-28 16:52:41 -07:00
  • f42b734fd7 add unfinished ide setup file PAlexanderFranklin 2024-03-11 17:32:23 -07:00
  • 74acd730e3 Add git workflow PAlexanderFranklin 2024-03-11 16:48:47 -07:00
  • 8e2f9787c1
         fix: report path from the Item and Putaway Rule list (#40190) Nihantra C. Patel 2024-03-04 19:43:33 +05:30
  • 6379238893
         perf: serial and batch bundle valuation (reposting) (#40255) rohitwaghchaure 2024-03-04 12:04:41 +05:30
  • 031b99f373
         Merge pull request #40250 from GursheenK/company-filter-in-cost-center-allocation Gursheen Kaur Anand 2024-03-03 18:13:48 +05:30
  • 51909077bd feat: add company filter to child table field Gursheen Anand 2024-03-03 18:08:23 +05:30
  • e7d707797a
         fix: rate change on changing of the qty (#40241) rohitwaghchaure 2024-03-02 16:44:07 +05:30
  • f2f5c1a0eb
         Merge pull request #40220 from ruthra-kumar/exc_gain_loss_on_journal_against_journals ruthra kumar 2024-03-02 15:36:27 +05:30
  • ceee93e0e8
         Merge pull request #40149 from ruthra-kumar/filter_on_party_while_fetching_exc_rate_on_je ruthra kumar 2024-03-02 13:51:20 +05:30
  • ed95d41a51 test: exchange rate fetch on JE with multiple forex parties ruthra kumar 2024-02-28 17:07:57 +05:30
  • eaac02655b fix: don't override reference exchange rate ruthra kumar 2024-02-28 17:07:37 +05:30
  • 72ac56b6c4
         fix: do not allow to cancel incomplete reposting (#40224) rohitwaghchaure 2024-03-02 12:59:59 +05:30
  • e017421708
         Merge pull request #38561 from blaggacao/feat/add-delivery-cutoff-date-on-so ruthra kumar 2024-03-02 12:55:00 +05:30
  • 13b05aa7fb
         fix: uom wise price in sales or purchase transaction (#40216) Nihantra C. Patel 2024-03-02 05:18:30 +05:30
  • a5232d9c10
         fix: serial no valuation rate (#40221) rohitwaghchaure 2024-03-01 22:26:54 +05:30
  • 8a5078b826 test: gain/loss on Journals against Journals ruthra kumar 2024-03-01 17:53:51 +05:30
  • 5b67631d40 fix: allow gain/loss for Journals against Journals ruthra kumar 2024-03-01 17:46:42 +05:30
  • 0aa72f841d fix: make use of 'flt' to prevent really low precision exc gain/loss ruthra kumar 2024-03-01 17:36:56 +05:30
  • b8dac84a90
         feat: add selling setting for cutoff date David Arnold 2024-03-01 12:12:07 +01:00
  • 863abc3ee5
         Merge pull request #40203 from barredterra/filter-project-department Raffael Meyer 2024-02-29 18:28:59 +01:00
  • 93c2762f7b
         Merge pull request #39701 from GursheenK/check-paid-amount-for-orders-before-request Deepesh Garg 2024-02-29 21:24:16 +05:30
  • c067ac16a7
         Merge pull request #39584 from GursheenK/provisional-accounting-reverse-amt Rushabh Mehta 2024-02-29 21:16:05 +05:30
  • 5e736f0d06 fix(Project): filter department by company barredterra 2024-02-29 16:44:46 +01:00
  • 983f71975a
         Merge pull request #40197 from ruthra-kumar/ignore_self_on_gl_account_valiation ruthra kumar 2024-02-29 19:54:32 +05:30
  • b235f48067
         Merge pull request #39936 from barredterra/label-context Raffael Meyer 2024-02-29 15:09:49 +01:00
  • 9d3614597c
         Merge pull request #40196 from ruthra-kumar/use_debit_or_credit_to_account_while_fetching_advance ruthra kumar 2024-02-29 17:51:04 +05:30
  • 3c19186654 fix: ignore self on GL account validation for Bank Account ruthra kumar 2024-02-29 17:39:29 +05:30
  • 646e9ca0dd test: advance pulling logic on Sales/Purchase Invoice ruthra kumar 2024-02-29 17:31:08 +05:30
  • 3327599c9d fix: include Debit To/Credit To account while fetching advance ruthra kumar 2024-02-29 17:18:42 +05:30
  • ac2b53bf15
         Merge pull request #40176 from GursheenK/validating-po-in-so-ux Gursheen Kaur Anand 2024-02-29 11:32:44 +05:30
  • 5c47087f20
         feat: add persian language (#40178) Raffael Meyer 2024-02-29 06:28:57 +01:00
  • 29f91a7919
         fix(setup): avoid duplicate entry for Analytics role (#40183) Rucha Mahabal 2024-02-29 10:53:30 +05:30
  • f6fdfd2c01
         Merge pull request #40174 from GursheenK/common-free-item-promotional-scheme Gursheen Kaur Anand 2024-02-29 10:18:27 +05:30
  • 24dcd64c16 fix: make warning for previously existing SO an alert Gursheen Anand 2024-02-28 18:01:27 +05:30
  • 9dcdd5b5ef
         chore: New Crowdin updates (#40052) Frappe PR Bot 2024-02-28 16:32:43 +05:30
  • fea20db262 fix: remove free item row only if pricing rule matches Gursheen Anand 2024-02-28 12:47:41 +05:30
  • 23011df86b chore(release): Bumped to Version 15.15.0 Frappe PR Bot 2024-02-28 05:13:40 +00:00
  • 4291b9fa8d
         Merge pull request #40148 from frappe/version-15-hotfix Deepesh Garg 2024-02-28 10:42:31 +05:30
  • 930df21a5f
         Merge pull request #40170 from frappe/mergify/bp/version-15-hotfix/pr-40137 Deepesh Garg 2024-02-28 08:24:15 +05:30
  • 6a63a6c98a
         fix: Supplier users not able to see RFQ on the Portal (backport #40161) (#40165) mergify[bot] 2024-02-27 22:30:26 +05:30
  • 043d9e3986
         fix: Email Template None not found (#40167) rohitwaghchaure 2024-02-27 22:30:01 +05:30
  • 7e43f6b7e0 fix: default taxable value for item not found in item list ljain112 2024-02-26 18:41:33 +05:30
  • 84a359c760
         Merge pull request #40163 from vorasmit/ic-deps-v15 Deepesh Garg 2024-02-27 22:08:45 +05:30
  • dde4d9e53c
         Merge pull request #40162 from vorasmit/ic-deps Deepesh Garg 2024-02-27 22:08:09 +05:30
  • 36a0569df2
         Merge pull request #40137 from ljain112/fix-tax-breakup Deepesh Garg 2024-02-27 22:07:39 +05:30
  • f8ba560394
         fix: Supplier users not able to see RFQ on the Portal (#40161) rohitwaghchaure 2024-02-27 21:05:19 +05:30
  • 7d14ecfcb8 fix: add flags for repost to ensure correct accounting from India Compliance App Smit Vora 2024-02-27 20:28:18 +05:30
  • 93170a56a9 fix: add flags for repost to ensure correct accounting from India Compliance App Smit Vora 2024-02-27 20:28:18 +05:30
  • 07fd93a6f6
         Merge pull request #40152 from frappe/mergify/bp/version-15-hotfix/pr-40095 Gursheen Kaur Anand 2024-02-27 17:08:37 +05:30
  • 4784117a8f
         fix: parent warehouse checks in the production plan for sub-assemblies (backport #40150) (#40157) mergify[bot] 2024-02-27 17:03:21 +05:30
  • 6f5815e44f
         fix: parent warehouse checks in the production plan for sub-assemblies (#40150) rohitwaghchaure 2024-02-27 16:46:47 +05:30
  • 7a9beb4d47
         Merge pull request #40154 from frappe/mergify/bp/version-15-hotfix/pr-40102 Gursheen Kaur Anand 2024-02-27 16:40:14 +05:30
  • 87f36ce425
         chore: fix typo Gursheen Kaur Anand 2024-02-27 16:24:14 +05:30
  • 48992cd205
         chore: resolve conflicts Gursheen Kaur Anand 2024-02-27 16:18:27 +05:30
  • 99d1f1d67b
         chore: resolve conflicts Gursheen Kaur Anand 2024-02-27 16:15:49 +05:30
  • eadea0207c
         chore: resolve conflicts Gursheen Kaur Anand 2024-02-27 16:13:49 +05:30
  • e67d579ac4 test: pr billed amount against debit note Gursheen Anand 2024-02-25 20:03:33 +05:30
  • bac2f66344 test: po billed amount against debit note Gursheen Anand 2024-02-25 19:40:28 +05:30
  • e7e8149fbe feat: update billed amount in PO and PR Gursheen Anand 2024-02-25 11:59:44 +05:30
  • 0c52eb913b
         Merge pull request #40102 from GursheenK/update_billed_amount_for_purchases Nabin Hait 2024-02-27 15:49:22 +05:30
  • 36b442a951 fix: remove config for default bank account in test Gursheen Anand 2024-02-25 13:18:30 +05:30
  • 65853da505 fix: unique gl account for plaid bank accounts Gursheen Anand 2024-02-25 13:17:41 +05:30
  • 519682bb0e
         Merge pull request #40095 from GursheenK/unique-gl-account-for-plaid-bank-accounts Gursheen Kaur Anand 2024-02-27 15:38:03 +05:30
  • 694c17487d fix: incorrect exchange rate if JE has multi parties ruthra kumar 2024-02-27 15:34:34 +05:30
  • df7afc3154
         Merge pull request #40145 from frappe/mergify/bp/version-15-hotfix/pr-40143 Gursheen Kaur Anand 2024-02-27 13:33:13 +05:30
  • 341f9030f5 fix: use frm instead of cur_frm Gursheen Anand 2024-02-27 13:05:29 +05:30
  • 6b5e1cfeb7 fix: type error for missing frm obj Gursheen Anand 2024-02-27 11:18:58 +05:30
  • 5b8b40c13b
         Merge pull request #40143 from GursheenK/hide-company-typeerror Gursheen Kaur Anand 2024-02-27 13:14:02 +05:30
  • ceeb8fc9e5 fix: use frm instead of cur_frm Gursheen Anand 2024-02-27 13:05:29 +05:30
  • b193fafe49
         Merge pull request #37477 from GursheenK/editable-journal-entries Gursheen Kaur Anand 2024-02-27 12:59:18 +05:30
  • c310da7b29
         fix: Translate 'mode of payments' in the 'point of sale'. (#39467) Sajad Alimoradi 2024-02-27 10:45:20 +03:30
  • d6b29d1cd7
         Merge pull request #39719 from niyazrazak/patch-18 Rushabh Mehta 2024-02-27 12:44:39 +05:30
  • 303433c0ae
         Merge branch 'develop' into editable-journal-entries Gursheen Kaur Anand 2024-02-27 12:43:32 +05:30
  • 20fa3da950 fix: type error for missing frm obj Gursheen Anand 2024-02-27 11:18:58 +05:30
  • 9f8a27833a
         Merge pull request #40135 from frappe/mergify/bp/version-15-hotfix/pr-40133 ruthra kumar 2024-02-27 10:33:07 +05:30
  • 1860399ccb
         fix: use serial batch fields for packed items (backport #40140) (#40142) mergify[bot] 2024-02-27 07:57:37 +05:30
  • bc9c480246
         fix: use serial batch fields for packed items (#40140) rohitwaghchaure 2024-02-26 23:57:52 +05:30
  • 57bb031602
         fix: currency symbol in landed cost voucher and material request (backport #40138) (#40141) mergify[bot] 2024-02-26 23:16:49 +05:30
  • 9d19ec43c8
         fix: Data too long for column 'serial_no' at row 1 (backport #40098) (#40139) mergify[bot] 2024-02-26 23:00:01 +05:30
  • 8aa2b7c183
         fix: currency symbol in landed cost voucher and material request (#40138) rohitwaghchaure 2024-02-26 22:48:10 +05:30
  • 0694fd19fd fix: use correct variable name on hotfix branches ruthra kumar 2024-02-26 20:35:22 +05:30
  • 08caa7cfa1
         fix: Data too long for column 'serial_no' at row 1 (#40098) rohitwaghchaure 2024-02-26 18:49:56 +05:30