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

1459 Commits

Author SHA1 Message Date
Marica
fcc8f9f164
Merge branch 'develop' into bank-trans-party-automatch 2023-04-05 17:04:07 +05:30
Deepesh Garg
56f5078357
fix: Shop by category fixes (#34688) 
* fix: Shop by category fixes

* chore: Update tests
 2023-04-05 12:43:32 +05:30
marination
ad31e02616 feat: Store Party bank details in party records (Customer/Supplier/Employee/Shareholder) 2023-04-04 11:45:37 +05:30
Ankush Menat
e0042972c8 test: add test for primary address sorting 2023-03-14 18:50:19 +05:30
Ankush Menat
55489d0056 Merge branch 'develop' into prateekkaramchandani/develop 2023-03-14 18:39:06 +05:30
ruthra kumar
4a7b1de2d8
refactor: clear records in batches in 'Transaction Deletion Record' (#34109) 
refactor: clear records in batches
 2023-02-21 14:27:00 +05:30
Ankush Menat
3f2a2c96f6
fix: Add company perm check unconditionally (#34142) 
fix: Add employee perm check unconditionally
 2023-02-20 16:07:27 +05:30
Prateek
b93c18bd4a fix: use max function to get default company address 2023-02-17 20:25:13 +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
ab7293bcd3
fix: list view for Terms and Conditions (#33925) 
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 11:09:26 +05:30
Sabu Siyad
a94aa7a79f
fix(ecommerce): breadcrumb: fallback to /all-products (#33718) 
* fix(ecommerce): breadcrumb: fallback to `/all-products`

* fix(item_group): use `==` instead of `is`

* test(ecommerce): breadcrumb
 2023-01-20 18:54:54 +05:30
Ankush Menat
fa4af2acce
refactor: convert heatmap queries to QB (#33581) 
Uses new `UnixTimestamp` function, don't backport.
 2023-01-09 20:00:22 +05:30
s-aga-r
348dc32514 chore: enable No Copy attribute for route in Item Group 2023-01-05 12:25:50 +05:30
ruthra kumar
89229d9b58 refactor: additional doctype access for 'Accounts User' role 2022-12-24 11:20:16 +05:30
Deepesh Garg
2a4eec245a
Merge pull request #33371 from deepeshgarg007/coa_import_srbnb 
fix: Unable to import COA through importer
 2022-12-17 16:42:37 +05:30
Deepesh Garg
3b66920342 fix: Unable to import COA through importer 2022-12-16 19:22:29 +05:30
Deepesh Garg
1a40c04b72 feat: Ignore company related doctype for other apps via hooks 2022-12-15 18:51:58 +05:30
Sabu Siyad
b6bd408f19
fix(ecommerce): remove query parameters from referer 
inclusion of query parameters results in logic failure

example:
- logic check if referrer is `all-products`
- `http://shop.example/all-products` -> `all-products`, valid outcome
- `http://shop.example/all-products?start=1` -> `all-products?start=1`,
  invalid outcome

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-12-08 16:47:50 +05:30
barredterra
03f7bfbbde refactor: validate dates 2022-12-01 12:42:03 +01:00
barredterra
a5966b6f84 feat: add connections to Incoterm doctype 2022-11-17 22:37:04 +01:00
barredterra
1a1bfc8db9 feat: add doctype Incoterm 2022-11-17 22:14:30 +01:00
Ankush Menat
1bd886387b chore: hardcode doctype 2022-11-17 11:58:35 +05:30
Ankush Menat
7e1742956c
refactor: Remove usage of deprecated methods (#32914) 
Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```

Required after: https://github.com/frappe/frappe/pull/18815
 2022-11-09 20:09:06 +05:30
Sagar Sharma
7da32c7db3 fix: Brand Defaults filters 2022-10-12 12:15:07 +05:30
Nabin Hait
cbf973d90f fix: always set default expense account in company 2022-09-15 11:19:06 +05:30
Rucha Mahabal
eb01f9729d
fix(Employee): shorter tab titles (#32192) 2022-09-13 10:34:35 +05:30
Rucha Mahabal
5ab5811770
feat: tabbed view for Employee form (#31940) 2022-09-06 10:18:14 +05:30
Nabin Hait
b4a2eb2e65 fix: gl entries for asset repair 2022-08-24 12:29:15 +05:30
Ankush Menat
17b9bfd249
fix(ecommerce): remove query to non-existing field (#31771) 2022-08-03 16:48:27 +05:30
Gavin D'souza
3c26415b6f fix(gd): Scan FY only if current_fiscal_year set 2022-07-25 11:54:49 +05:30
Rucha Mahabal
b30f66c029 chore: use get_single_value in place of get_value 2022-07-19 17:51:03 +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
ef02e58859 Merge branch 'develop' into hr-separation 2022-07-07 13:46:54 +05:30
Sagar Vora
05351bee8b Merge remote-tracking branch 'upstream/develop' into remove-india 2022-07-03 18:07:44 +05:30
Rucha Mahabal
466bf99835 fix: Remove Expense Claim from Bank Reconciliation 
- add hooks `get_matching_queries` and `bank_reconciliation_doctypes` to extend the functionality in other apps
 2022-07-01 19:01:17 +05:30
Rucha Mahabal
ef7299470b Merge branch 'develop' into hr-separation 2022-07-01 11:30:25 +05:30
Rucha Mahabal
a1a6810b58 fix: Remove HR & Payroll from Authorization Control and Rules 2022-07-01 11:28:34 +05:30
Rucha Mahabal
7442a886a6 test: fix Employee and Activation test 2022-07-01 10:34:32 +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
Devin Slauenwhite
8a13ddc2f2
fix: gain/loss can be income or expense 2022-06-29 12:28:24 -04:00
Rucha Mahabal
a24cc982e2 fix: Remove HR validations from Employee master 2022-06-28 18:47:14 +05:30
Rucha Mahabal
26a8de69c9 fix: Remove Designation Skill child table 
- moved to HRMS app, since it isn't used anywhere in ERPNext
 2022-06-28 17:18:02 +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
6a65c8aff4 Merge branch 'develop' into hr-separation 2022-06-28 11:51:59 +05:30
Rucha Mahabal
c619b58ba9 fix: remove HR/Payroll references from form dashboards 
- Employee, Holiday List, Project, Task, Timesheet
 2022-06-24 15:03:16 +05:30
Rucha Mahabal
39e0d22044 chore: Remove HR related field references from Employee, Department form scripts 
- removed approver fields and payroll cost center from Employee master

- removed query filter code for HR related fields from employee and department form scripts

- removed `update_approver_role`
 2022-06-24 13:14:26 +05:30
Rucha Mahabal
edb528ce41 chore: Remove code for Expense Claim from Project, Task, Delivery Trip 
- Remove `total_expense_claim` field from Project and Task, will be installed with hrms setup

- Remove Expense Claim calculation from `update_costing` in project

- Remove `update_total_expense_claim` from task

- Remove Expense Claim references from employee form tour

- Remove 'Make Expense Claim' button from Delivery Trip, will only be available if hrms is installed

- Update delivery trip tests
 2022-06-23 19:48:42 +05:30
Sagar Vora
ec9861266e Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-19 22:57:22 +05:30