Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,739 Commits 3 Branches 0 Tags
Commit Graph

2267 Commits

Author SHA1 Message Date
Alexandre Lumertz Damiani
b719585a2f
fix: translate (#39397) 2024-01-16 10:44:17 +05:30
barredterra
2bcd032a44 Merge branch 'develop' into fix-holiday-list 2024-01-11 13:55:27 +01:00
Ankush Menat
432a14c84c
refactor: remove usage of raise_exception (#39309) 2024-01-11 14:02:28 +05:30
barredterra
58343e5b7c Merge branch 'develop' into fix-holiday-list 2024-01-09 17:46:28 +01:00
Raffael Meyer
68c0e188e8
fix: remove parent_field parameter from calls to rebuild_tree (#39146) 
fix: remove parent_field parameter from calls to rebuild_tree

The parent_field parameter became redundant with https://github.com/frappe/frappe/pull/24107
 2024-01-04 18:12:41 +05:30
Raffael Meyer
e912e9597d
fix(Employee): treeview (#39126) 2024-01-04 18:03:28 +05:30
barredterra
60329ade9e test: improve test for local holidays 2024-01-04 11:04:25 +01:00
Deepesh Garg
5b1571879c fix: flaky demo test case 2024-01-04 10:48:01 +05:30
barredterra
300aaa39fe fix: consider all years in holiday list 2024-01-03 13:39:28 +01:00
Rushabh Mehta
b250a21a2b fix(minor): remove "hide_workspaces" from erpnext/install.py 2024-01-02 15:50:54 +05:30
Rushabh Mehta
4e28b5a199 fix(minor): Rename "ERPNext Settings" to "Settings" and remove "ERPNext Integrations" workspace 2024-01-02 15:27:41 +05:30
Smit Vora
877cc7255d
fix: enqueue demo data setup on setup complete (#39043) 2023-12-31 10:54:07 +05:30
Gursheen Kaur Anand
b7f283b2f0
feat: skip disabled accounts in COA (#38551) 
* feat: skip disabled accounts in coa

* fix: add parameter to other tree doctype utils
 2023-12-29 12:55:37 +05:30
hyaray
0773f66feb
chore: Update company.py (#38660) 
chore: Update company.py
 2023-12-22 08:41:51 +05:30
Ankush Menat
2dc49c834a
chore: fixup broken JSON files (#38915) 2023-12-22 07:36:27 +05:30
ruthra kumar
6d5bdc6c68
fix: typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (#38870) 
* refactor: typerror on set_root_readonly

* refactor: remove 'cur_frm' usage in supplier_group

* refactor: remove 'cur_frm' usage in territory.js

* refactor: remove 'cur_frm' from sales_person.js
 2023-12-20 12:30:10 +05:30
Deepesh Garg
55147781f3
Merge pull request #38807 from deepeshgarg007/canada_demo 
fix(demo): Demo setup for Canadian COA
 2023-12-17 14:05:07 +05:30
Deepesh Garg
c9fd182268 fix(demo): Demo setup for canadian COA 2023-12-17 13:36:58 +05:30
Raffael Meyer
e7e23fbc96
Merge pull request #38533 from barredterra/date-format-system-settings 2023-12-14 16:38:00 +01:00
Ankush Menat
9611e9bd7f
fix: ignore non-existing regional customizations (#38621) 2023-12-07 14:12:40 +00:00
barredterra
eb9ee3f79b refactor: simplify conditional logic 
Command: `sourcery review --fix --enable de-morgan .`
 2023-12-05 11:22:55 +01:00
barredterra
b6957ddac2 fix: set date format from system settings 2023-12-03 17:21:48 +01:00
Ernesto Ruiz
b24e28953b
chore: add translate function to email subject in digest frecuency (#38474) 
chore: add translate function to email subject in digest frecuency
 2023-12-01 12:41:14 +05:30
Ankush Menat
63313eef6f
feat: enable automatic type annotations (#38452) 2023-11-30 08:23:48 +00:00
Ankush Menat
1da9087cc4
refactor: Simpler log settings setup (#38449) 
Depends on https://github.com/frappe/frappe/pull/23507
 2023-11-30 07:58:55 +00:00
Raffael Meyer
477d9fa87e
feat: new Report "Lost Quotations" (#38309) 2023-11-24 22:27:01 +01:00
Gursheen Anand
728cc9f725 fix: fiscal year using future date 2023-11-22 19:28:57 +05:30
Gursheen Anand
52305e3000 fix: annual income and expenses in digest 2023-11-22 18:38:33 +05:30
Anand Baburajan
8e010ef063
Merge pull request #38077 from anandbaburajan/trans_delete_att_comm 
chore: delete comments and unlink attachments on company transactions deletion
 2023-11-13 18:55:44 +05:30
anandbaburajan
2f9e96e324 chore: delete comments and unlink attachments on company transactions deletion 2023-11-13 18:03:33 +05:30
Dany Robert
56b8d1b927
fix: remove ESS role when not mapped to employee (#37867) 
* fix: remove ESS role when not mapped to employee

* fix: emp role removal on unlinking

* fix: test case for user employee role mapping

* fix: mapped employee and user on creation
 2023-11-13 17:00:02 +05:30
hyaray
daf2ec063c
fix: In-Transit Warehouse company filter (#37796) 2023-10-31 18:51:27 +05:30
Deepesh Garg
3bfb7b79f2
refactor: Remove expense included in valuation accounts (#37632) 
* refactor: Remove expense included in valuation accounts

* test: Deprecate tests

* test: Depricate tests

* test: Depricate tests
 2023-10-23 18:23:45 +05:30
Niraj Gautam
4aa841786f
fix: Update user profile picture, if employee profile pic is changed (#37483) 
* fix: Update user pic if employee pic is changed.

* fix: Update condition
 2023-10-21 18:13:53 +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
Ankush Menat
d2096cfdb7 fix: keep customer/supplier website role by default 2023-10-16 16:55:09 +05:30
Deepesh Garg
bd2d04e222
Merge pull request #37312 from blaggacao/feat/add-delivery-roles 
fix(stock): add delivery user and manager role
 2023-10-15 20:28:42 +05:30
ruthra kumar
c8e3dc6c4c chore: refactor test case for exchangerate.host provider 2023-10-05 08:43:08 +05:30
Jignesh (GreyCube Technologies)
9f33cc5cf3
fix(Employee): enable no_copy for relieving_date (#37344) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-10-04 13:10:27 +05:30
David Arnold
d3f94a03fc
fix(stock): add delivery user and manager role 2023-10-01 15:13:54 +02:00
Deepesh Garg
656c758263
chore: Add missing comma 2023-09-26 14:20:41 +05:30
Abraham Kalungi
0f6b530032
feat: Added ledger for Botswana VAT (#37212) 
feat: Added ledger for Botswana VAT (#37212)
 2023-09-26 08:57:50 +05:30
NIYAZ RAZAK
141ba255e0
feat: validate duplicate date in holiday list (#37022) 
* feat: validate duplicate date in table

* chore: cleanup

* chore: linting issues

* chore: linting issues

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-09-19 18:50:47 +05:30
Ankush Menat
dd24a1b36e
chore: remove obsolete welcome page (#37143) 2023-09-18 16:43:13 +00:00
Deepesh Garg
7711744020
Merge pull request #37032 from HarryPaulo/auth-rule-based-on-item-group 
feat: created "based on" Item Group to specify a different percentage…
 2023-09-13 20:27:34 +05:30
Deepesh Garg
1db05c80e1
Merge pull request #37031 from HarryPaulo/fix-auth-rule-based-on 
fix: "Based on" field always has the value "Not applicable"
 2023-09-13 20:26:28 +05:30
Deepesh Garg
6664bc98a0
Merge pull request #37041 from vorasmit/fix-advances 
fix: multiple fixes for booking advances in seperate account
 2023-09-13 20:24:57 +05:30
Deepesh Garg
1f02fb3bd9
Merge pull request #37017 from anandbaburajan/company_tabs 
chore: add tabs for company doctype
 2023-09-12 22:41:23 +05:30
HarryPaulo
da54ab5b3d fix: linters 2023-09-12 09:43:11 -03:00
HarryPaulo
623239d3f7 feat: created "based on" Item Group to specify a different percentage for each item group 2023-09-11 18:14:38 -03:00