Commit Graph

31310 Commits

Author SHA1 Message Date
Suraj Shetty
4d9132e535 Merge branch 'fix-incorrect-translations' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-30 10:47:31 +05:30
Suraj Shetty
082020184a Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-30 10:46:11 +05:30
Raffael Meyer
e21cd5e7f1 fix: account number for "Kasse" 2020-01-29 23:39:55 +01:00
Raffael Meyer
3716434218 fix: add missing account types 2020-01-29 22:21:19 +01:00
Rucha Mahabal
be29a24de5 refactor: Patient master 2020-01-29 22:22:39 +05:30
Suraj Shetty
f01c3f11c8
Merge branch 'develop' into fix-incorrect-translations 2020-01-29 22:11:39 +05:30
Deepesh Garg
d89fbc56d9
Merge pull request from Alchez/dev-wfh
feat(hr): add work from home option in status
2020-01-29 20:12:40 +05:30
Diksha
480d52c6f3 feat(attendance): add work from home option in status 2020-01-29 17:46:27 +05:30
Suraj Shetty
da2c69e836 fix(translations): Incorrect syntax 2020-01-29 15:34:06 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Pranav Nachnekar
d64135b2d2
fix: linking party in calendar event of appointment () 2020-01-29 13:01:25 +05:30
Rucha Mahabal
a4202d1660 fix: disabled patient shown as enabled 2020-01-29 11:33:29 +05:30
Deepesh Garg
47ba65edc0
Merge pull request from 0Pranav/fix-supplier-quotation-button
fix: missing plus button in request for quotaion for supplier quotation
2020-01-29 10:46:21 +05:30
Deepesh Garg
565a810bf7
Merge pull request from marination/stock-ledger-qty-column
fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger
2020-01-29 09:49:55 +05:30
Deepesh Garg
b61b8d7ced
fix: Remove comma 2020-01-29 09:49:26 +05:30
0Pranav
d4c0184f3f fix: missing plus button in request for quotaion for supplier quotation 2020-01-29 09:32:40 +05:30
Deepesh Garg
217517a61f
Merge pull request from toxnico/develop
fix: french translation correction
2020-01-29 08:39:38 +05:30
Rucha Mahabal
c7417c08ed refactor: Healthcare Settings 2020-01-28 18:06:23 +05:30
Pranav Nachnekar
c1312700e8 feat: create appoitnemnt against customer () 2020-01-28 17:50:47 +05:30
Nicolas Simonnet
10ffaf4e89 french translation correction 2020-01-28 11:45:57 +01:00
marination
372c5e51d5 fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger 2020-01-28 16:04:49 +05:30
Khushal Trivedi
33dd5bf717 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-01-28 15:10:27 +05:30
rohitwaghchaure
da9a3936e1 fix: incorrect work order qty for sub assembly items () 2020-01-28 14:34:27 +05:30
Nabin Hait
2bb3a62b1a
fix: cannot complete task if dependent task are not completed / cancelled () 2020-01-28 14:08:53 +05:30
Anurag Mishra
3496104ebe fix: odometer value was not syncing properly 2020-01-28 13:11:49 +05:30
Deepesh Garg
cd8d667861 fix: Parent company defaulting on creation of new company ()
* fix: Parent company defaulting on creation of new company

* fix: Test Cases

* fix: Test Cases

* fix: Test Cases for staffing plan
2020-01-28 12:54:45 +05:30
Pranav Nachnekar
3fb48ebf61 fix: discounting not applied on sales invoice created by subscriptions () 2020-01-28 12:52:13 +05:30
Marica
4e7625bd8f fix: Column 'project' in where clause is ambiguous ()
* fix: Column 'project' in where clause is ambiguous

* fix: Fixed alias in query
2020-01-28 12:43:38 +05:30
Deepesh Garg
0c31d62edd
Merge pull request from Alchez/dev-driver-address-fetch
fix: only fetch driver address if not set (develop)
2020-01-28 09:20:26 +05:30
Deepesh Garg
04700049da
Merge pull request from fproldan/fix_sqlinjection_develop
fix: SQL Injection in get_product_list_for_group method
2020-01-28 09:18:42 +05:30
Don-Leopardo
f6d5073832
Merge branch 'develop' into fix_sqlinjection_develop 2020-01-27 13:56:01 -03:00
rohitwaghchaure
7fda3a12cc
Merge pull request from rohitwaghchaure/copy_to_warehouse_to_target_warehouse_in_delivery_note_item
fix: to warehouse not set in the customer warehouse
2020-01-27 19:29:19 +05:30
Rohan Bansal
ce17a546b9 fix: only fetch driver address if not set 2020-01-27 18:08:11 +05:30
Rohit Waghchaure
2dff28498f fix: to warehouse not set in the customer warehouse 2020-01-27 17:56:25 +05:30
NahuelOperto
be1895fd08 Fix sql injection 2020-01-27 09:02:02 -03:00
Saqib
e009187e02 refac: filters and columns of fixed asset register report () 2020-01-27 16:05:55 +05:30
Parth J. Kharwar
011c13b3cc fix: employee checkin doctype time permissions () 2020-01-27 16:03:24 +05:30
gavin
5e39968878 chore: update discuss.frappe.io link in template () 2020-01-27 15:26:02 +05:30
Shivam Mishra
149b4e5985 chore: warn bom naming conflict ()
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-01-27 15:20:30 +05:30
Deepesh Garg
ef41a0eda5 fix: Finance book filtering in financial statements ()
* fix: Finance book filtering in financial statements

* fix: Use IS NULL instead of ifnull
2020-01-27 15:18:51 +05:30
Saqib
9cb02bf2e1 fix: incorrect status for fraction of outstanding amount () 2020-01-27 14:22:43 +05:30
Deepesh Garg
808f917832
Merge pull request from hrwX/customer_primary_addr_v13
fix(Customer): Change `primary_address` fieldtype to Text
2020-01-27 12:32:55 +05:30
Himanshu Warekar
e169d2964c fix: change fieldtype to Text 2020-01-24 17:40:29 +05:30
Saqib
9291df4d4c fix: wrong outstanding invoices fetched against employee () 2020-01-24 16:22:49 +05:30
Anurag Mishra
ce00f6cf70 fix: Duplicate Attendance Due Wrong Date format () 2020-01-24 16:14:50 +05:30
Rucha Mahabal
0a27c98a99 fix(Healthcare): disabled Lab Test Template shown as Enabled in List View ()
* fix (Healthcare): disabled Lab Test Template shown as enabled in List View

* fix: remove custom disabled button and unhide disabled field
2020-01-24 16:12:08 +05:30
Marica
40dffab79e fix: Product Page non-stock item status () 2020-01-24 15:52:27 +05:30
Rucha Mahabal
72c3dd1d11 fix: healthcare settings registration fee NoneType error () 2020-01-24 15:50:44 +05:30
Frappe PR Bot
84afdfdb4c feat: Updated translation () 2020-01-24 14:21:53 +05:30