Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,132 Commits 3 Branches 0 Tags 1 GiB
7483cb49fe
Commit Graph

27132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deepeshgarg007
7483cb49fe Revert "fix: GSTR-1 Report fixes" 
This reverts commit 7592e0b588ad72d3e79cd101e94102ab1c1829f0.
 2019-06-20 15:25:06 +05:30
rohitwaghchaure
d849ce7ce0
Merge pull request #17980 from adityahase/fix-buying-items-rate 
fix: Consider discount_amount only when provided to calculate rate
 2019-06-19 14:47:06 +05:30
rohitwaghchaure
40c5fcc9cc
Merge pull request #17967 from Alchez/develop-delivery-email 
fix(delivery): Add items to context for dispatch notification email
 2019-06-19 14:37:23 +05:30
Faris Ansari
2632107129
fix: User MultiSelectList control for Party filter (#17943) 
* fix: User MultiSelectList control for Party filter

The comma based filter wouldn't work for values that had comma in them

* fix: Replace with MultiSelectList in reports

* fix: Parse json instead of string split
 2019-06-19 12:15:37 +05:30
Aditya Hase
48585c94ff fix: Consider discount_amount only when provided to calculate rate 
After selecting item_code in items table and not entering rate,
Clicking elsewhere will set rate to NaN.

All DocTypes on buying side have this bug.
 2019-06-18 19:11:17 +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
deepeshgarg007
946eefe039 fix: Codacy fixes 2019-06-17 23:10:36 +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
Rohan Bansal
4babfdb987 fix(delivery): Add more context for dispatch notification email + formatting fixes 2019-06-17 16:16:51 +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
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
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
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