Commit Graph

33190 Commits

Author SHA1 Message Date
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
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
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
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