Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,618 Commits 3 Branches 0 Tags 1 GiB
18918e1b4f
Commit Graph

615 Commits

Author SHA1 Message Date
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Dany Robert
c7bad657b1
fix: broken URL in supplier portal (#26823) 
* fix: broken URL

The quotations are supplier quotations, not sales quotation.

* fix: remove erpnext from path
 2021-08-24 22:10:14 +05:30
Frappe PR Bot
255b99ebdc
feat: Employee reminders (#25735) (#27115) 
* feat: Add reminders section to HR Settings

* refactor: Extract generic function for getting Employees

* feat: Employee Work Anniversary Reminder

* feat: Daily Holiday Reminder

* fix: Unnecessary params and replace [] with .get()

* test: Daily Holiday Reminders

* test: is_holiday basic tests

* refactor: Move employee reminders code to separate module

* feat: Add advance reminder to HR settings

* feat: Advance Holiday Reminders

* refactor: get_holidays_for_employee

* feat: Email holiday reminders in advance + tests

* fix: Remove unused import

* refactor: HR Setting Reminder Section

* refactor: Remove Daily Holiday Reminders feat

* feat: Reminder miss warning

* fix: Failing test and function name change

* chore: Add patch for field rename

* chore: Rename frequency label

* fix: Failing patch test

* fix: sider and removed description of fields

* fix: email alignment

Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)

Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-08-24 20:19:22 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
marination
f40da4ac4c fix: Paging buttons not working on item group portal page 2021-07-14 20:48:06 +05:30
Marica
dbf835ced3
Merge branch 'develop' into paging-btns 2021-07-14 20:15:22 +05:30
marination
4c6e952902 fix: Paging buttons not working on item group portal page 2021-07-14 20:01:36 +05:30
18alantom
9ea5072c52 fix: set item group as a persistent filter 2021-07-14 17:41:38 +05:30
18alantom
ddbf7c0020 fix: set item group as a persistent filter 2021-07-14 15:43:22 +05:30
Jannat Patel
5173e74a04
fix: Project Portal Enhancements (#26290) 
* fix: project portal enhancements

* fix: condition for pills
 2021-07-02 11:48:46 +05:30
Jannat Patel
5a4251107c
feat: Project Portal Enhancements (#26090) 
* fix: project portal enhancements

* fix: timesheet table and task nesting

* fix: semgrep and link issue

* fix: sider

* fix: project details view title

* fix: project progress pills

* fix: website route rule for project

* fix: multi level nesting

* fix: added subject and indentation

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-01 17:17:34 +05:30
Nabin Hait
5b462ad11a fix: merge conflict 2021-06-24 15:36:51 +05:30
marination
26bec9d7b4 fix: Country Link field in 'Add address' website modal auto-clears 2021-06-24 13:50:18 +05:30
marination
f5fa1ee4b6 fix: Country Link field in 'Add address' website modal auto-clears 2021-06-24 11:03:32 +05:30
Rohit Waghchaure
9e616b09a2 fix: material request and supplier quotation not linked if sq created from supplier portal against rfq 2021-06-20 15:17:20 +05:30
Rohit Waghchaure
8c844e4515 fix: material request and supplier quotation not linked if sq created from supplier portal against rfq 2021-06-19 16:08:26 +05:30
Suraj Shetty
d3b9edd2c4 fix: Remove unnecessary import 2021-05-25 12:52:26 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Faris Ansari
464d838447 fix: Update bundle paths 2021-05-07 14:53:42 +05:30
Faris Ansari
1fe891b287 refactor: Replace Class.extend with native class 2021-04-23 08:04:00 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
prssanna
56ab3fb132 fix: issue web list style 2021-03-31 18:26:37 +05:30
prssanna
f1dbc021fc fix: issue web list style 2021-03-16 14:15:59 +05:30
Nabin Hait
fe3529b194 fix: merge conflict 2021-03-11 16:45:41 +05:30
Anupam
d7f4aefd00 feat: added continue-shopping button on cart 2021-02-05 16:17:20 +05:30
prssanna
526ea46ae2 fix: formatting issues 2021-02-01 20:12:47 +05:30
prssanna
11eae6d51a fix: add default product-image css class 2021-02-01 20:01:37 +05:30
prssanna
a3585e40f7 style: fix formatting 2021-02-01 19:50:27 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Nabin Hait
a6213ccd61 Merge branch 'develop' into version-13-beta-pre-release 2021-01-28 17:36:08 +05:30
Anupam Kumar
0d9a8ae4d2
feat: shopping portal changes (#24445) 
* feat: shopping portal changes

* fix: review changes

* review changes
 2021-01-28 17:32:57 +05:30
Anupam
e6f925e5e6 review changes 2021-01-28 15:58:03 +05:30
Mohamed Almubarak
f7ea340181
fix(template): cards on second row overlaps the one before (#23454) 
* Update macros.html

fix second row of cards overlapps with the one before

* Update macros.html

fix(template): second row of cards overlaps with the one before

* Update macros.html

fix(template): second row of cards overlaps with the one before
 2021-01-28 12:32:13 +05:30
prssanna
74feaf85dc fix: website order page style 2021-01-27 17:41:15 +05:30
Suraj Shetty
0c34a711eb Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release 2021-01-25 16:06:38 +05:30
Anupam
8541d9738f fix: review changes 2021-01-25 14:18:26 +05:30
prssanna
2aa1efb70e fix: broken image style 2021-01-22 15:31:38 +05:30
Anupam
988ea8d61d feat: shopping portal changes 2021-01-22 10:53:50 +05:30
Suraj Shetty
8670dda5b7 fix: Use abbr method for abbr 2021-01-21 16:47:04 +05:30
Suraj Shetty
2dcdeb8231 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 15:33:42 +05:30
Suraj Shetty
17ed3fc270 fix: Set css_style fallback 2021-01-21 15:33:36 +05:30
prssanna
f3d321fb82 fix: remove console.log 2021-01-21 15:31:42 +05:30
prssanna
9f1a156307 Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 13:04:58 +05:30
prssanna
b00eb1b0cc feat: shopping cart page 2021-01-20 17:52:54 +05:30
prssanna
706eae7cac fix: product page fixes 2021-01-20 17:47:25 +05:30
Suraj Shetty
2e67a41c27 fix: Update birthday avatar code 2021-01-20 10:12:01 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Suraj Shetty
3d00e25232 refactor: Employee birthday reminder 2021-01-15 14:48:28 +05:30