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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
deepeshgarg007
|
c62518c094
|
Merge branch 'develop' of https://github.com/frappe/erpnext into gstr-3b-pos-fixes
|
2019-06-14 13:14:51 +05:30 |
|
deepeshgarg007
|
8f04f6c631
|
fix: GSTR-3b Report fixes
|
2019-06-14 13:08:09 +05:30 |
|
Anurag Mishra
|
4c1639305f
|
feat: creating stock entry against purchase receipt
|
2019-06-14 12:31:08 +05:30 |
|
Deepesh Garg
|
b095d0a0c5
|
fix: GSTR-2 Report fixes (#17903)
|
2019-06-14 12:02:36 +05:30 |
|
Deepesh Garg
|
459155fae1
|
fix: GST Validation for UIN and OIDAR (#17866)
* fix: GST Validation for UIN and OIDAR
* fix: Define GST category
* fix: Get gst category only for Customer and Supplier
* fix: GST validation
* fix: GST validation fixes
|
2019-06-14 12:01:34 +05:30 |
|
Rushabh Mehta
|
35bb7b8761
|
Merge pull request #17369 from alyf-de/datev_report
feat(regional): Report for German tax consultants (DATEV)
|
2019-06-14 12:00:04 +05:30 |
|
rohitwaghchaure
|
a030138df8
|
fix: trial balance opening balance not showing in the debit side for the liability account (#17944)
|
2019-06-14 11:57:14 +05:30 |
|
Anurag Mishra
|
122cdaf87b
|
fix: column width (#17935)
|
2019-06-14 11:29:18 +05:30 |
|
Anurag Mishra
|
88cd502841
|
fix: company form (#17939)
|
2019-06-14 11:26:29 +05:30 |
|
Saurabh
|
0d50523723
|
Merge pull request #17941 from nabinhait/salary-slip-amount-dev
fix: salary slip amount calculation based on formula
|
2019-06-14 11:19:31 +05:30 |
|
Rushabh Mehta
|
b74454e501
|
Merge pull request #17894 from deepeshgarg007/serial_no_batch_selector_develop
fix: Available qty not shown in item batch selector for batch
|
2019-06-14 10:51:34 +05:30 |
|
Nabin Hait
|
a2caf884fe
|
fix: salary slip amount calculation based on formula
|
2019-06-13 19:44:21 +05:30 |
|
Shivam Mishra
|
1b5a54900c
|
Merge pull request #17933 from Anurag810/billing_summary_fixes
fix: column sequence and add total hours
|
2019-06-13 17:26:56 +05:30 |
|
rohitwaghchaure
|
da0d056a06
|
Merge pull request #17924 from rohitwaghchaure/cost_center_added_in_the_opening_invoice_creation
feat: added cost center in the opening invoice creation tool
|
2019-06-13 16:27:18 +05:30 |
|
rohitwaghchaure
|
95c88a5e95
|
Merge pull request #17932 from rohitwaghchaure/fixed_pos_not_overriding_the_taxes_develop
fix: taxes are not overriding after changing the tax template for the POS invoice
|
2019-06-13 16:26:11 +05:30 |
|
Shivam Mishra
|
4def9836e0
|
Merge branch 'develop' into bom-item-fix
|
2019-06-13 16:17:54 +05:30 |
|
Anurag Mishra
|
05c17a505c
|
fix: column sequence and add total
|
2019-06-13 16:08:01 +05:30 |
|
Rohit Waghchaure
|
033ed93586
|
fix: taxes are not overriding after changing the taxes template
|
2019-06-13 15:47:42 +05:30 |
|
Mangesh-Khairnar
|
b2f266ad10
|
fix: get bom item when company is not passed
|
2019-06-13 14:34:40 +05:30 |
|
Faris Ansari
|
00578ba632
|
fix: Show product page even if cart is not enabled
|
2019-06-13 13:30:39 +05:30 |
|
Rohit Waghchaure
|
02ae934d5c
|
feat: added cost center in the opening invoice creation tool
|
2019-06-13 12:00:30 +05:30 |
|
Deepesh Garg
|
0d7d4879a9
|
Merge pull request #17920 from Anurag810/stock_balance_report
fix: fetch item on the base of item group
|
2019-06-13 10:49:30 +05:30 |
|
Anurag Mishra
|
bbe2c4fb01
|
fix: fetch item on the base of item group
|
2019-06-12 19:09:51 +05:30 |
|
Deepesh Garg
|
a3c0d2768e
|
Merge branch 'develop' into serial_no_batch_selector_develop
|
2019-06-12 17:21:23 +05:30 |
|
Shivam Mishra
|
d9aabb83cd
|
Merge branch 'develop' into lms-link-fix
|
2019-06-12 17:21:05 +05:30 |
|
Shivam Mishra
|
b94b1febee
|
refactor: topic card redirects to login
|
2019-06-12 17:20:33 +05:30 |
|
Rushabh Mehta
|
26dba8bb89
|
Merge pull request #17801 from deepeshgarg007/dashboards
fix: Dashboards for doctypes in accounts module
|
2019-06-12 17:15:58 +05:30 |
|
sahil28297
|
deef0908d7
|
Merge branch 'develop' into education-test-fixes
|
2019-06-12 16:59:58 +05:30 |
|
Shivam Mishra
|
147d5d9bf2
|
fix: redirect to lms home if query params not set
|
2019-06-12 16:01:02 +05:30 |
|
Deepesh Garg
|
9c3d2eeb1f
|
Merge branch 'develop' into serial_no_batch_selector_develop
|
2019-06-12 15:54:44 +05:30 |
|