Himanshu Warekar
|
36d6e570c4
|
patch: try catch to handle TableMissingError
|
2019-06-19 14:43:21 +05:30 |
|
Himanshu Warekar
|
c86954ce9b
|
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
|
2019-06-19 12:03:24 +05:30 |
|
Himanshu Warekar
|
f4f7e781c5
|
debug: travis
|
2019-06-19 12:01:59 +05:30 |
|
Himanshu
|
e3168b6117
|
Merge branch 'develop' into sla_fix
|
2019-06-18 23:40:55 +05:30 |
|
Himanshu Warekar
|
2724de9320
|
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
|
2019-06-18 20:02:26 +05:30 |
|
Himanshu Warekar
|
e48ca44bf5
|
patch: fix typo
|
2019-06-18 20:02:00 +05:30 |
|
Himanshu Warekar
|
7881e838c6
|
patch: refactor patch for travis test
|
2019-06-18 19:35:50 +05:30 |
|
Himanshu Warekar
|
befd393dcb
|
fix: patch
|
2019-06-18 12:51:12 +05:30 |
|
rohitwaghchaure
|
226ff5a797
|
Merge pull request #17964 from rohitwaghchaure/bank_guarantee_project_not_found_error_develop
fix: bank guarantee, not able to select the purchase order
|
2019-06-18 11:31:01 +05:30 |
|
Deepesh Garg
|
c38e0bb75c
|
Merge pull request #17959 from deepeshgarg007/dimension-fixes
fix: Is group filter fixes in dimensions
|
2019-06-18 08:37:32 +05:30 |
|
Himanshu Warekar
|
7c18f69727
|
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
|
2019-06-17 23:53:01 +05:30 |
|
Himanshu Warekar
|
0ad3887d51
|
patch: fixes
|
2019-06-17 23:52:53 +05:30 |
|
deepeshgarg007
|
946eefe039
|
fix: Codacy fixes
|
2019-06-17 23:10:36 +05:30 |
|
Himanshu Warekar
|
bdf9737d73
|
patch: reload service level priority
|
2019-06-17 18:00:57 +05:30 |
|
Anurag Mishra
|
3d47a6dbb5
|
fix: Company filters in Total Stock Summary Report (#17965)
|
2019-06-17 17:49:04 +05:30 |
|
rohitwaghchaure
|
cfcf7ae7b6
|
Merge pull request #17960 from rohitwaghchaure/delayed_order_reports
feat: delayed order reports
|
2019-06-17 17:42:18 +05:30 |
|
Rohit Waghchaure
|
4803e817e9
|
fix: bank guarantee, not able to select the purchase order
|
2019-06-17 17:40:40 +05:30 |
|
Rushabh Mehta
|
803f784351
|
fix(minor): format date in user format for accounting dashboard
|
2019-06-17 17:33:24 +05:30 |
|
rohitwaghchaure
|
fdb79063a0
|
Merge pull request #17969 from rohitwaghchaure/enabled_disabled_buttons_on_change_of_pos_profile_develop
fix: allow edit is enabled in the pos profile still user not able to edit the rates
|
2019-06-17 17:24:29 +05:30 |
|
Mangesh-Khairnar
|
7b2a2816cd
|
Merge pull request #17950 from Anurag810/company_ui/ux_fix
fix: Make some section collapsible in company form
|
2019-06-17 17:00:00 +05:30 |
|
Rohit Waghchaure
|
7efeffa66a
|
fix: allow edit is enabled in the pos profile still user not able to edit the rates
|
2019-06-17 16:20:32 +05:30 |
|
Mangesh-Khairnar
|
57f4e817f8
|
Merge branch 'develop' into company_ui/ux_fix
|
2019-06-17 15:36:45 +05:30 |
|
deepeshgarg007
|
dfe006be19
|
Merge branch 'develop' of https://github.com/frappe/erpnext into dimension-fixes
|
2019-06-17 15:26:05 +05:30 |
|
Suraj Shetty
|
ec6afbbe99
|
Merge pull request #17953 from netchampfaris/website-theme-import
fix: Add erpnext website theme import
|
2019-06-17 12:56:24 +05:30 |
|
Rohit Waghchaure
|
725f56faca
|
feat: delayed order reports
|
2019-06-17 12:50:44 +05:30 |
|
deepeshgarg007
|
d1e0f42fea
|
fix: Styling fix
|
2019-06-17 12:47:39 +05:30 |
|
deepeshgarg007
|
7e3a98ba33
|
fix: Is group filter fixes in dimensions
|
2019-06-17 12:44:49 +05:30 |
|
Suraj Shetty
|
93fc6004ad
|
Merge pull request #17942 from netchampfaris/product-page-cart-disabled
fix: Show product page even if cart is not enabled
|
2019-06-17 12:36:09 +05:30 |
|
Suraj Shetty
|
f821b18a82
|
Merge pull request #17951 from netchampfaris/product-page-specification
fix: Remove Specifications label
|
2019-06-17 12:32:58 +05:30 |
|
Himanshu Warekar
|
67f9b63793
|
patch: get priority before reload_doc
|
2019-06-17 11:49:02 +05:30 |
|
Himanshu Warekar
|
199b43dbbb
|
fix: patch fixes for sla
|
2019-06-17 09:35:34 +05:30 |
|
Himanshu Warekar
|
c58d0317a4
|
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
|
2019-06-17 08:43:36 +05:30 |
|
rohitwaghchaure
|
2e98da8bfe
|
Merge pull request #17958 from rohitwaghchaure/revert_group_by_voucher_general_ledger_develop
fix: revert group by voucher general ledger changes
|
2019-06-17 07:43:32 +05:30 |
|
Rohit Waghchaure
|
b821af44b6
|
fix: revert group by voucher general ledger changes
|
2019-06-17 07:42:53 +05:30 |
|
Deepesh Garg
|
7793df885b
|
Merge pull request #17947 from deepeshgarg007/gstr-3b-pos-fixes
fix: GSTR-3b Report fixes
|
2019-06-16 20:03:48 +05:30 |
|
Himanshu Warekar
|
4d4732c4d1
|
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
|
2019-06-15 13:10:07 +05:30 |
|
Himanshu Warekar
|
b9ddcc4bfa
|
Merge develop into sla_fix
|
2019-06-15 13:09:57 +05:30 |
|
Faris Ansari
|
8e99aaf605
|
fix: Add erpnext website theme import
|
2019-06-14 20:06:54 +05:30 |
|
Faris Ansari
|
b2ab1031e3
|
fix: Show Clear filters when attribute filters are set
|
2019-06-14 18:16:14 +05:30 |
|
Faris Ansari
|
22642a5f45
|
fix: Homepage products styling (#17912)
|
2019-06-14 18:15:40 +05:30 |
|
rohitwaghchaure
|
7ae0f25f11
|
Merge pull request #17952 from rohitwaghchaure/added_promotional_scheme_in_selling_buying
fix: added promotional scheme in selling and buying module page
|
2019-06-14 17:31:43 +05:30 |
|
Rohit Waghchaure
|
1ecc78266c
|
fix: added promotional scheme in selling and buying module page
|
2019-06-14 17:31:15 +05:30 |
|
Faris Ansari
|
f472a49cf6
|
fix: Remove Specifications label
|
2019-06-14 16:32:21 +05:30 |
|
Anurag Mishra
|
a5527225b6
|
fix: requested changes
|
2019-06-14 15:26:19 +05:30 |
|
deepeshgarg007
|
37a717aa98
|
fix: Seperate queries for Taxable value and tax amounts
|
2019-06-14 14:30:36 +05:30 |
|
Rushabh Mehta
|
ddec4035cf
|
Merge pull request #17837 from Anurag810/hr_dashboard
feat: Dashboards for Human Resource module
|
2019-06-14 14:26:00 +05:30 |
|
Anurag Mishra
|
e87ebcaf04
|
fix: upadated employee dashboard
|
2019-06-14 14:10:48 +05:30 |
|
Anurag Mishra
|
0ae6cbdd01
|
fix: requested Changes
|
2019-06-14 14:10:48 +05:30 |
|
Anurag Mishra
|
e6dd55d9f2
|
feat: dashboards for HR module
|
2019-06-14 14:10:47 +05:30 |
|
rohitwaghchaure
|
6f6a1c8908
|
Merge pull request #17946 from Anurag810/make_stock_entry_against_purchase_receipt_3
feat: Creating stock entry against purchase receipt and some minor fixes
|
2019-06-14 13:32:22 +05:30 |
|