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

31669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anurag Mishra
93e15c5f5c
fix: showing Wrong balance on allocation boundary dates (#21904) 2020-05-26 18:00:37 +05:30
Mangesh-Khairnar
7402451b96
fix: shopify error message on failure of sales order creation (#21924) 2020-05-26 17:56:40 +05:30
Mangesh-Khairnar
ddc170521f
fix: check for warehouse in the woocommerce settings (#21925) 2020-05-26 17:55:56 +05:30
Rucha Mahabal
c52bbd79bf
fix(Healthcare): set company in healthcare service unit setup (#21929) 2020-05-26 17:54:46 +05:30
Marica
74a910ae92
fix: title for onboarding step (#21933) 
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-05-26 17:49:34 +05:30
Prssanna Desai
ee70d7a7eb
fix: fix function import (#21927) 2020-05-26 17:02:51 +05:30
Rucha Mahabal
f91ed4ce24 fix: add default priority field in SLA 2020-05-26 16:03:47 +05:30
Rucha Mahabal
f3fc544918 fix: SLA tests 2020-05-26 15:03:15 +05:30
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
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
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
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
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
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
Deepesh Garg
0b5e990751
Merge pull request #21877 from scmmishra/rename-loan 
feat: rename loan management to loan on Desk Page
 2020-05-22 16:06:53 +05:30
sahil28297
2b277a7eec
fix(patch): rerun remove_duplicate_leave_ledger_entries (#21878) 2020-05-22 15:52:15 +05:30
Shivam Mishra
5cf90baf16 feat: rename loan management to loan on Desk Page 2020-05-22 15:09:57 +05:30
Nabin Hait
78a6b6b45d
fix: Remove duplicate leave ledger entry (#21871) 
* fix: Remove duplicate leave ledger entry

* fix: Remove duplicate leave ledger entry
 2020-05-22 13:13:17 +05:30
Deepesh Garg
8d7f5d342d
fix: Item tax template not getting mapped from source to traget doc (#21862) 2020-05-22 12:28:45 +05:30
Deepesh Garg
d1d54ebe41
Merge pull request #21853 from anupamvs/edu-card-report 
feat: Added card for reports on education desk
 2020-05-22 11:52:39 +05:30
Michelle Alva
1763d3e706
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 10:51:19 +05:30
Chinmay Pai
baef43977b
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 10:50:13 +05:30
Marica
dd3e52184c
fix: Added Inactive serial no status (#21848) 2020-05-22 10:48:35 +05:30
Deepesh Garg
f131260895
Merge pull request #21804 from netchampfaris/move-address-and-contact-templates-to-frappe 
fix: Move address and contact templates to frappe
 2020-05-22 09:27:33 +05:30
Anupam K
d7d4bed0b1 adding report card in education desk 2020-05-22 01:10:55 +05:30
Anurag Mishra
c07265ea3f
fix: convert goals point to flt (#21844) 2020-05-21 18:47:39 +05:30
sahil28297
82523a5487
fix(set_serial_no_status): auto commit on many writes (#21845) 2020-05-21 18:42:10 +05:30
Prssanna Desai
ce8f8f4ed7
fix: hide delete company transacations button if not system manager (#21839) 2020-05-21 18:35:03 +05:30
rohitwaghchaure
7978907cc8
feat: BOM template (#21262) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-21 18:10:13 +05:30
Suraj Shetty
5cef8db4db
fix(patch): Handle single value in patch (#21823) 2020-05-21 14:32:24 +05:30
rohitwaghchaure
c43932e653
Merge pull request #21831 from rohitwaghchaure/fixed-forecasting-error-report-python3 
fix: dict object has no attribute append
 2020-05-21 14:23:46 +05:30
rohitwaghchaure
e8c592698e
Merge pull request #21828 from marination/italian-invoice-import 
fix: Supplier Invoice No not fetched in Import Supplier Invoice
 2020-05-21 14:22:59 +05:30
rohitwaghchaure
7aa8cf6538
Merge pull request #21824 from marination/pick-list-dn 
fix: Fetch customer into Delivery Note from Pick List
 2020-05-21 14:19:43 +05:30
Rohit Waghchaure
feaf5c7edb fix: dict object has no attribute append 2020-05-21 14:08:25 +05:30
marination
90b4452a25 fix: Supplier Invoice No not fetched in Import Supplier Invoice 2020-05-21 14:03:29 +05:30
marination
7afee887a8 fix: Fetch customer into Delivery Note from Pick List 2020-05-21 13:11:48 +05:30
Marica
1a6dcd7f45
fix: plc conversion rate set infinitely (#21820) 2020-05-21 12:07:43 +05:30