schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,284 Commits 322 Branches 1,581 Tags
a35ce12d6000152feef4e87a15046d63a7b85d7e
Commit Graph

914 Commits

Author SHA1 Message Date
Shariq Ansari
a35ce12d60 fix: added app permission check for apps page 
(cherry picked from commit e8f8fb8a8f)
 2024-08-30 12:06:10 +00:00
Shariq Ansari
4297895bd9 chore: renamed include_as_app to include_in_apps_screen 
(cherry picked from commit 5280132423)
 2024-08-22 06:57:25 +00:00
Shariq Ansari
7428df8778 fix: include erpnext in apps page 
(cherry picked from commit 1d52ef7afe)
 2024-08-22 06:57:25 +00:00
ruthra kumar
7b3a78e04e refactor: hooks for monthly re-evaluation jobs 
(cherry picked from commit fc4e5f165c)
 2024-07-24 13:15:18 +00:00
Nihantra C. Patel
5317418a53 fix: path of automatically updates the status of asset maintenance log 
(cherry picked from commit 909aa8f359)
 2024-07-03 10:55:50 +00:00
Khushi Rawat
317cc0358c fix: add auto-update for overdue status (#42105) 
* fix: auto-update for overdue status

* chore: use qb.update

(cherry picked from commit c5e474f4f5)
 2024-07-01 11:27:02 +00:00
ruthra kumar
4dbeabc8ef refactor: add payment request to dimension list 
(cherry picked from commit e93b4a1f2c)
 2024-04-13 04:52:23 +00:00
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
ruthra kumar
9834e3ab7f chore: schedule job to run daily 
(cherry picked from commit f96cf111ed)
 2024-04-09 12:25:55 +00:00
Smit Vora
4ef4466e67 feat: new hook fields_for_group_similar_items to group additional fields for print formats (#40831) 
(cherry picked from commit f7c9e1538b)
 2024-04-08 10:18:24 +00:00
ruthra kumar
b31e43e3db refactor: barebones hook on all doctypes with 'company' field 
(cherry picked from commit ec194ef076)
 2024-03-20 14:13:16 +00:00
Deepesh Garg
313350534f fix: Remove custom queries for customer 
(cherry picked from commit 60ba25caf2)
 2024-03-16 14:34:36 +00:00
mergify[bot]
a118417645 refactor: provision to filter on dimensions in reconciliation tool (#39054) 
* refactor: dimensions section in allocation table in reconciliation

(cherry picked from commit 1cde804c77)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

* refactor: update dimension doctypes in hooks

(cherry picked from commit cfb3d87267)

* refactor: dimensions filter section in payment reconciliation

(cherry picked from commit 20e0acc20a)

* refactor: column break in dimension section

(cherry picked from commit 20576e0f47)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

* refactor: handle dimension filters

(cherry picked from commit c1fe4bcc64)

* refactor: pass dimension filters to query

(cherry picked from commit ff60ec85b8)

* refactor: set query filters for dimensions

(cherry picked from commit ad8475cb8b)

* refactor: pass dimension details to query

(cherry picked from commit 5dc22e1811)

* refactor: replace sql with query builder for Jourals query

(cherry picked from commit 9c5a79209e)

* refactor: partial change on outstanding invoice popup

(cherry picked from commit 2154502955)

* fix: typo's and parameter changes

(cherry picked from commit 0ec17590ae)

* refactor: Credit Note and its Exc gain/loss JE inherits dimensions

(cherry picked from commit ab939cc6e8)

* refactor: apply dimension filters on cr/dr notes

(cherry picked from commit 188ff8cde7)

* chore: test dimension filter output

(cherry picked from commit e3c44231ab)

* test: dimension inheritance for cr note reconciliation

(cherry picked from commit ba5a7c8cd8)

* refactor: pass dimension values to Gain/Loss journal

(cherry picked from commit c44eb432a5)

# Conflicts:
#	erpnext/accounts/utils.py

* test: dimension inheritance in PE reconciliation

(cherry picked from commit 6148fb024b)

* refactor: pass dimensions on advance allocation

(cherry picked from commit cbd443a78a)

* test: dimension inheritance on adv allocation

(cherry picked from commit fcf4687c52)

* refactor: dynamic dimension filters in pop up

(cherry picked from commit f8bbb0619c)

* refactor: update dimensions, only if provided

(cherry picked from commit ec0f17ca8b)

* refactor: handle dynamic dimension in order query

(cherry picked from commit 7c2cb70387)

* chore: resolve conflicts

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2024-01-28 13:50:08 +05:30
ruthra kumar
00d36d14fb refactor: allow sales invoice in Bank Reconciliation tool 
(cherry picked from commit b69cdeb4a6)
 2024-01-08 05:02:30 +00:00
mergify[bot]
d8cf994e94 fix: enqueue demo data setup on setup complete (backport #39043) (#39044) 
fix: enqueue demo data setup on setup complete (#39043)

(cherry picked from commit 877cc7255d)

Co-authored-by: Smit Vora <smitvora203@gmail.com>
 2023-12-31 18:25:15 +05:30
mergify[bot]
c7dbcbcd17 feat: add employee number to client user bootinfo (backport #38477) (#38603) 
feat: add employee number to client user bootinfo (#38477)

(cherry picked from commit 525f656cc1)

Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
 2023-12-06 20:52:50 +05:30
mergify[bot]
5e6a4d257e feat: enable automatic type annotations (backport #38452) (#38454) 
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-11-30 14:43:16 +05:30
mergify[bot]
7f4d2b707a refactor: Simpler log settings setup (backport #38449) (#38451) 
refactor: Simpler log settings setup (#38449)

Depends on https://github.com/frappe/frappe/pull/23507

(cherry picked from commit 1da9087cc4)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-11-30 13:30:15 +05:30
Sagar Vora
721b429d93 fix: make parameters of create_subscription_process optional (and other minor fixes) (#38360) 
(cherry picked from commit 5a53a4b044)
 2023-11-27 14:53:39 +00:00
ruthra kumar
afaf6afd27 refactor: update scheduled job for bulk transaction 
(cherry picked from commit fb06ad7330)
 2023-11-20 08:51:31 +00:00
Deepesh Garg
7d4ac7e7ff feat: Add accounting dimensions to Supplier Quotation 
(cherry picked from commit 089da459f7)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
 2023-11-18 14:11:38 +00:00
Deepesh Garg
88be7ada33 Merge branch 'develop' of https://github.com/frappe/erpnext into sales_order_item_dimensions 2023-10-17 18:30:49 +05:30
Deepesh Garg
e31db18912 chore: Add accounting dimensions to Sales Order Item table 2023-10-17 18:19:47 +05:30
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
e19e04b050 feat: Add a process document for Subscription (#37126) 
* feat: Add a process document for Subscription

* chore: Remove print statements

* feat: Input for generating invoice before currenc invoice date

* chore: patch for backward compatability

* refactor: Unit tests for subscription

* chore: set status on insert
 2023-09-19 18:39:44 +05:30
ruthra kumar
21f94918a3 Merge pull request #36893 from marination/bank-reco-code-cleanup 
refactor: Bank Reconciliation Tool APIs
 2023-09-17 08:07:30 +05:30
Ankush Menat
2dbdc402bb refactor!: remove social media post module 2023-09-14 12:11:23 +05:30
marination
b9750f324b fix: Remove get_matching_vouchers_for_bank_reconciliation 
- There should only be one hook to add queries to `get_linked_payments`
- `get_matching_queries` will be the only hook just like before
 2023-09-11 21:51:10 +05:30
Gursheen Kaur Anand
6a7b45f689 Merge branch 'develop' into view-projects-in-customer-portal 2023-08-18 13:32:08 +05:30
Deepesh Garg
567f4c37fc fix: Add order data 2023-08-10 21:46:34 +05:30
Ankush Menat
3a21c90d10 fix: misc fixes in demo data 
- Generate demo data field copy
- absolute imports
- remove whitelisting where it's not required
- telemetry
- banner copy
- move to background
- clear bootinfo after setup
 2023-08-10 16:53:16 +05:30
Ankush Menat
ba6de0b4ff Merge branch 'develop' into demo_data_on_install 2023-08-10 15:22:52 +05:30
Anand Baburajan
ad33cd73e8 perf: asset depreciation entry posting [develop] (#36555) 
* perf: optimise post_depreciation_entries and make_depreciation_entry

* chore: fixing minor mistake

* chore: fix asset_value_adjustment test
 2023-08-09 20:26:28 +05:30
Deepesh Garg
333f2a565b fix: Add journal entry in demo 2023-08-01 10:10:50 +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
Ankush Menat
e36c8ce5be perf: move project status reminder to hourly (#36372) 
Only used for sending daily/weekly/bi-daily

[skip ci]
 2023-07-28 12:53:22 +05:30
Gursheen Anand
5d7dd9b0ec fix: project route permissions for user 2023-07-20 18:20:53 +05:30
Deepesh Garg
3bc79eebe3 Merge pull request #35689 from marination/payments-based-dunning 
feat: Payments based dunning
 2023-07-20 12:06:36 +05:30
mergify[bot]
b4db5e9561 fix: validate docs in closed accounting period on save (#36157) 
fix: validate docs in closed accounting period on save (#36157)

(cherry picked from commit 5985e02574)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-18 17:40:49 +05:30
Marica
1c1e7380e3 Merge branch 'develop' into payments-based-dunning 2023-07-17 12:33:19 +05:30
Kitti U. @ Ecosoft
2607847061 refactor: Leave Application should not be in hook.py (#36008) 2023-07-17 10:14:37 +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
Ankush Menat
bd9ef74ef7 perf: send SLA doctypes in boot 
This request is fired on every load, data rarely if ever changes though.
 2023-07-16 11:38:54 +05:30
ruthra kumar
4f51c5a433 refactor: submit and make JV through background job 2023-07-07 05:49:53 +05:30
Marica
0a67a3a9c4 Merge branch 'develop' into payments-based-dunning 2023-06-30 13:32:50 +05:30
Anand Baburajan
988d755906 refactor!: removing loan management module (#35522) 
* chore: resolving conflicts

* refactor: bank_clearance and add hook for get_payment_entries_for_bank_clearance

* refactor: bank_reconciliation_tool and add hook for get_matching_vouchers_for_bank_reconciliation

* fix: remove sales invoice from bank_reconciliation_doctypes and use hook for voucher clearance

* refactor: remove loan tests from test_bank_transaction

* refactor: bank_clearance_summary and add hook for get_entries_for_bank_clearance_summary

* refactor: removed test_bank_reconciliation_statement

* refactor: bank_reconciliation_statement and add hook for get_amounts_not_reflected_in_system_for_bank_reconciliation_statement

* refactor: add missing hook and patches for module removal and deprecation warning

* refactor: remove loan management translations

* chore: add erpnext tests dependent on lending
 2023-06-30 11:02:49 +05:30
Deepesh Garg
85e1c85b52 chore: Add payment entry 2023-06-19 14:12:23 +05:30
Deepesh Garg
77a29574a6 fix: Create transactions 2023-06-16 13:43:55 +05:30
marination
c32113918e fix: Updation of dunning on PE cancellation 2023-06-15 20:04:54 +05:30
Deepesh Garg
8ef257abbc feat: Demo data creation 2023-06-14 12:54:10 +05:30