Commit Graph

26950 Commits

Author SHA1 Message Date
Himanshu
d0d5380cb1
Merge branch 'develop' into qmsystem 2019-06-06 15:37:04 +05:30
Deepesh Garg
d07163ecf8
Merge pull request #17867 from shipmnts/develop_add_gstin_filters
fix: GSTIN filters in hsn wise summary and itemised reports
2019-06-06 13:28:39 +05:30
Himanshu Warekar
b114d9f621 test: fix test case 2019-06-06 12:14:19 +05:30
Prasann Shah
829172c267 [Add] GSTIN filters in hsn wise summary and itemised reports 2019-06-06 12:08:09 +05:30
Saurabh
6179130a54
Merge pull request #17861 from frappe/clarkejj-patch-1
fix: Update demo.html
2019-06-06 10:37:48 +05:30
Saurabh
f4b840d1ec
Merge pull request #17862 from adityahase/fix-error-report-email
fix(error-report): Do not send error reports to support@erpnext.com
2019-06-06 10:36:41 +05:30
Aditya Hase
29e77ccc00 fix(error-report): Do not send error reports to support@erpnext.com 2019-06-05 23:29:45 +05:30
John Clarke
8cb92e066d
Update demo.html
fix typo nit in page
2019-06-05 10:49:47 -06:00
Nabin Hait
68eaaa068b
fix: Removed unwanted total row from financial statement and general ledger print (#17860) 2019-06-05 20:29:24 +05:30
Mangesh-Khairnar
2bd211cc05 fix(attendance): fetch employee name (#17857) 2019-06-05 20:24:15 +05:30
Deepesh Garg
448af7bd46 fix: NoneType fixes in Lab test (#17858) 2019-06-05 20:23:23 +05:30
Rohan
bd9abc15b5 fix(projects): Remove hardcode of expected end date for new Tasks (#17717) 2019-06-05 14:17:29 +05:30
Nabin Hait
3f97fac8e1
feat: Salary rounding based on settings on salary component (#17852) 2019-06-05 13:20:08 +05:30
Aditya Hase
811bed32c1 fix(naming): Limit number of docs to be renamed to 50000 per doctype (#17827)
If total docs to be renamed goes over 100000 then the total number of
writes exceed 200000 and check_transaction_status (database.py)
raises a Validation Error

This causes failure in the job being executed currently and every single job
triggered afterwards.
2019-06-05 10:26:26 +05:30
Himanshu
4cb1a1e2e3 fix: set task weight from onboarding template (#17840) 2019-06-05 10:26:01 +05:30
Mangesh-Khairnar
da2e009990 fix(payment-order): filter already created payment entries (#17843) 2019-06-05 10:22:05 +05:30
Nabin Hait
189f4a7fff
Merge pull request #17847 from deepeshgarg007/support-analytics
fix: Remove support analytics report
2019-06-05 10:21:09 +05:30
deepeshgarg007
a87c545907 fix: Remove support analytics report 2019-06-05 09:07:42 +05:30
rohitwaghchaure
941af3f078
Merge pull request #17839 from rohitwaghchaure/fix_payment_period_based_on_invoice_date_error_develop
fix: report Payment Period Based On Invoice Date not working
2019-06-03 20:12:25 +05:30
Rohit Waghchaure
8309582cca fix: report Payment Period Based On Invoice Date not working 2019-06-03 18:23:54 +05:30
Rushabh Mehta
6744febedd
Merge pull request #17769 from deepeshgarg007/dimensions
feat: Configurable Accounting Dimensions
2019-06-03 17:00:58 +05:30
Nabin Hait
49133c5620
Merge pull request #17835 from deepeshgarg007/serial-no-devlop
fix: Serial no filtering issue for delivered items
2019-06-03 14:24:56 +05:30
Nabin Hait
37fdeee367
Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev
fix: Rounding adjustment while additional discount amount is applied on grand total
2019-06-03 13:09:04 +05:30
deepeshgarg007
545fef9934 fix: Pass delivery document no as empty string 2019-06-03 13:06:37 +05:30
Nabin Hait
2cc5fcf33b
Merge pull request #17833 from netchampfaris/issue-portal-styling
fix: Issue list portal styling
2019-06-03 13:05:53 +05:30
deepeshgarg007
853a561f11 fix: Serial no filtering issue for delivered items 2019-06-03 12:11:54 +05:30
Himanshu Warekar
9f458e3413 fix: codacy 2019-06-02 20:47:23 +05:30
Himanshu Warekar
4a7a380f0c fix: codacy 2019-06-02 19:46:44 +05:30
deepeshgarg007
6d313c72e1 fix: Remove diemnsion from value list if present 2019-06-01 23:26:42 +05:30
deepeshgarg007
e19abb162a fix: Resolve merge conflicts in purchase_receipt_item 2019-06-01 23:26:09 +05:30
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30
deepeshgarg007
223225e785 fix: Update function name 2019-06-01 23:09:04 +05:30
Faris Ansari
b8eaa3d377 fix: Issue list portal styling 2019-06-01 20:56:37 +05:30
Saurabh
011fe48ec3
Merge pull request #17823 from abhijitkumbharInd/develop
fix: Vehicle Master - Last carbon check accepting future date.(#17821)
2019-05-31 14:26:08 +05:30
Saurabh
f68bd8f349
Merge pull request #17813 from rohitwaghchaure/allow_import_for_packing_slip_develop
fix: allow import for packing slip
2019-05-31 14:24:51 +05:30
Saurabh
b6028b0495
Merge pull request #17809 from Alchez/develop-sales-analytics-total
fix(selling): Remove Totals row for Sales Analytics
2019-05-31 14:21:01 +05:30
Saurabh
731986d8ee
Merge pull request #17811 from nabinhait/pr-expense-account-dev
fix: Added Expense Account field to push value from PO-PR-PI
2019-05-31 14:19:47 +05:30
abhijitkumbharIND
39d6cf38fc fix: Vehicle Master - Last carbon check accepting future date.(#17821) 2019-05-31 14:19:04 +05:30
abhijitkumbharIND
302bce355f fix: Vehicle Master - Last carbon check accepting future date.(#17821) 2019-05-31 14:19:04 +05:30
Rohit Waghchaure
e98d1c1147 fix: allow import for packing slip 2019-05-31 14:16:11 +05:30
Deepesh Garg
bd3c60254a
Merge pull request #17819 from deepeshgarg007/module
fix: Add chart of accounts importer in data import module
2019-05-31 13:33:20 +05:30
Deepesh Garg
25857d6ee3
Merge pull request #17816 from deepeshgarg007/ar_translations_develop
fix: Add translations for missing labels in AR report
2019-05-31 12:37:36 +05:30
Saurabh
90b60cfb0d
Merge pull request #17818 from rohitwaghchaure/fixed_pos_cash_payment_modal_develop
fix: POS cash mode of payment css
2019-05-31 12:29:19 +05:30
rohitwaghchaure
09d8bb8aa9
Merge pull request #17822 from rohitwaghchaure/pricing_rule_applying_on_the_non_conditional_item
fix: pricing rule is applying on the incorrect item
2019-05-31 12:17:18 +05:30
Rohit Waghchaure
840244c562 fix: pricing rule is applying on the incorrect item 2019-05-31 12:16:35 +05:30
deepeshgarg007
9f9516597c fix: Add chart of accounts importer in data import module 2019-05-31 10:11:46 +05:30
Rohit Waghchaure
4fd704dbb6 fix: POS cash mode of payment css 2019-05-30 23:25:41 +05:30
deepeshgarg007
480586152b fix: Label translations 2019-05-30 22:34:00 +05:30
deepeshgarg007
da2e456f70 fix: Add translations for missing labels in AR report 2019-05-30 22:30:32 +05:30
rohitwaghchaure
3fa54905a2
Merge pull request #17814 from rohitwaghchaure/new_pricing_rule_not_exists_issue
fix: pricing rule not exists issue
2019-05-30 22:25:45 +05:30