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

27797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenneth Sequeira
add002bb0f fix: Make Travel Request Document Submittable (#17874) 
* make travel request submittable

* add patch

* remove patch
 2019-06-12 12:25:48 +05:30
Anurag Mishra
65c355b8c8
fix: show cost_center in print format of report trial balance (#17871) 
* fix: show cost center in print fromat of report trial balance

* fix: requested changes
 2019-06-12 11:18:13 +05:30
Suraj Shetty
2f84779667 fix: Last Communication for lead 
- Remove unused code
- Remove unused import
 2019-06-12 10:31:07 +05:30
deepeshgarg007
44ac3580d9 fix: Fix breaking patch on develop branch 2019-06-11 18:35:01 +05:30
Mangesh-Khairnar
ac9a4fe03c feat: add tax and charges in expense claim 2019-06-11 14:25:44 +05:30
Suraj Shetty
7ff124db95 fix: Show lead name when the lead calls 2019-06-11 14:21:48 +05:30
Anurag Mishra
ff99cea1c4
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 14:17:54 +05:30
Suraj Shetty
28f7c3ca3f fix: Add Make contact button 2019-06-11 12:21:30 +05:30
rohitwaghchaure
ba715feb7f
Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop 
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
 2019-06-11 11:39:48 +05:30
Anurag Mishra
0ef811d92d
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 11:14:02 +05:30
Anurag Mishra
acae7a903b fix: requested changes 2019-06-11 11:12:28 +05:30
Suraj Shetty
6013375fbb fix: Improve call popup UX 
- Close modal after 10 secs if user is has not entered any call summary
- Show alert once the summary was saved
 2019-06-11 08:03:55 +05:30
Suraj Shetty
77302b3928 fix: Save summary to right field 2019-06-11 08:01:18 +05:30
Nikita Sobolev
9e0ce99615
Improves README.md with svg badge 2019-06-10 20:19:40 +03:00
Himanshu
056f20ccaa
Merge branch 'develop' into sla_fix 2019-06-10 18:53:22 +05:30
Rohit Waghchaure
ef5dd87928 fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated) 2019-06-10 18:34:18 +05:30
rohitwaghchaure
3199f695aa
Merge pull request #17897 from rohitwaghchaure/fixed_print_format_for_ar_for_120_days_develop 
fix: accounts receivable for PDC not showing 120 days column
 2019-06-10 18:16:59 +05:30
Rohit Waghchaure
5f41a3333b fix: accounts receivable for PDC not showing 120 days column 2019-06-10 18:15:43 +05:30
deepeshgarg007
9297829804 fix: Codacy 2019-06-10 17:50:52 +05:30
deepeshgarg007
30f7e7be87 fix: Available qty not shown in item batch selector for batch 2019-06-10 17:46:16 +05:30
Deepesh Garg
ebeafa55ca fix: Total Amount fix in journal entry (#17880) 2019-06-10 17:42:52 +05:30
sahil28297
3720126ee9 fix(patch): escape illegal characters to avoid SQL syntax error (#17890) 2019-06-10 17:39:42 +05:30
Deepesh Garg
b9102bba48 fix: GSTR-1 Report fixes (#17885) 2019-06-10 17:39:23 +05:30
rohitwaghchaure
dde4f93137
Merge pull request #17881 from rohitwaghchaure/cogs_only_for_material_issue_in_ste_develop 
fix: set COGS for material issue only
 2019-06-10 16:57:23 +05:30
Suraj Shetty
a08ab14d80
Merge pull request #17887 from scmmishra/academy-lms-fixes 
fix: null cards visible on xs
 2019-06-10 14:24:23 +05:30
Himanshu Warekar
874326dc7b patch: set apply_to as customer 2019-06-10 12:33:30 +05:30
Himanshu Warekar
a18ba9c718 Merge develop into sla_fix 2019-06-10 12:32:45 +05:30
Himanshu Warekar
0b36d324ee fix: display depends for apply_to in sla 2019-06-10 11:36:51 +05:30
Himanshu Warekar
65e0ae2171 test: new test cases for sla 2019-06-10 11:24:24 +05:30
Shivam Mishra
f2bbe8af03
Merge branch 'develop' into academy-lms-fixes 2019-06-10 10:56:27 +05:30
Shivam Mishra
9510e69910 fix (lms): null cards visible on xs 2019-06-10 10:53:25 +05:30
Suraj Shetty
13770ccf7a fix: Codacy 2019-06-10 09:52:53 +05:30
Suraj Shetty
54bb3e4b9f Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-10 09:25:39 +05:30
Himanshu Warekar
88becdd869 test: test cases for sla with apply_to 2019-06-09 19:33:55 +05:30
Himanshu Warekar
0674d16fee feat: sla based on customer/group/territory 2019-06-07 15:28:42 +05:30
Rohit Waghchaure
9a792c2eed stock_entry: set COGS for material issue only 2019-06-07 15:20:36 +05:30
Shivam Mishra
f280c82083
Merge pull request #17878 from scmmishra/academy-lms-fixes 
fix: minor bugs in lms
 2019-06-07 13:44:05 +05:30
Shivam Mishra
449f261128 feat: show signup dialog for Guest 2019-06-07 13:34:59 +05:30
Shivam Mishra
8d1117cbee fix: link typo 2019-06-07 13:34:51 +05:30
Shivam Mishra
04d61717bc fix: lms card hero image no visible 2019-06-07 13:34:41 +05:30
rohitwaghchaure
74d45f40a8
Merge pull request #17876 from rohitwaghchaure/salary_slip_update_component_row_error_develop 
fix: Not able to save salary slip
 2019-06-07 12:58:25 +05:30
Suraj Shetty
f1ffdb3c12 feat: Add call sound effects 2019-06-07 12:48:13 +05:30
Suraj Shetty
6a87e3338b fix: Call popup UI 2019-06-07 11:52:39 +05:30
Rohit Waghchaure
72264697be fix: Not able to save salary slip 2019-06-07 11:46:27 +05:30
rohitwaghchaure
74f502cfa6
Merge pull request #17830 from rohitwaghchaure/multiple_manufacturer_part_no_for_items 
feat: provision to set multiple manufacturer against the item
 2019-06-07 10:24:53 +05:30
Suraj Shetty
c8c17422f7 fix: Change call log fieldname and some cleanups 2019-06-07 10:22:50 +05:30
Himanshu
2d7cbcd79f
Merge pull request #17780 from hrwX/qmsystem 
refactor(Quality): QMS refactor
 2019-06-06 20:41:25 +05:30
Rohit Waghchaure
3cf24366a9 feat: provision to set multiple manufacturer in the item master 2019-06-06 19:53:32 +05:30
Himanshu
c4366c9357
Merge branch 'develop' into qmsystem 2019-06-06 19:04:48 +05:30
Anurag Mishra
fd19678bc7 fix: show cost center in print fromat of report trial balance 2019-06-06 18:37:10 +05:30