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

502 Commits

Author SHA1 Message Date
Suraj Shetty
1c29c520bd Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-29 13:18:57 +05:30
Mangesh-Khairnar
2f322609d7
Merge pull request #18852 from mbhavesh95863/patch-1 
fix(selling): remove redundant listing
 2019-08-29 13:12:38 +05:30
Rohit Waghchaure
354d0af44e fix: added purchase invoice in buying module 2019-08-28 17:51:31 +05:30
Suraj Shetty
be0ae7a430 fix: Doctype changes 
- Check no copy for work order series field
- Add dashboard
- Set naming_series for pick list
 2019-08-28 12:40:26 +05:30
Mangesh-Khairnar
671c20ec56
Merge branch 'develop' into patch-1 2019-08-27 22:42:35 +05:30
mbhavesh95863
cfec328c74
Same report 2 times in list 2019-08-27 19:17:19 +05:30
Harshit
56d03a456b fix: add contract to CRM module (#18817) 2019-08-23 11:34:25 +05:30
Sahil Khan
5f2c030ddc Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:22:49 +05:30
Mangesh-Khairnar
dab5b1f319 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-13 13:33:26 +05:30
Michelle Alva
af969d664f Added Employee Tax Exxxemption category and sub-category links (#18659) 2019-08-12 12:59:59 +05:30
Mangesh-Khairnar
e173d54054 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-09 13:37:51 +05:30
Faris Ansari
66064c7827 fix: Add BOM Comparison Tool to module view 2019-07-30 17:11:18 +05:30
Michelle Alva
e666b882e7 fix: added payroll period in HR module (#18500) 2019-07-27 10:03:18 +05:30
Mangesh-Khairnar
5ca3e83a00 feat: add ledger link in hr config 2019-07-25 14:35:39 +05:30
Suraj Shetty
002474367b
Merge branch 'develop' into email-campaign 2019-07-22 13:20:06 +05:30
Mangesh-Khairnar
16a0458e29 fix(procurement-tracker): concatenate filter conditions with leading whitespaces (#18440) 2019-07-22 11:16:40 +05:30
Rucha Mahabal
324ab98b99 Merge branch 'email-campaign' of https://github.com/ruchamahabal/erpnext into email-campaign 2019-07-22 03:27:29 +05:30
Rucha Mahabal
b54459e588 dash: added Email Campaign to CRM dashboard 2019-07-22 03:23:40 +05:30
Suraj Shetty
e0d8cf1851 fix: Add Employee Skill Map to HR module page 2019-07-18 15:58:50 +05:30
Faris Ansari
1abd1e79a9 fix: Module Links (#18318) 
* fix: Add Project Billing Summary link

* fix: Bank Guarantee shouldn't depend on Bank Guarantee
 2019-07-15 14:34:10 +05:30
Michelle Alva
6abb63b445 refactor: Refactor module links of Accounting, HR, Project (#18160) 2019-07-15 14:00:00 +05:30
Jamsheer
5073ac4dcb fix: Patient History (Patient Medical Record) (#17972) 
* Page - Patient History

* Healthcare Utils - get patient vitals

* Healthcare Utils - render doc as html for patient history page

* Page - Patient History -  prcatitioner image in time line

* Page - Patient History in menu

* fix - page medical history

* fix: page patient_history broken img, minor fixes

* fix: patient_history page, add pagination, show doc if fetched

* fix: Patient Medical Record to Patient History

* fix: patient history page - set route options

* fix: update to code standards

* fix: remove Eidt button form patient history

* fix: css update to code standards

* fix: Remove page medical_record
 2019-07-12 12:28:34 +05:30
Himanshu
7d1d9aa46b feat(Issue): Reset SLA (#18244) 
* feat: reset sla

* fix: db.get_single_value

* feat: timeline entry for reset sla

* fix: remove communication from support config

* fix: reset sla on split_issue
 2019-07-12 12:19:35 +05:30
Jignesh Greycube
870cbad5b2
fix: navigation link updated for Item Shortage Report 
Item Shortage Report navigation link was incorrect , hence updated.
 2019-07-11 13:56:43 +05:30
Himanshu
e7bb54ed76 feat(Issue): Settings to stop SLA tracking (#18112) 
* fix: fix msgprint when creating new issues

* fix: use getdate

* fix: do not self save

* fix: test case

* fix: error due to comparing date and str

* fix: creation time for replicated issue

* feat: sla in support settings

* fix: remove sla settings

* feat: enable check in sla

* fix: throw if sla is disabled

* fix: enable sla
 2019-07-10 17:15:59 +05:30
rohitwaghchaure
c1535a5542
Merge pull request #18167 from netchampfaris/manufacturing-module-sections 
fix(UX): Move Bill of Materials section to first
 2019-07-04 19:11:08 +05:30
Faris Ansari
1d3008750c fix(UX): Move Bill of Materials section to first 2019-07-04 17:53:10 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997) 
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
 2019-07-03 10:34:31 +05:30
Aditya Hase
d825ee57b7 fix(buying): Translate label for "Supplier Addresses And Contacts" Report 2019-06-28 14:40:59 +05:30
Himanshu
b134709aaf
Merge branch 'develop' into sla_fix 2019-06-26 16:36:51 +05:30
Faris Ansari
2ab8d3ebcc fix: Move links to appropriate section (#17999) 
* fix: Move links to appropriate section

* fix: New section Accounting Entries
 2019-06-26 13:32:41 +05:30
Himanshu Warekar
2373c095ed Merge develop into sla_fix 2019-06-25 16:27:06 +05:30
karthikeyan5
32197355ad rename(HR): Employee Attendance Log DocType to Employee Checkin 2019-06-24 15:15:38 +05:30
karthikeyan5
ceea328542 fix(HR): validations and bug fixes for Attendance Log 2019-06-24 15:15:38 +05:30
Himanshu Warekar
b9ddcc4bfa Merge develop into sla_fix 2019-06-15 13:09:57 +05:30
Rohit Waghchaure
1ecc78266c fix: added promotional scheme in selling and buying module page 2019-06-14 17:31:15 +05:30
Himanshu Warekar
a18ba9c718 Merge develop into sla_fix 2019-06-10 12:32:45 +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
Rohit Waghchaure
3cf24366a9 feat: provision to set multiple manufacturer in the item master 2019-06-06 19:53:32 +05:30
Himanshu
d0d5380cb1
Merge branch 'develop' into qmsystem 2019-06-06 15:37:04 +05:30
Himanshu Warekar
e119a713fd Merge develop into sla_fix 2019-06-06 10:46:36 +05:30
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30
deepeshgarg007
9f9516597c fix: Add chart of accounts importer in data import module 2019-05-31 10:11:46 +05:30
Himanshu Warekar
70a2734aab fix: config file for qms 2019-05-30 01:40:31 +05:30
Nabin Hait
39490ca0c5
Merge branch 'develop' into sla_fix 2019-05-27 13:59:56 +05:30
deepeshgarg007
d330519f7c fix: Merge branch develop into dimensions 2019-05-25 18:18:08 +05:30
Rushabh Mehta
7e4fb49c61 fix(minor): after manual testing 2019-05-24 11:22:31 +05:30
Himanshu Warekar
f38486b22c Merge develop into sla_fix 2019-05-20 23:25:26 +05:30
deepeshgarg007
705c03c093 fix: Added dashboard and module links for accounting dimensions 2019-05-17 10:23:00 +05:30
Himanshu Warekar
628ea47c6d Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-17 00:48:23 +05:30