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

31844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
5379e87880 refactor: code cleanup, break functions 2020-05-26 12:48:03 +05:30
Rucha Mahabal
ec6246306c refactor: set variance and SLA as Ongoing on Issue reopen 2020-05-26 12:32:12 +05:30
Rucha Mahabal
899ec36532 feat: added Resolved status with same functionality as Closed 2020-05-26 12:23:28 +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
Rucha Mahabal
79ed5755be refactor: remove Hold status 2020-05-25 22:04:04 +05:30
Rucha Mahabal
372aa44b19 feat: implement hold time on Replied status for SLA 2020-05-25 21:37:58 +05:30
Anurag Mishra
a7f42f7256
fix: showing wrong record (#21884) 2020-05-25 19:23:17 +05:30
Anupam Kumar
0a147d5c76
fix: adding dashboard in course and assessment plan (#21889) 
* Adding dashboards

* adding dashboard in course and assessment plan
 2020-05-25 19:21:48 +05:30
Saqib
48e4abf43f
fix: fetch depreciation amount only if depr entry is made (#21893) 2020-05-25 19:21:08 +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 316d136aca)

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 4dd6b9986f)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-05-25 19:18:01 +05:30
Rucha Mahabal
4dd6b9986f
fix(healthcare): patient vitals undefined (#21906) 2020-05-25 18:42:01 +05:30
Rucha Mahabal
316d136aca
fix(Healthcare): unhide company field in Sample Collection, add field in Rehab DocTypes (#21907) 
* fix: unhide company field in Sample Collection

* fix: add and set company field in rehab doctypes
 2020-05-25 18:41:47 +05:30
Anurag Mishra
8a1cf45473
fix: Validation for dates (#21886) 2020-05-25 18:39:19 +05:30
Marica
1392489b60
fix: Item Price and Add to Cart not showing on Website (#21903) 
* fix: Item Price and Add to Cart not showing on Website

* fix: Use None as default argument
 2020-05-25 18:26:01 +05:30
Marica
07f305a1d6
refactor: open link in new tab (#21910) 2020-05-25 16:30:59 +05:30
Shivam Mishra
fa62b72174
refactor: open link in new tab (#21909) 2020-05-25 16:30:18 +05:30
Rohan
e5395c3ae8
fix: filter batches based on item and warehouse in Pick List (#21780) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-25 15:25:21 +05:30
Vishal Dhayagude
6ff11de2f0
fix: Added gram, pound to ounce conversion (#21709) 
* fix: pound, grams to Ounce converion factor added

* fix: patch date updated for UOM Conversion Factor

* fix: grams move to gram

* fix: duplicate entry of uom converion factor and patch added

* fix: typo fix

* fix: minor changes

* Update patches.txt

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-25 14:54:19 +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 9f963a2ac7)
 2020-05-24 16:53:38 +00:00
Rucha Mahabal
28d1d6c91f
Merge pull request #21895 from deepeshgarg007/healthcare_dashboard_fix 
fix: Company query for number cards
 2020-05-24 22:12:18 +05:30
Deepesh Garg
9f963a2ac7 fix: Company query for number cards 2020-05-24 21:55:47 +05:30
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 0d147b011e)
 2020-05-24 07:24:34 +00:00
Deepesh Garg
8f34cf59f8
Merge pull request #21891 from Thunderbottom/process-deferred-accounting-fix 
fix: set default posting_date value to None
 2020-05-24 12:51:00 +05:30
Chinmay D. Pai
0d147b011e
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>
 2020-05-24 00:54:04 +05:30
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
Rucha Mahabal
0d3231ebba fix: add title to validation dialog 2020-05-22 20:39:15 +05:30
Rucha Mahabal
4da770d6c2 fix(ip): code cleanup and translations 2020-05-22 20:39:15 +05:30