nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-22 18:59:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,190 Commits 605 Branches 1,802 Tags
65202d2be17b70321f6620c46792ebdbfcc7a3ce
Commit Graph

207 Commits

Author SHA1 Message Date
mergify[bot]
ead7744f81 refactor: add category field to uom (backport #54290) (#54325) 
* refactor: add category field to uom (#54290)

(cherry picked from commit e04a2e6da2)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-04-16 10:16:28 +00:00
ruthra kumar
400d6b5b62 refactor(test): flaky tax rule testsuite 
- Make Sales Stage preset
 2026-03-19 12:57:10 +05:30
ruthra kumar
fbd2a181bd refactor(test): make all presets in setupclass 2026-03-19 12:57:10 +05:30
Raffael Meyer
9a989a84fb fix: use dummy translations for custom field labels (#49875) 2025-11-15 19:34:13 +01:00
Mihir Kandoi
f2b948a483 feat: subcontracting inward (#47728) 
* feat: subcontracting inward

* feat: stock reservation

* feat: subcontracting delivery

* feat: all remaining stuff

* fix: linter errors

* fix: patch

* fix: modify stock entry type validation

* fix: customer provided item cost field mandatory validation

* fix: failing tests

* fix: failing tests

* fix: subcontracting controlller

* refactor: semi final

* refactor: final

* chore: resolve conflicts

* refactor: changes requested

* fix: reservation transfer of extra qty

* fix: consider add cost for customer provided rate field

* test: create test data

* test: subcontracted sales order (partial)

* test: fin

* fix: do not add self RM in DN created from SI

* fix: failing test case

* fix: conflicting function name

* refactor: final changes

* fix: more bugs

* perf: various and major performance improvements

* fix: consider warehouse as well in all queries

* fix: same item code with diff warehouse in manufacture entry

* refactor: readability

* fix: frontend validations

* perf: replace query inside loop with single query

* fix: set additional item flag to true when extra customer provided item is received

* fix: bugs found by coderabbit

* fix: more coderabbit bugs

* fix: add validation to disallow cancellation of manufacturing entry

* perf: use cached values wherever it makes sense

* test: fix redundant insert to child tables

* fix: consider SI return of billed self RM

* fix: bug found by coderabbit

---------

Co-authored-by: Mihir Kandoi <mihirkandoi@Mihirs-MacBook-Air.local>
 2025-10-14 15:00:49 +05:30
diptanilsaha
efeda90cad fix: renamed temporary bank account to 'Demo Bank Account' 2025-09-06 02:38:53 +05:30
diptanilsaha
47d4319f83 fix: skip 'Bank Account' creation on setup 2025-09-06 02:03:03 +05:30
rohitwaghchaure
3f354b78dc Merge pull request #49228 from rohitwaghchaure/fixed-set-default-company 
fix: company issue in setup wizard
 2025-08-19 16:21:22 +05:30
Rohit Waghchaure
1fb0d1460a fix: company issue in setup wizard 2025-08-19 16:02:54 +05:30
Rohit Waghchaure
7cd0db219a refactor: workstation operating component 2025-08-19 13:29:32 +05:30
Rohit Waghchaure
666bf65f48 fix: permission issue while completing setup wizard 2025-06-16 13:59:12 +05:30
Sagar Vora
3ebde4526a feat!: configure which rate is used to auto-update price list 2025-05-06 13:01:13 +05:30
ruthra kumar
37d74e387d fix: broken test suite due to incorrect OR filter 2025-05-03 11:13:32 +05:30
Diptanil Saha
7423e4187f fix: remove invalid email account creation (#47318) 2025-04-29 12:13:12 +05:30
Sanket322
9368485594 fix: ignore duplicate while creating default templates 2024-12-25 15:22:53 +05:30
Corentin Forler
a245cc6b07 fix(setup): Fix typo in COA setup 2024-11-19 17:18:25 +05:30
HENRY Florian
8383883977 fix: when company is created with other company template Chart of Account the Create Taxe Template failed (#42755) 
fix: when company if create with other company template Created Template Taxe failed
 2024-11-11 10:16:17 +05:30
David
96a6673510 feat(analytics): comply erpnext with utm methodology 2024-09-12 04:47:51 +02:00
rohitwaghchaure
663a08e4cd feat: Disassembly Order (#42655) 2024-08-27 22:25:20 +05:30
Raffael Meyer
f6371f4a0d Merge branch 'develop' into pseudo-translate-in-setup-wizard 2024-08-22 16:01:17 +02:00
rohitwaghchaure
9c82c2b5d3 fix: custom stock entry type issue (#42835) 2024-08-21 12:11:22 +05:30
barredterra
48513b1087 refactor: remove useless line 2024-08-17 02:01:35 +02:00
barredterra
505cd95150 fix: remove pseudo-translation for UOM Category variable 
Has no effect and even if it had, it's not really needed.
 2024-08-17 02:00:34 +02:00
barredterra
c08cd938bc fix: add pseudo-translation for Project Type 2024-08-17 01:58:48 +02:00
barredterra
11f6e570a5 fix: add pseudo-translation for Stock Entry Type 2024-08-17 01:58:27 +02:00
barredterra
77e5787036 fix: use pseudo-translation while creating fixtures 2024-08-17 01:57:44 +02:00
Smit Vora
cf55c2ab3d fix: ignore duplicates while creating default templates 2024-07-18 10:07:02 +05:30
Akhil Narang
3effaf21ef refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-03-27 16:06:04 +05:30
barredterra
4d4d88ec5f fix: use untranslated UOM as default 2024-03-25 23:19:27 +01:00
barredterra
8fa5707911 refactor: create UOMs during setup 2024-03-25 23:18:36 +01:00
Ankush Menat
9611e9bd7f fix: ignore non-existing regional customizations (#38621) 2023-12-07 14:12:40 +00:00
Sabu Siyad
f900a78995 refactor!: drop ecommerce in favor of webshop (#33265) 
* refactor!: remove ecommerce item group field check

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `e_commerce` directory

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `get_context` from `item_group`

https://frappeframework.com/docs/v14/user/en/guides/portal-development/context

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove related `./templates`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(navbar): remove wishlist (ecommerce)

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(js): remove js from scripts

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `www/all-products`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove pages and js

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove js/customer_reviews

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(portal utils): remove shopping cart debtor account

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove e_commerce events from hooks

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(web): remove e_commerce js from bundle

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(setup): remove shopping cart setup

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove pages

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(item): remove website item button

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(payment request): remove `on_payment_authorized`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: @staticmethod `get_gateway_details`

to avoid monkey patching, in custom apps
https://discuss.erpnext.com/t/how-to-override-method-in-frappe/28786/36

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(pages): remove product page

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(homepage): do not setup website items

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(workspace): remove link to ecommerce settings

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(www): remove shop-by-category

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(homepage): remove featured product

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: remove products in homepage

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(homepage): remove explore button

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: remove products fields from homepage

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* Revert "refactor!: @staticmethod `get_gateway_details`"

This reverts commit 561bcd96680a930bb92627869502d9346b10611b.

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove payment gateway e_commerce import

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* chore: pre-commit

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: pass `party` into `get_price`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: move `get_item_codes_by_attributes` to `utilities/product`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(quotation): input customer group

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* chore: pre-commit

* refactor: remove custom `navbar_items.html`

* refactor!(item): remove `published_in_website`

* refactor: move `validate_duplicate_website_item` before rename

* test: remove `test_shopping_cart_without_website_item`

* chore: add doctype drop patch

* refactor: removed website item related code

* refactor: removed shopping_cart code

* refactor: removed e-commerce related patches

* refactor: removed website related fields from item group

* fix: patch create_asset_depreciation_schedules_from_assets, KeyError: '0K BU64 AUY'

---------

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2023-10-17 17:05:44 +05:30
Deepesh Garg
c850f46c0a chore: Update records 2023-07-30 11:53:09 +05:30
Deepesh Garg
3698af834b Merge branch 'develop' of https://github.com/frappe/erpnext into demo_data_on_install 2023-07-29 17:12:06 +05:30
Deepesh Garg
6270607c6d fix: Remove current fiscal year from Global Defaults (#35960) 
* fix: Remove current fiscal year from Global Defaults

* fix: Remove button to set default

* fix: Add utils to get fiscal year

* fix: Incorrect import

* feat: Add hook for naming series parser
 2023-07-16 12:58:42 +05:30
Deepesh Garg
d5bdd9387a chore: Do not update shopping cart settings on install 2023-06-26 18:35:01 +05:30
Deepesh Garg
86744b6fbb chore: Add more invoices 2023-06-19 09:44:57 +05:30
Rohit Waghchaure
648efca940 feat: auto create serial and batch bundle 2023-06-02 17:14:16 +05:30
Raffael Meyer
770369e5c1 feat: translate fixtures during runtime, not installation (#33996) 
feat: install untranslated fixtures from files

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-14 09:29:27 +05:30
Raffael Meyer
201573ab9a refactor: install fixtures (#33964) 
* refactor: install fixtures

* style: disable semgrep for install_defaults signature
 2023-02-11 12:15:42 +05:30
Deepesh Garg
0efdc6c13a fix: Ignore mandatory fields while creating tax templates for new companies (#34005) 2023-02-11 12:03:48 +05:30
Deepesh Garg
3598bcc9a8 chore: ERPNext setup wizard cleanup (#33675) 
* chore: ERPNext setup wizard cleanup

* chore: Remove default website

* chore: Remove flaky tests

* chore: remove unwanted tests
 2023-01-27 14:40:39 +05:30
Rucha Mahabal
108cce2785 refactor: rewrite raw sql queries with frappe.qb and database API 2022-07-07 19:00:19 +05:30
Rucha Mahabal
64075cbebc Merge branch 'develop' into hr-separation 2022-07-07 17:36:01 +05:30
Ankush Menat
bc3f99321a refactor: department creation (#31548) 
- all department creation always fails after first company, this is
handled in exception handling code but better to not attempt this in
first place.
- move department creation to company.py this has nothing to do with
  setup and previous function signature made no sense.
 2022-07-07 16:05:18 +05:30
Rucha Mahabal
694d35e1c4 fix: Add Designation fixtures 2022-07-04 16:17:26 +05:30
Rucha Mahabal
9f7511d6bf fix: Remove HR & Payroll Settings from Company master 
- moved setup to HRMS app
 2022-06-30 18:12:12 +05:30
Rucha Mahabal
6bee20c5e3 chore: Add Fleet Management masters in Setup module for Delivery Trip 
- Driver, Vehicle, Driving License Category (child table)

- Removed Email Account setup for Job Applicant from setup wizard
 2022-06-28 13:29:35 +05:30
Rucha Mahabal
fbc1330ab0 chore: Remove HR/Payroll related setups and fixtures 
- Fixtures moved to HRMS app

- 'HR' field in Terms and Conditions removed, added via HRMS setup
 2022-06-17 16:34:13 +05:30
Deepesh Garg
2e3e666784 Merge branch 'develop' of https://github.com/frappe/erpnext into erpnext_setup_cleanup 2022-05-03 18:17:36 +05:30