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

31295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shivam Mishra
41ef0b849e feat: added tour to manufacturing settings 2020-05-26 20:29:08 +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
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
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
Rucha Mahabal
ccbdfcbed1 fix: service unit validation and translation 2020-05-22 20:39:15 +05:30
anoop
f579680b97 fix: invoiced field position, medical department field corrected in query 2020-05-22 20:39:15 +05:30
anoop
470fe65cc1 fix: inpatient date validation removed, added role perms 
service unit defaults not set when created from tree, added validations on after_insert
 2020-05-22 20:39:15 +05:30
anoop
09ec030baa fix: ip-order dialogs use long text field 2020-05-22 20:39:15 +05:30
anoop
f71f9556ab fix: consider only submitted docs for invoicing 2020-05-22 20:39:15 +05:30
anoop
08f76d73e3 feat: admission and discharge schedule detials via dialog 2020-05-22 20:39:15 +05:30
Deepesh Garg
18ace30a81 fix: Project filter in Trial Baalance Report 2020-05-22 20:39:14 +05:30
anoop
6917849273 fix: service unit create - set fields based on service unit type, added validations 2020-05-22 20:39:14 +05:30
Faris Ansari
c71e7eb56f fix: Move address and contact templates to frappe 2020-05-22 20:39:14 +05:30
Deepesh Garg
60d81c285c
Merge pull request #21879 from frappe/mergify/bp/version-13-beta-pre-release/pr-21877 
feat: rename loan management to loan on Desk Page (bp #21877)
 2020-05-22 18:01:30 +05:30
Shivam Mishra
29742e4cbe feat: rename loan management to loan on Desk Page 
(cherry picked from commit 5cf90baf16)
 2020-05-22 10:40:33 +00:00
mergify[bot]
54bcda42ce
fix(patch): Handle single value in patch (#21823) (#21834) 
(cherry picked from commit 5cef8db4db)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-05-21 18:57:42 +05:30
rohitwaghchaure
630050411f
Merge pull request #21832 from rohitwaghchaure/fixed-forecasting-error-report-python3-pre-release 
fix: dict object has no attribute append
 2020-05-21 14:24:06 +05:30
Rohit Waghchaure
fa1e0bdda2 fix: dict object has no attribute append 2020-05-21 14:12:50 +05:30
Nabin Hait
eb7a9a569a fix: merge conflict 2020-05-20 20:14:12 +05:30
Nabin Hait
054aafa1d7 fix: Assets module onboarding and dashboard 2020-05-20 18:22:39 +05:30
Saqib Ansari
4f024128af fix: dashboard chart dialog filters 2020-05-20 18:22:39 +05:30
Saqib Ansari
7c5e22e9d8 fix: depreciation amount not shown in asset register 2020-05-20 18:22:39 +05:30
Saqib Ansari
37c3bd2892 chore: rename onboarding to module onboarding 2020-05-20 18:22:39 +05:30
Saqib Ansari
8990697fee feat: fixed asset register based on fiscal year 
*asset value chart
 2020-05-20 18:22:39 +05:30
Saqib Ansari
3882939fd9 fix: dashboard fixtures and FAR chart 2020-05-20 18:22:38 +05:30
Saqib Ansari
ecddf3358d fix: dashboard fixtures 2020-05-20 18:22:38 +05:30
Saqib Ansari
1dcf103398 chore: enhance fixed asset report and remove redundant reports 2020-05-20 18:22:38 +05:30
Saqib Ansari
03007de4d7 fix: unexpected removal of finance book filter 2020-05-20 18:22:38 +05:30
Saqib Ansari
22aec57beb feat: asset onboarding, dashboards 2020-05-20 18:22:38 +05:30
Shivam Mishra
e091789332
feat: remove website settings from boot (#21801) 2020-05-20 16:17:12 +05:30
Anupam Kumar
ab250e4ed5
enable Allow Rename in sales stage (#21799) 2020-05-20 16:15:48 +05:30