Commit Graph

454 Commits

Author SHA1 Message Date
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
deepeshgarg007
705c03c093 fix: Added dashboard and module links for accounting dimensions 2019-05-17 10:23:00 +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
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
Himanshu
f3e5213190 feat(Support): Service Level Agreements (#16828)
* init SLA

* Added more inputs to the forms

* set priority of issue

* Removed UOM in favor of hours for tracking

* updated js to autofill values

* Removed unwanted fields

* timer functionality

* code refactor

* parenthesis fix

* fixed typo

* added new fields

* Updated fields

* Updated fields for issue doctype

* Updated fields for issue doctype

* changed doctype structure

* added new fields to issue

* code refactor

* new function to set criticality level

* changed dropdown options

* set timer for sla

* calculation of resolution and response time

* stopwatch counter

* dashboard changes

* renamed sla to support contract

* countdown timer section

* issue doctype changes

* removed unwanted imports

* fixed wrong response time and resolution time

* update response and resolution time

* calculate time to respond and resolve

* feature enhancements

* probable scheduling bug fix

* fixed scheduling issue support sent out of support time

* removed issue criticality link from support

* Changed day order

* skip date validation when support contract is default

* removed mandatory field

* fix scheduling conditions for now

* code refactor

* removed duplicate doctypes

* fixed day inserted twice in service level

* check to not add another default contract

* default support contracts

* removed commented code

* removed unused imports

* fix sla for non-listed days

* reduced redundant code and optimized it and starting unit tests

* added condition check to compute days correctly

* renamed doc as per guidelines and added conditions for scheduling

* removed per day support timings

* added response and resolution time to support contract

* scheduling based on hours kinda fix

* set sla before_update and finally fixed time scheduling out of support time

* DocType Issue removed test_records and rewrote test cases

* test cases and codacy fixes

* Doctype SLA instead of Support Contract to avoid confusion with Contract

* fixed tests failing due to change in options for time period

* change naming to Prompt

* remove unknown doctype from help_desk

* revert unwanted changes to default

* refactor get_list for fetching service_level_agreement

* change datatypes

* fix tests

* refactored tests

* remove unused imports

* code and comments refactor for better understandability

* removed and renamed doctype to service days and minor fixes

* Refactor test cases for response and resolution time for issue

* add validation to check if response time < resolution time

* minor fix for checking if current day is start day

* calculate time in js rather than python

* fix: parenthesis fixing customer dashboard

* json changes to rename sections

* refactor: alignment

* refactor: beautify code

* fix: use frm api to get the element

* fix: replace '__' with '_'

* refactor: remove pointless test
2019-03-19 16:47:56 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965)
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
2019-03-19 11:48:32 +05:30
scmmishra
b2c745827f fix: Removed accidentally added course doctype in list 2019-03-18 15:28:49 +05:30
scmmishra
34fa33d324 fix: Config bug, added type doctype 2019-03-14 15:14:25 +05:30
scmmishra
14d70ce444 chore: updated education config 2019-03-14 12:31:25 +05:30
deepeshgarg007
e062acbbd3 fix: Removed shortcuts from desktop.py 2019-03-05 17:17:10 +05:30
Prateeksha Singh
8aa4594b1e feat(modules): add onboard keys, remove hidden 2019-03-04 14:00:26 +05:30
Himanshu Warekar
3315a9fafb fix routes 2019-02-28 11:51:36 +05:30
Himanshu Warekar
1cb695b7e9 fix route for Task and Tree of Procedure 2019-02-28 11:42:36 +05:30
Rushabh Mehta
e9984672ce feat: Project Template 2019-02-26 14:30:38 +05:30
scmmishra
699f7c6fee Minor changes 2019-02-19 13:06:33 +05:30
scmmishra
18baff5fec Minor changes to question doctype
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
3cbb9795a4 Minor changes to doctypes 2019-02-19 13:06:28 +05:30
scmmishra
5311e3898c General Changes 2019-02-19 13:06:28 +05:30
scmmishra
8c41abc2df Modified education menu items 2019-02-19 13:03:59 +05:30
Prateeksha Singh
426468183f fix(getting_started): main domain specific masters 2019-02-12 13:08:21 +05:30
Prateeksha Singh
9adad2988d feat(getting_started): Minimum requirements to setup 2019-02-12 08:37:53 +05:30
Prateeksha Singh
08a6de6b41 fix(modules): shorten descriptions 2019-02-12 07:41:52 +05:30
Prateeksha Singh
9d4a183074 fix(modules): Merge Settings into one, Setup --> Settings 2019-02-11 15:14:50 +05:30
Prateeksha Singh
01a045a488 feat(modules): Add getting started and help desk 2019-02-11 14:01:04 +05:30
Nabin Hait
208ce5dcea fix: removed module type for learn 2019-02-08 12:25:30 +05:30
Prateeksha Singh
e31cdb5b85 fix(modules): add ERPNext settings module 2019-02-08 08:06:23 +05:30
Prateeksha Singh
3423407314 feat(module_links): rearrange links 2019-02-07 09:58:22 +05:30
Prateeksha Singh
9b14d46c1d purge(modules): remove old desktop icon configs 2019-02-07 09:58:22 +05:30
Prateeksha Singh
063af4ed08 config(modules): Rearrange links 2019-02-07 09:58:22 +05:30
Prateeksha Singh
b5eb16faeb feat(config): add some onboarding cues 2019-02-07 09:58:22 +05:30
Prateeksha Singh
2c14704398 feat(modules): Add Retail module, update others 2019-02-07 09:57:10 +05:30
Prateeksha Singh
7cd6ebeb6d feat(explore_page): rearrange links 2019-02-07 09:57:10 +05:30