Commit Graph

29867 Commits

Author SHA1 Message Date
Frappe PR Bot
1478282920
feat: Updated translation (#20499) 2020-02-03 14:57:43 +05:30
Deepesh Garg
943de261bb
Merge pull request #20505 from deepeshgarg007/button_shift
fix: Move E-Way bill button under create
2020-02-03 14:50:54 +05:30
Deepesh Garg
cce3ac9f79 fix: Move E-Way bill button under create 2020-02-02 21:25:58 +05:30
Deepesh Garg
c3f28db5b7
Merge pull request #20475 from ParthKharwar/dev-work-from-home-application
feat: request for work from home marked in attendance
2020-02-01 19:06:40 +05:30
Parth Kharwar
823964f3a6 fix: test added to check work from home application 2020-01-31 14:30:38 +05:30
rohitwaghchaure
ffa74ad5c1
Merge pull request #20478 from deepeshgarg007/finance-book-filter-new
fix: Do not show any finance book record if no finance book filter is applied
2020-01-31 13:19:16 +05:30
Deepesh Garg
34c33baa82 fix: Cash flow filter fix 2020-01-31 11:16:30 +05:30
Deepesh Garg
ba44f28202 fix: Filtering fixes in financial statement 2020-01-31 09:08:29 +05:30
Suraj Shetty
f3287585c0
fix(translations): Incorrect syntax (#20471)
fix(translations): Incorrect syntax
2020-01-31 07:11:19 +05:30
Deepesh Garg
ce04526db8 fix: Do not show any finance book record if no finance book filter is applied 2020-01-30 15:33:51 +05:30
Suraj Shetty
0860865763
Merge branch 'develop' into fix-incorrect-translations 2020-01-30 15:12:33 +05:30
Parth Kharwar
5342c846d2 feat: request for work from home marked in attendance 2020-01-30 13:12:56 +05:30
Deepesh Garg
8f2481d702
Merge pull request #20472 from ParthKharwar/dev-brand-breadcrumb
fix: rename breadcrumb for brand doctype to stock
2020-01-30 13:09:51 +05:30
Faris Ansari
8e131c7cad
fix: Remove translated strings from test 2020-01-30 13:03:05 +05:30
Parth Kharwar
2bccd7f717 fix: rename breadcrumb for Brand DocType from Selling to Stock 2020-01-30 12:12:42 +05:30
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
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