Commit Graph

1447 Commits

Author SHA1 Message Date
Rohit Waghchaure
5fa9a7a1b4 feat: unlink advance payment entry on cancelation of order 2019-04-01 00:40:38 +05:30
Rohit Waghchaure
c7b916ac46 fix: test cases 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
4389cf0c48 feat: provision to make Maintenance Schedule from sales invoice 2019-03-26 12:52:32 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +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
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +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
Rohit Waghchaure
5b43e2f31a code cleanup 2019-03-18 17:00:44 +05:30
Rohit Waghchaure
ace95d5a67 feat: added cost center filter in AR/AP reports 2019-03-18 12:21:00 +05:30
Rohan Bansal
82433845e5 fix(transaction): Add link to payments made by Customer / Supplier in their dashboards 2019-03-14 13:18:55 +05:30
Himanshu Warekar
7ab961f798 remove debug code 2019-03-06 23:53:38 +05:30
Himanshu Warekar
59699bf46e [debug] locally tests passed but travis failed 2019-03-06 23:33:03 +05:30
Himanshu Warekar
4f1737c2dd fix sales order test for creating work order from sales order 2019-03-06 22:19:15 +05:30
Himanshu Warekar
783331c645 sales_order to work_order item desc fix 2019-03-06 18:44:04 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +05:30
deepeshgarg007
de0f59b818 fix: Removed precision from multiple doctypes 2019-02-19 08:40:16 +05:30
Rushabh Mehta
39c106dd05 fix(test): rename test in test_customer 2019-02-18 11:16:59 +05:30
Rushabh Mehta
c8018bdeb1 fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891 2019-02-09 21:10:29 +05:30
Saif Ur Rehman
1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/patches.txt
2019-02-01 19:17:04 +05:00
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Deepesh Garg
a8cc4b105d
Merge branch 'staging-fixes' into pos_issue 2019-01-29 11:29:41 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode 2019-01-29 11:13:04 +05:30
deepeshgarg007
0bee62b460 fix: Made period fields read only and added validation for multiple entries by same user 2019-01-28 12:45:11 +05:30
deepeshgarg007
c2ffcc5e71 feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher 2019-01-27 16:09:07 +05:30
Saif Ur Rehman
37d7b80572 Merge branch 'Item-Tax-Template' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/patches.txt
#	erpnext/selling/doctype/sales_order/sales_order.json
2019-01-24 23:41:35 +05:00
Saif Ur Rehman
3d275af67b Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json
2019-01-24 23:40:16 +05:00
Saif Ur Rehman
d5c7410ad1 Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json
#	erpnext/selling/doctype/sales_order/sales_order.json
2019-01-24 23:34:16 +05:00
Frappe Bot
e415cce1a9 Merge branch 'staging' into develop 2019-01-23 08:19:00 +00:00
Nabin Hait
4ef578e1c4
Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports
fix: Multiple fixes in the reports
2019-01-23 12:05:36 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Saif Ur Rehman
74a3370095 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Sagar Vora
ceacacc320 Merge branch 'master' into staging-fixes 2019-01-22 15:37:05 +05:30
Deepesh Garg
f7fe08c487
Merge branch 'develop' into email_digest 2019-01-20 16:53:41 +05:30
Saif Ur Rehman
398f593e5f Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/patches.txt
2019-01-18 17:33:19 +05:00
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Rohit Waghchaure
fa7ee0b3b6 Added dafult bank account in the customer/supplier 2019-01-17 15:45:27 +05:30
Nabin Hait
4fd710a392
Merge branch 'staging-fixes' into company_address 2019-01-16 17:51:49 +05:30
Nabin Hait
3dde949419 feat(mr_against_so): Merge same items from different BOMs 2019-01-16 15:59:39 +05:30
Sahil Khan
34766c0c50 BIS issue fixes 2019-01-16 15:59:39 +05:30
Deepesh Garg
7bb7f95aa8
Merge branch 'staging-fixes' into company_address 2019-01-16 11:17:55 +05:30
Nabin Hait
f0571ddf4b
Merge pull request #16393 from diamorafaela/quotation-currency
fix: Quotation to Sales Order with different currency
2019-01-16 10:13:44 +05:30
Saurabh
7d630b3e29 Merge branch 'master' into staging-fixes 2019-01-15 19:41:09 +05:30
NahuelOperto
9080221d46 fix: added test cases 2019-01-14 12:12:56 -03:00
Saif Ur Rehman
502f15ba1b test: test_party_details_tax_category 2019-01-12 19:07:39 +05:00
NahuelOperto
7facc34851 fix: removed filter from method validate 2019-01-11 10:46:38 -03:00
Saif Ur Rehman
8d61794540 Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/item/item.json
2019-01-10 04:23:40 +05:00
deepeshgarg007
8621869d24 Created multiple reports and linked them to email digest 2019-01-09 21:56:45 +05:30
Deepesh Garg
9c5e9d79f1
Merge branch 'staging-fixes' into company_address 2019-01-09 17:19:20 +05:30
deepeshgarg007
d29ee97307 Addition of GST fields in Sales Order,Purchase Order,Purchase Receipt 2019-01-09 17:09:11 +05:30