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

167 Commits

Author SHA1 Message Date
Rohit Waghchaure
ef7def8f1d fix: inventory dimension filter's label not showing in the reort 2022-09-07 14:43:12 +05:30
rohitwaghchaure
5a3999e236
Merge pull request #31424 from rohitwaghchaure/feat-inventory-dimension 
feat: Inventory Dimension
 2022-07-20 19:47:14 +05:30
Rohit Waghchaure
dbec5cff00 feat: Inventory Dimension 2022-07-20 16:02:13 +05:30
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation 2022-07-12 19:27:19 +05:30
Rucha Mahabal
ef7299470b Merge branch 'develop' into hr-separation 2022-07-01 11:30:25 +05:30
Sagar Sharma
6589c5f5e9
Merge branch 'develop' into subcontracting 2022-06-29 17:29:24 +05:30
gn306029
2a619fd789
fix: Modify opts parameter misspell (#31476) 
Modify opts parameter misspell 

closes #31474
 2022-06-29 14:45:21 +05:30
s-aga-r
6d89b2fa28 refactor: backport old subcontracting code 2022-06-20 23:10:02 +05:30
Rucha Mahabal
fbc1330ab0 chore: Remove HR/Payroll related setups and fixtures 
- Fixtures moved to HRMS app

- 'HR' field in Terms and Conditions removed, added via HRMS setup
 2022-06-17 16:34:13 +05:30
Deepak
867f2c6282
fix: TypeError in add_indicator_for_multicompany (#31042) 
Minor fix in add_indicator_for_multicompany

In case of multi-company transactions add (+) buttons in connection dashboard pf customer aren't being loaded due to TypeError (TypeError: e.dashboard.stats_area.removeClass is not a function) created by "frm.dashboard.stats_area.removeClass('hidden');" during the stats section creation.
 2022-05-17 11:52:52 +05:30
Rohit Waghchaure
69be22ba7c fix: select multiple values for accounting dimenssion 2022-05-14 17:19:34 +05:30
Sagar Sharma
d074c93ac7 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-04-01 13:22:44 +05:30
mergify[bot]
c1a0f649cb
fix: convert asynchronous field update to synchronous (#28930) 
(cherry picked from commit 5adf85f5b7ba94591381b03709b1fee6aa9331a5)

Co-authored-by: Dan Navarro on Ubuntu Work <danjeremynavarro@gmail.com>
 2021-12-17 19:06:19 +05:30
Saqib
2411477e6d
fix: time to response shows failed (#28895) 2021-12-15 11:45:34 +05:30
Saqib
7d0a3e4e8b
Merge pull request #28550 from nextchamp-saqib/fix-sla 
refactor(SLA): Application of SLA and its fields
 2021-12-13 10:29:56 +05:30
Ankush Menat
d37541d3fb fix: ensure that reposting is finished before freezing stock/account 2021-12-10 12:31:49 +05:30
Saqib Ansari
476e81a631 fix: time to respond & resolve indicators 2021-12-06 18:55:30 +05:30
Rucha Mahabal
5ba1bc1572
fix: Employee link formatter showing incorrect value for Employee Name (#28504) 2021-11-23 09:30:30 +05:30
Rohit Waghchaure
69ffddf747 feat: option to set the width for the multi-select dialog box 2021-10-07 17:33:58 +05:30
Saqib
e03d9aa889
fix: unecessary keyword args were passed in mapper functions (#27563) 2021-09-17 13:03:27 +05:30
Saqib
7292f5476d
feat: (get_items_from) filter material request item in purchase order (#27449) 2021-09-13 12:13:43 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +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
6de7b8ea93
fix: discard empty rows from update items (#27021) 2021-08-24 12:18:40 +05:30
Afshan
dc7280eef0
fix: filtering of items in Sales and Purchase Orders (#26936) 
* fix: filtering of items in Sales and Purchase Orders

* fix: slider

* fix: slider
 2021-08-18 17:44:40 +05:30
Himanshu
ec25d5938b
feat(SLA): Apply SLA to any document (#22449) 2021-06-14 19:05:52 +05:30
Rucha Mahabal
59961f70ee refactor: timesheet 2021-05-22 10:21:04 +05:30
Alan
c6dc9eaf2e
feat!: add pick batch button (#25413) 
* feat!: add pick batch button

BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no.

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* style: add sider review changes

* refactor: make consice, extract function

* refactor: camel to snake casing
 2021-05-07 20:30:04 +05:30
Alan
157b388209
fix: change subcontracted item display (#25425) 2021-04-21 21:00:22 +05:30
Marica
24e45163d5
fix: Sider 2021-04-14 18:53:15 +05:30
Andy Zhu
bffe933c22
Fix: attempts to add overrides function 
Overrides parent_fieldname in outer form to all child rows's fieldname
 2021-04-12 22:49:26 +12:00
Andy Zhu
6117ac5aff
fix: copy_parent_value_in_all_row function error 2021-03-17 13:53:02 +13:00
Sagar Vora
78777d6ed4
fix: fetch Material Requests of type Customer Provided in Stock Entry using Get Items From (#24756) 
Co-authored-by: walstanb <walstanb@gmail.com>
 2021-03-09 20:35:08 +05:30
Afshan
84184559bc
fix: currency symbol in update items (#24726) 2021-02-24 16:51:11 +05:30
Deepesh Garg
23ab5c5cc0 fix: Multiplle sider issues 2020-12-31 11:29:06 +05:30
Deepesh Garg
7b2d518059 fix: Dimension filters in accounting reports 2020-12-04 11:28:26 +05:30
Saqib
bc919e2e7d
fix: cannot expand row in update items dialog (#23839) 2020-11-05 17:38:35 +05:30
marination
824f48fd23 fix: Item Link Formatter Behaviour 2020-10-12 20:08:03 +05:30
Saqib
56fea7d243
fix: update items after submission ignores precision (#23491) 
* fix: update items after submission ignores precision

* chore: add test
 2020-10-09 21:19:25 +05:30
marination
4f395cce54 chore: Add Filter Group to dialogs 2020-09-24 12:43:41 +05:30
Saqib
61314248bb
feat: uom in update items for SO & PO (#22869) 
* feat: uom in update items for SO & PO

* fix: supplied items doesn't updates on uom change

* chore: add uom and conv factor change test

* fix: test

* fix: purchase order updates are not tracked

* fix: fetch conversion factor on uom change

* fix: codacy

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-15 11:14:31 +05:30
Saqib Ansari
d531a8ab8d Merge branch 'develop' of https://github.com/frappe/erpnext into update-items-permission-fix 2020-05-29 22:37:13 +05:30
Saqib Ansari
c579b0879e fix: cannot update delivery date 2020-05-29 22:34:22 +05:30
Saqib Ansari
5da8b98a04 fix: label 2020-05-29 21:59:01 +05:30
Saqib Ansari
2c3c8aaa2d fix: submitted sales order can be updated with no permission 2020-05-29 21:55:38 +05:30
Deepesh Garg
bcee78d054 fix: Remove console statement 2020-05-26 19:26:47 +05:30
Deepesh Garg
11ea0b1289 fix: Do not add filters in report on accounting dimension creation if it already exists 2020-05-26 19:23:45 +05:30
Saqib Ansari
f53299e98a fix: warehouse unset when cannot find item warehouse 
* cannot set delivery date when all items gets deleted and new are added
 2020-04-15 22:10:48 +05:30
Saqib
438e0433a3
fix: cannot set warehouse on deleting all so items and updating them (#21078) 
* fix: cannot set warehouse on deleting all so items and updating them

* fix: travis

* fix: docname is editable in update items dialog
 2020-04-03 10:02:56 +05:30
Marica
fc96c1a2d6
fix: update_child_qty_rate() missing argument (#20838) 2020-03-06 10:57:59 +05:30