Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,517 Commits 3 Branches 0 Tags 1 GiB
301092dad1
Commit Graph

2225 Commits

Author SHA1 Message Date
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
HarryPaulo
fae640c56f fix: "Based on" field always has the value "Not applicable" 2023-09-11 17:57:31 -03:00
Smit Vora
43061f4416 fix: correct set_query filters 2023-09-11 19:16:25 +05:30
anandbaburajan
dda4c5ec59 chore: add tabs for company doctype 2023-09-10 22:06:28 +05:30
Deepesh Garg
ae01d70b33 chore: Update employee for tests 2023-09-06 13:19:00 +05:30
Suraj Shetty
e92d4e9b4a
Merge branch 'develop' into develop-ritvik-ignore-perm-tree-doctype 2023-08-30 16:46:00 +05:30
RitvikSardana
de433d8626 fix: added ignore_user_permissions to parent field of tree doctypes 2023-08-29 13:07:13 +05:30
Ankush Menat
0d22fe02be refactor!: Lower all perm to Desk User 2023-08-28 22:42:14 +05:30
Deepesh Garg
0120588f5f chore: Handle edge cases 2023-08-24 18:32:16 +05:30
Deepesh Garg
6349b67df4 fix(demo): Default accounts for demo company 2023-08-24 17:54:14 +05:30
Ankush Menat
ab6e600b9e
fix: demo data setup w/o territory (#36798) 
This can fail because it's translated.
 2023-08-24 12:23:33 +05:30
Deepesh Garg
1e07f6eef9
fix(demo): More exception handling on demo data generation (#36652) 2023-08-15 10:45:36 +05:30
Ankush Menat
8b57979e9c
fix: clear demo data with unknown columns (#36637) 2023-08-14 08:46:48 +00:00
Ankush Menat
e023e33a15
fix(demo): drop parent item group (#36636) 
This is translated according to user language, so "All Item Groups" might not
exist on site.

The code already finds root item group without doing anything.

towards https://github.com/frappe/erpnext/issues/36635
 2023-08-14 13:46:16 +05:30
Deepesh Garg
39ec11200e
fix(demo): Item creation with India Compliance app (#36627) 2023-08-13 18:33:09 +05:30
Deepesh Garg
90bc0d6bd0 Merge branch 'demo_data_on_install' of https://github.com/deepeshgarg007/erpnext into demo_data_on_install 2023-08-10 21:48:03 +05:30
Deepesh Garg
567f4c37fc fix: Add order data 2023-08-10 21:46:34 +05:30
Deepesh Garg
000de4eddf chore: Update customer/supplier names 2023-08-10 21:45:55 +05:30
Ankush Menat
c8e6e067ae chore: telemetry for demo data erasure 2023-08-10 18:27:42 +05:30
Ankush Menat
e4b863af05 refactor: gracefully fail while clearing demo data 2023-08-10 17:52:53 +05:30
Ankush Menat
940b1d9e67 feat(ux): account workspace number cards 2023-08-10 17:46:35 +05:30
Ankush Menat
704e6577e5 chore: use royalty free images 2023-08-10 17:29:55 +05:30
Ankush Menat
5fb92cbb49 fix: enqueue at front to speed up demo 2023-08-10 17:16:58 +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
Ankush Menat
5169006085 fix: move company rename to long queue 2023-08-10 10:02:59 +05:30
Ankush Menat
2eea90a873 perf: defer holiday list imports 
Only used for configuring but loaded whenever
get_doc("holiday list", ...) is done
 2023-08-07 10:08:34 +05:30
Ankush Menat
f574ac11ea perf: defer babel import 
Only required when configuring but will get loaded everywhere
 2023-08-07 10:03:40 +05:30
Ankush Menat
0218ca538f fix: use correct lang separator for frappe 2023-08-07 09:59:54 +05:30
Michelle Alva
16bc1e228f
chore: typo in onboarding (#36504) 
* fix: typo in onboarding

* fix: typo
 2023-08-05 18:30:24 +05:30
Deepesh Garg
333f2a565b fix: Add journal entry in demo 2023-08-01 10:10:50 +05:30
Deepesh Garg
7805abbb2d fix: reset default company 2023-07-30 20:29:20 +05:30
Deepesh Garg
c850f46c0a chore: Update records 2023-07-30 11:53:09 +05:30
Deepesh Garg
26ee50269a test: Update demo setup test 2023-07-30 11:52:49 +05:30
Deepesh Garg
371413a078 fix: Button to clear demo data 2023-07-29 22:39:07 +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
a25f34c3d5
Merge pull request #36313 from barredterra/delete-root-item-group 
fix(Item Group): allow root deletion
 2023-07-27 21:14:44 +05:30
barredterra
1691eee26e chore(Item Group): remove redundant autoname 2023-07-25 18:05:41 +02:00
barredterra
fd2c272bed fix(Item Group): allow root deletion 
It was not possible to delete an empty, unused Item Group without any
children, if it was one of possibly multiple roots of the Item Group tree.
This fix allows deleting a root Item Group.
 2023-07-25 17:01:57 +02:00
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
barredterra
dab9688410 refactor(Holiday List): use autocomplete fieldtype 2023-07-14 13:33:55 +02:00
barredterra
8aff5a1dab fix(Holiday List): allow empty value 2023-07-14 12:33:27 +02:00
barredterra
8271a39cdb fix(Holiday List): use current user's language 
For consistency with "weekly off" descriptions
 2023-07-14 12:16:49 +02:00