Suraj Shetty
|
f01c3f11c8
|
Merge branch 'develop' into fix-incorrect-translations
|
2020-01-29 22:11:39 +05:30 |
|
Deepesh Garg
|
d89fbc56d9
|
Merge pull request #20464 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 (#20458)
|
2020-01-29 13:01:25 +05:30 |
|
Deepesh Garg
|
47ba65edc0
|
Merge pull request #20459 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 #20454 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 #20455 from toxnico/develop
fix: french translation correction
|
2020-01-29 08:39:38 +05:30 |
|
Pranav Nachnekar
|
c1312700e8
|
feat: create appoitnemnt against customer (#20457)
|
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 |
|
rohitwaghchaure
|
da9a3936e1
|
fix: incorrect work order qty for sub assembly items (#20449)
|
2020-01-28 14:34:27 +05:30 |
|
Nabin Hait
|
2bb3a62b1a
|
fix: cannot complete task if dependent task are not completed / cancelled (#20437)
|
2020-01-28 14:08:53 +05:30 |
|
Deepesh Garg
|
cd8d667861
|
fix: Parent company defaulting on creation of new company (#20422)
* 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 (#20431)
|
2020-01-28 12:52:13 +05:30 |
|
Marica
|
4e7625bd8f
|
fix: Column 'project' in where clause is ambiguous (#20438)
* 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 #20447 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 #20444 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 #20445 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 (#20332)
|
2020-01-27 16:05:55 +05:30 |
|
Parth J. Kharwar
|
011c13b3cc
|
fix: employee checkin doctype time permissions (#20403)
|
2020-01-27 16:03:24 +05:30 |
|
gavin
|
5e39968878
|
chore: update discuss.frappe.io link in template (#20412)
|
2020-01-27 15:26:02 +05:30 |
|
Shivam Mishra
|
149b4e5985
|
chore: warn bom naming conflict (#20244)
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 (#20410)
* 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 (#20369)
|
2020-01-27 14:22:43 +05:30 |
|
Deepesh Garg
|
808f917832
|
Merge pull request #20416 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 (#20373)
|
2020-01-24 16:22:49 +05:30 |
|
Anurag Mishra
|
ce00f6cf70
|
fix: Duplicate Attendance Due Wrong Date format (#20390)
|
2020-01-24 16:14:50 +05:30 |
|
Rucha Mahabal
|
0a27c98a99
|
fix(Healthcare): disabled Lab Test Template shown as Enabled in List View (#20378)
* 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 (#20383)
|
2020-01-24 15:52:27 +05:30 |
|
Rucha Mahabal
|
72c3dd1d11
|
fix: healthcare settings registration fee NoneType error (#20395)
|
2020-01-24 15:50:44 +05:30 |
|
Frappe PR Bot
|
84afdfdb4c
|
feat: Updated translation (#20404)
|
2020-01-24 14:21:53 +05:30 |
|
rohitwaghchaure
|
573de02f60
|
Merge pull request #20398 from rohitwaghchaure/fixed_serial_no_button_not_working_develop
fix: add serial no button not working
|
2020-01-24 13:49:41 +05:30 |
|
Deepesh Garg
|
60e8d52f32
|
Merge pull request #20401 from deepeshgarg007/general_ledger_sort
fix: Order GL entries by creation time in General ledger
|
2020-01-24 13:19:39 +05:30 |
|
Deepesh Garg
|
1e77a1374d
|
Merge pull request #20393 from rohitwaghchaure/unlink_reference_name_from_batch_on_cancel_of_stock_transactions_develop
fix: unlink references from batch on cancellation of stock transactions
|
2020-01-23 22:40:26 +05:30 |
|
Rohit Waghchaure
|
8996b7d8a4
|
delete the auto created batch
|
2020-01-23 17:44:19 +05:30 |
|
deepeshgarg007
|
fdba26d476
|
fix: Order GL entries by creation time in General ledger
|
2020-01-23 17:42:57 +05:30 |
|
Rohit Waghchaure
|
067e8ad50d
|
fix: add serial no button not working
|
2020-01-23 15:49:39 +05:30 |
|
Deepesh Garg
|
f2d3bd71c9
|
Merge pull request #20356 from abhijitkumbharInd/develop
fix: Gives a 404 error when clicked on the Download Required Material…
|
2020-01-23 15:45:42 +05:30 |
|
Deepesh Garg
|
1d279c30bb
|
Merge pull request #20386 from rohitwaghchaure/fixed_lead_date_comparision_issue_develop
fix: lead date comparison issue
|
2020-01-23 15:22:53 +05:30 |
|
Deepesh Garg
|
b83f5cee6c
|
Merge pull request #20388 from rohitwaghchaure/lead_showing_two_times_in_the_report_develop
fix: lead details duplicate entries
|
2020-01-23 15:20:47 +05:30 |
|