Commit Graph

482 Commits

Author SHA1 Message Date
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
Prasad Ramesh
067d3c0c09 fix: made Sales Partner Comission report visible in Selling module (#17602) 2019-05-16 10:18:02 +05:30
Saurabh
1d90ebb16a
Merge pull request #17579 from rmehta/remove-feedback-trigger
fix: remove link to feedback trigger
2019-05-14 14:38:30 +05:30
Basawaraj Savalagi
09bafc6d10 feat: Added Link to Blanket Orded in Selling Module Page 2019-05-13 14:59:19 +05:30
Rushabh Mehta
cb83742859 fix: remove link to feedback trigger 2019-05-13 14:19:09 +05:30
Himanshu Warekar
00a494f07b fix: change sla on priority 2019-05-03 12:44:35 +05:30
scmmishra
bf7d13a7be Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2 2019-04-24 09:50:19 +05:30
Nabin Hait
8624957cbc
Merge pull request #17291 from prasadarr/listing-fixes
fix: Allow system manager to access share ledger
2019-04-22 15:35:35 +05:30
Nabin Hait
28a7aec124
Update accounting.py 2019-04-22 15:35:13 +05:30
Prasad R
198c7ae73d fix: show 2 missing doctypes in Accounts 2019-04-19 12:43:58 +05:30
Nabin Hait
36bb3f55f2 fix: Added invoice discounting dashboard 2019-04-18 14:47:44 +05:30
scmmishra
b7d9efe901 Merged develop in lms 2019-04-09 11:39:12 +05:30
Anurag Mishra
76795aa086 fix: desk for selling module sales invoice now avaialble at module page 2019-04-04 11:38:42 +05:30
Nabin Hait
b652421a54
Merge pull request #17106 from nabinhait/loan-link
fix: Added link for loan in HR module page
2019-04-04 10:49:37 +05:30
Rushabh Mehta
43257c8cc3 fix(rename): Help Desk => Support 2019-04-02 08:59:15 +05:30
Nabin Hait
9d431a8a83 fix: Added link for Expense Claim in HR module page 2019-04-01 21:06:12 +05:30
Nabin Hait
948cc631c6 fix: Added link for loan in HR module page 2019-04-01 20:58:20 +05:30
scmmishra
233db67451 Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2 2019-03-27 18:27:05 +05:30
Frappe Bot
b07a5d449d Merge branch 'master' into develop 2019-03-23 07:25:03 +00:00
Rushabh Mehta
d562e9530e fix(link): help link in selling 2019-03-22 14:46:12 +05:30
Deepesh Garg
22b61607c6 feat: GSTR3B Report JSON creation and Print Format (#16595)
* feat: Created doctype for GSTR3B report and added boilerplate code

* feat: Updated gst_fields and patches for gst_category

* feat: Functions for calculating itc amount

* fix: Patched eligibility_for_itc_field

* fix: Updated set_category for gst

* fix: Function for setting iter_state supplies

* fix: Changed route to regional module, minor fix in inster_state_supply grouping and fixes in print format

* fix(style): Added missing semicolon and removed unused imports

* fix: Patch field only if column is available

* fix: Make custom fields only for india sepecific company

* fix: Add intro to gstr3b report

* fix: Updated patch in patches.txt

* fix: Update patches.txt

* fix: Update patch to set GST Category

* fix: Add fields for nil rated and non gst in item master

* fix: Added logic for nil rated and non gst inward flow

* fix: Initial test case for GSTR3B Report

* fix: Codacy fixes

* fix: Test Case fixes

* fix: Add link for gstr_3b_report in accounting module

* fix: Updated report template

* fix: Changes in GSTR3B Report doctype

* fix: Added function to get missing field invoices

* fix: Added more test cases

* fix: Item not found error in test case

* fix: Key error in state numbers

* fix: Changes in GSTR3b Doctype

* fix: Changed functions to method

* fix: Minor fix in patch

* fix: Add gst_ctegory in GST Reports

* fix: Minor fixes in patch and itc_mapping

* fix: Query to patch itc field

* fix: Patch registered customers and fix for multiple gst accounts

* fix: Test case

* fix: Total taxable calculation logic fix and template enhancement

* fix: Calculate txval seperately

* fix: itc amount calculation fix and patch improvement

* fix: Updated test_cases for itc calculation

* fix: Missing field query

* fix: Multiple minor fixes inreport

* fix: Added transalations in GSTR3B-Form

* fix: Use double underscore for translation

* fix: GST fields ordering fix

* fix: Print form precision fix and get_period function fix
2019-03-21 20:47:47 +05:30