Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,618 Commits 3 Branches 0 Tags
Commit Graph

28618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Himanshu Warekar
199b43dbbb fix: patch fixes for sla 2019-06-17 09:35:34 +05:30
Suraj Shetty
a86a07ef37 fix: Add additional check to ensure doc_before save exists 2019-06-17 09:29:46 +05:30
Suraj Shetty
eb0ca67ced fix: Caller name in call popup 2019-06-17 08:59:12 +05:30
Suraj Shetty
5ea6a5e33a fix: Decouple call popup from exotel 2019-06-17 08:46:38 +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
Suraj Shetty
3fdeffff7a feat: Add medium field in call log doctype 2019-06-17 08:27:00 +05:30
Suraj Shetty
be1dddd596 feat: Add call recording URL field to call log 2019-06-17 08:06:14 +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
Rohit Waghchaure
059890ecef Test cases for batch no 2019-06-14 17:24:47 +05:30
Faris Ansari
f472a49cf6 fix: Remove Specifications label 2019-06-14 16:32:21 +05:30
Mangesh-Khairnar
1db0fc91a5 fix: check generated ledger entries to avoid overlap 2019-06-14 15:48:31 +05:30
Mangesh-Khairnar
fefdac432c refactor: add json changes 2019-06-14 15:39:50 +05:30
Mangesh-Khairnar
24fbe23c8d fix: add indicators for expire in the leave allocation list 2019-06-14 15:36:26 +05:30
Anurag Mishra
a5527225b6 fix: requested changes 2019-06-14 15:26:19 +05:30
Mangesh-Khairnar
87adaed933 fix: generate ledger entries for all leave transactions 2019-06-14 15:13:53 +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
Mangesh-Khairnar
6726dea88b style: change formatting 2019-06-14 11:17:17 +05:30
Mangesh-Khairnar
4e1b60d401 style: change formatting 2019-06-14 11:15:54 +05:30
Rushabh Mehta
5a02aa0d5c
Merge pull request #17900 from sobolevn/patch-1 
fix: Improves README.md with svg badge
 2019-06-14 10:52:20 +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
Mangesh-Khairnar
f8bf57c956 fix: remove transaction section head 2019-06-13 18:09:23 +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
Suraj Shetty
7877ef22ba Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog 2019-06-13 17:13:59 +05:30
Suraj Shetty
06f8034542 refactor: Remove redundant code 2019-06-13 17:13:54 +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