Shivam Mishra
|
4cd4109905
|
Merge branch 'develop' into woocommerce-shipping
|
2020-05-18 13:50:31 +05:30 |
|
Anurag Mishra
|
57bfee8ea9
|
fix: dashboard changes
|
2020-05-18 13:27:15 +05:30 |
|
Rucha Mahabal
|
1ac2512c73
|
refactor: desk page colors and filters
|
2020-05-18 12:55:05 +05:30 |
|
Rohit Waghchaure
|
1c9210b303
|
made changes in the dashboards, renamed number cards
|
2020-05-18 11:57:25 +05:30 |
|
Rohit Waghchaure
|
366bce678f
|
added onboarding for manufacturing
|
2020-05-18 11:57:25 +05:30 |
|
Rohit Waghchaure
|
34f4a2398b
|
feat: manufacturing dashboards
|
2020-05-18 11:57:25 +05:30 |
|
Deepesh Garg
|
a8807e2696
|
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes
|
2020-05-18 11:52:39 +05:30 |
|
Nabin Hait
|
31b8be6c41
|
Merge branch 'accounts_dashboard' of https://github.com/deepeshgarg007/erpnext into deepeshgarg007-accounts_dashboard
|
2020-05-18 11:31:30 +05:30 |
|
Deepesh Garg
|
1e7bc3a97e
|
Merge pull request #21758 from frappe/revert-21655-bugfix/zero-threshold-in-tax-withholding-category
Revert "fix(accounting): Allow 0 threshold in Tax Withholding Category"
|
2020-05-18 11:28:56 +05:30 |
|
Deepesh Garg
|
ec8c28e487
|
Revert "fix(accounting): Allow 0 threshold in Tax Withholding Category"
|
2020-05-18 11:27:38 +05:30 |
|
Shivam Mishra
|
2a2937bcbe
|
Merge branch 'develop' into woocommerce-shipping
|
2020-05-18 11:19:45 +05:30 |
|
Marica
|
f4f307c36a
|
fix: Patch to set status in old serial no data (#21720)
* fix: Patch to set status in old serial no data
* fix: Avoid get_doc in patch
* fix: fetch all values and check status in one query
|
2020-05-18 11:18:44 +05:30 |
|
Nabin Hait
|
1862f5f29a
|
feat: Payroll based on employee cost center (#21609)
|
2020-05-18 07:37:04 +05:30 |
|
Deepesh Garg
|
a63fda9097
|
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes
|
2020-05-17 23:37:05 +05:30 |
|
Deepesh Garg
|
5ccefdc08a
|
fix: Patch to update old loans
|
2020-05-17 23:26:59 +05:30 |
|
Deepesh Garg
|
513099d624
|
fix: Description for various fields
|
2020-05-17 23:26:37 +05:30 |
|
Rucha Mahabal
|
b6a605864b
|
Merge pull request #21290 from akurungadam/multi_company
feat(Healthcare): support for Multi Company
|
2020-05-17 23:22:21 +05:30 |
|
Rucha Mahabal
|
9e8414798c
|
Merge branch 'develop' into multi_company
|
2020-05-17 22:53:03 +05:30 |
|
Rucha Mahabal
|
53934b7e3b
|
fix: failing test due to inpatient record
|
2020-05-17 22:44:19 +05:30 |
|
Rucha Mahabal
|
d3a5df2202
|
fix: codacy issues
|
2020-05-17 22:34:42 +05:30 |
|
Rucha Mahabal
|
2888e12dfc
|
fix: vital signs title field
|
2020-05-17 22:23:53 +05:30 |
|
Rucha Mahabal
|
30314f18f7
|
fix: patient appointment title
|
2020-05-17 22:06:02 +05:30 |
|
Rucha Mahabal
|
40d49306d3
|
fix: pass ignore_mandatory flag when updating customer from patient
|
2020-05-17 21:46:42 +05:30 |
|
Raffael Meyer
|
3bce13eaa2
|
fix: remove guest access (#21693)
|
2020-05-17 20:58:37 +05:30 |
|
rohitwaghchaure
|
8e3fc5ee6e
|
fix: incorrect stock valuation for repack entry (#21736)
|
2020-05-17 20:28:39 +05:30 |
|
Anurag Mishra
|
779fc898b1
|
fix: Future date half day validation (#21718)
* fix: Future date half day validation
* fix: Allow half day attendance only via leave application
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
|
2020-05-17 20:18:30 +05:30 |
|
Rucha Mahabal
|
e83d1d221d
|
Merge branch 'develop' into multi_company
|
2020-05-17 20:02:12 +05:30 |
|
Shivam Mishra
|
bdc97e6b48
|
Merge branch 'develop' into woocommerce-shipping
|
2020-05-16 19:40:45 +05:30 |
|
Shivam Mishra
|
d69e3eb5d7
|
feat: use name instead of customer name to link address and contact
|
2020-05-16 19:37:03 +05:30 |
|
Shivam Mishra
|
180bda7618
|
refactor: return address and contact objects
|
2020-05-16 19:20:55 +05:30 |
|
Shivam Mishra
|
fc514ba940
|
feat: save contact to woocommerce
|
2020-05-16 19:19:18 +05:30 |
|
Deepesh Garg
|
bf16956d10
|
Merge pull request #21656 from kevingdc/bugfix/tax-withholding-category-description
fix(accounting): Tax Withholding Category Description default
|
2020-05-16 18:07:45 +05:30 |
|
Deepesh Garg
|
2a0e3e3515
|
fix: Remove strip
|
2020-05-16 18:07:03 +05:30 |
|
Deepesh Garg
|
2567815b03
|
Merge pull request #21655 from kevingdc/bugfix/zero-threshold-in-tax-withholding-category
fix(accounting): Allow 0 threshold in Tax Withholding Category
|
2020-05-16 17:55:51 +05:30 |
|
rohitwaghchaure
|
7435174300
|
Merge pull request #21747 from rohitwaghchaure/fix-supplier-schema-save-issue
fix: promotional scheme not able to save
|
2020-05-16 11:34:23 +05:30 |
|
Rohit Waghchaure
|
49dbbdc4cb
|
fix: promotional scheme not able to savce
|
2020-05-16 04:59:59 +05:30 |
|
marination
|
75c65fd1b1
|
fix: Handle empty chart state and change desk dashboard
|
2020-05-15 23:47:51 +05:30 |
|
marination
|
a74d433cd8
|
fix: Fixed Dashboard Charts, modified fixtures and minor changes
|
2020-05-15 23:37:48 +05:30 |
|
marination
|
e46916be56
|
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-dashboard
|
2020-05-15 21:17:25 +05:30 |
|
rohitwaghchaure
|
5cfbdf4bcb
|
fix: user not able to view product (#21740)
|
2020-05-15 19:36:23 +05:30 |
|
Deepesh Garg
|
7be71c88f2
|
fix: Better validation message for group accounts (#21725)
|
2020-05-15 19:23:41 +05:30 |
|
Deepesh Garg
|
1b821fec4b
|
Merge pull request #21742 from nextchamp-saqib/payment-remark-fix
fix: update remark on submitting payment entry
|
2020-05-15 17:48:51 +05:30 |
|
Saqib Ansari
|
03d165ff79
|
fix: update remark on submitting payment entry
|
2020-05-15 16:39:02 +05:30 |
|
Deepesh Garg
|
a812ad7555
|
Merge pull request #21699 from nextchamp-saqib/pur-inv-status-fix
fix: purchase inv shows overdue for fraction of outstanding
|
2020-05-15 15:46:23 +05:30 |
|
marination
|
ec1f9594fa
|
fix: Refined Onboarding, desk cards and renamed field in Buying Settings
|
2020-05-15 15:17:11 +05:30 |
|
Deepesh Garg
|
5ee8327415
|
Merge pull request #21729 from nabinhait/basic-hra-comp
fix: Submit perm for other income and removed caching while getting hra and basic from company
|
2020-05-15 14:44:37 +05:30 |
|
Saqib Ansari
|
940856cc16
|
fix: add tests for set_status
|
2020-05-15 14:30:24 +05:30 |
|
rohitwaghchaure
|
2ee400989b
|
Merge pull request #21273 from marination/quoted-item-report
refactor: Quoted Item Comparison Report
|
2020-05-15 13:47:48 +05:30 |
|
marination
|
2a73b3ef25
|
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-dashboard
|
2020-05-15 13:40:46 +05:30 |
|
marination
|
be5c45a9ae
|
chore: Fixtures and empty state handling in chart widgets
|
2020-05-15 13:21:58 +05:30 |
|