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

31324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
01dda8a000
fix: Filtering issues in opneing invoice creation tool (#21969) (#21979) 
(cherry picked from commit 0030b95595e2a74b0167a5e791d62371af4bb24a)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-05-27 20:50:20 +05:30
rohitwaghchaure
c77a4b8486
Merge pull request #21978 from scmmishra/work-order-fix-v13-beta 
fix: compare start and end time to prevent negative diff
 2020-05-27 20:41:17 +05:30
Shivam Mishra
48b7a1a20f fix: use get_datetime instead of getdate 2020-05-27 20:39:52 +05:30
Shivam Mishra
402ed10004 fix: compare start and end time to prevent negative diff (#21974) 
* fix: compare start and end time to prevent negative diff

* feat: parse date when comparing
 2020-05-27 20:39:52 +05:30
mergify[bot]
4ea24687fc
fix: Module Onboarding for HR (#21963) (#21976) 
(cherry picked from commit d6d84a3c1561195810c6e1da9cdd16ad7ff62b18)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-05-27 20:32:11 +05:30
mergify[bot]
97ca1e7e71
onbarding steps fix (#21959) (#21975) 
(cherry picked from commit a77032f926fde8244854715f6506e1f081fb3b95)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2020-05-27 20:31:43 +05:30
Marica
7634250e78
fix: Grammar fixes (#21971) 2020-05-27 20:28:47 +05:30
Deepesh Garg
3258a050d0
Merge pull request #21968 from frappe/mergify/bp/version-13-beta-pre-release/pr-21957 
fix: label changed in production plan (bp #21957)
 2020-05-27 19:01:24 +05:30
Nabin Hait
310309e816 fix: label changed in production plan 
(cherry picked from commit 07388495f36c389830277d7a21124593f91d8cb9)
 2020-05-27 13:15:58 +00:00
rohitwaghchaure
eb29719586
Merge pull request #21961 from rohitwaghchaure/fixed-filters-for-manufacturing-reports-pre-release 
fix: filters for the manufacturing reports
 2020-05-27 15:38:41 +05:30
Rohit Waghchaure
6bb1eb26ff fix: filters for the manufacturing reports 2020-05-27 15:28:01 +05:30
mergify[bot]
5c9469b1ee
fix: titles and order of Healthcare Onboarding steps (#21948) (#21956) 
* fix(Healthcare): title and order of onboarding steps

* refactor: healthcare settings tour

(cherry picked from commit a18c896a5641fb74b7cb82bf6808a0b7dcdcfb6d)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-05-27 12:52:52 +05:30
mergify[bot]
2cdd572f6b
fix: addtional salary date validation (#21952) (#21955) 
(cherry picked from commit ef0026c06f224a486978164325461abb81e32aac)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-05-27 12:44:02 +05:30
Shivam Mishra
56893ed373
refactor: project summary report (#21953) 
* feat: added more filters

* feat: show only first 30 projects in chart

* fix: status completed

* refactor: allow empty option in status filter
 2020-05-27 11:53:06 +05:30
rohitwaghchaure
84b855d55f
Merge pull request #21942 from scmmishra/manu-tour 
feat: added tour to manufacturing settings
 2020-05-26 23:26:12 +05:30
rohitwaghchaure
ed98796f11
Merge pull request #21945 from rohitwaghchaure/fixed-v13-beta-2-issues 
fix: manufacturing dashboard and work order summary chart
 2020-05-26 23:19:44 +05:30
Rohit Waghchaure
4e9ae53a13 fix: manufacturing dashboard and work order summary chart 2020-05-26 23:13:09 +05:30
Shivam Mishra
41ef0b849e feat: added tour to manufacturing settings 2020-05-26 20:29:08 +05:30
Shivam Mishra
8513d516e3
fix: status label in project summary report (#21935) 2020-05-26 18:22:09 +05:30
mergify[bot]
1edca82280
fix(Healthcare): set company in healthcare service unit setup (#21929) (#21934) 
(cherry picked from commit c52bbd79bf02be46248c5daa100d80168c59f151)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-05-26 18:01:20 +05:30
Shivam Mishra
0662a2194c
fix: title for onboarding step (#21930) 2020-05-26 17:49:13 +05:30
Suraj Shetty
2d907df96b
Merge pull request #21923 from surajshetty3416/rename-change-log 2020-05-26 10:59:39 +05:30
Suraj Shetty
ccb9ae49aa fix: Rename change log to fix Invalid version string 2020-05-26 10:58:19 +05:30
Suraj Shetty
9571a0b8b7
Merge pull request #21922 from frappe/surajshetty3416-patch-1 2020-05-26 10:36:13 +05:30
Suraj Shetty
65fa85ed89
Rename v13_0_0_beta_2.md to v13_0_0_beta-2.md 2020-05-26 10:34:20 +05:30
Raffael Meyer
08ed9fc064 Update v13_0_0_beta-1.md 2020-05-26 10:27:08 +05:30
Suraj Shetty
3f09b1fade chore: Rename change log 2020-05-26 10:26:35 +05:30
mergify[bot]
dba67dc4a5
fix(Healthcare): unhide company field in Sample Collection, add field in Rehab DocTypes (#21907) (#21917) 
* fix: unhide company field in Sample Collection

* fix: add and set company field in rehab doctypes

(cherry picked from commit 316d136acabba37e58c5987f22570bc1ebf9b64b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-05-25 19:18:11 +05:30
mergify[bot]
4771362d39
fix(healthcare): patient vitals undefined (#21906) (#21918) 
(cherry picked from commit 4dd6b9986fbf5320a80288b871d32ded4c4e39f1)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-05-25 19:18:01 +05:30
Shivam Mishra
fa62b72174
refactor: open link in new tab (#21909) 2020-05-25 16:30:18 +05:30
Rucha Mahabal
31557bf2c8
Merge pull request #21896 from frappe/mergify/bp/version-13-beta-pre-release/pr-21895 
fix: Company query for number cards (bp #21895)
 2020-05-24 22:24:55 +05:30
Deepesh Garg
5f57f59482 fix: Company query for number cards 
(cherry picked from commit 9f963a2ac730e38dc480a8ecdc523f1af168d956)
 2020-05-24 16:53:38 +00:00
Deepesh Garg
2e7088c29a
Merge pull request #21892 from frappe/mergify/bp/version-13-beta-pre-release/pr-21891 
fix: set default posting_date value to None (bp #21891)
 2020-05-24 13:50:37 +05:30
Chinmay D. Pai
a7f39a9879 fix: set default posting_date value to None 
using mutable python defaults, and especially function calls, inside
function definitions causes bugs that can be really hard to debug
sometimes. please refrain from using such defaults.

instead, using None is almost always a sane default. the values can
then be manipulated inside the function instead.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
(cherry picked from commit 0d147b011e5a9685de81564170f0668070d75af4)
 2020-05-24 07:24:34 +00:00
Nabin Hait
804c8709e3
chore: added change log (#21869) 
* chore: added change log

* fix: change log
 2020-05-22 20:39:50 +05:30
sahil28297
febf6b260e fix(patch): rerun remove_duplicate_leave_ledger_entries (#21878) 2020-05-22 20:39:16 +05:30
Nabin Hait
32635ef193 fix: Remove duplicate leave ledger entry (#21871) 
* fix: Remove duplicate leave ledger entry

* fix: Remove duplicate leave ledger entry
 2020-05-22 20:39:16 +05:30
Deepesh Garg
bd24a07459 fix: Item tax template not getting mapped from source to traget doc (#21862) 2020-05-22 20:39:16 +05:30
Michelle Alva
f42408c003 fix: expense account error message in DN (#21851) 
Changed error message if expense account not set for item in Delivery Note.
Earlier: Expense or Difference account is mandatory for Item IT - 6 as it impacts overall stock value
After fix: Expense Account not set for Item IT - 6. Please set an Expense Account for the item in the Items table
 2020-05-22 20:39:16 +05:30
Chinmay Pai
131ca435e7 fix: set customer and supplier details using sql (#21846) 
* fix: set customer and supplier details using sql

instead of slowing down the query with get_doc and save()
we can just use sql to update the required values for
customer and supplier

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove extra quote

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>

* fix: update sql query to include tabPrice List

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-05-22 20:39:16 +05:30
Marica
1fe8956347 fix: Added Inactive serial no status (#21848) 2020-05-22 20:39:16 +05:30
Anupam K
015c1192a7 adding report card in education desk 2020-05-22 20:39:16 +05:30
Anurag Mishra
1b94fe444f fix: convert goals point to flt (#21844) 2020-05-22 20:39:16 +05:30
sahil28297
8f756d3a74 fix(set_serial_no_status): auto commit on many writes (#21845) 2020-05-22 20:39:16 +05:30
Prssanna Desai
9b8b712083 fix: hide delete company transacations button if not system manager (#21839) 2020-05-22 20:39:16 +05:30
rohitwaghchaure
ed26db899a feat: BOM template (#21262) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-22 20:39:16 +05:30
marination
64301c8adb fix: Supplier Invoice No not fetched in Import Supplier Invoice 2020-05-22 20:39:15 +05:30
marination
0f27be2fac fix: Fetch customer into Delivery Note from Pick List 2020-05-22 20:39:15 +05:30
Marica
8e9f3e4645 fix: plc conversion rate set infinitely (#21820) 2020-05-22 20:39:15 +05:30
Marica
45de78bf94 fix: Employee Advance Return not working (#21812) 2020-05-22 20:39:15 +05:30