Marica
|
1a25aa83de
|
fix: Delete Auto Email Reports (#22009)
|
2020-05-28 18:16:24 +05:30 |
|
Shivam Mishra
|
fa0b73ce25
|
refactor: clean up desk pages (#22004) (#22007)
* refactor: clean up desk pages
* refactor: update label for CRM
|
2020-05-28 15:20:22 +05:30 |
|
mergify[bot]
|
fd351f8268
|
fix: set fiscal year for Profit and Loss chart (#22006)
(cherry picked from commit 4afda7601574a93e9232d06341556dbcf0f142ab)
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
|
2020-05-28 15:18:47 +05:30 |
|
Deepesh Garg
|
82c6b9a9be
|
Merge pull request #22005 from scmmishra/fix-dashboard
fix: set fiscal year for Profit and Loss chart
|
2020-05-28 15:10:27 +05:30 |
|
Shivam Mishra
|
4afda76015
|
fix: set fiscal year for Profit and Loss chart
|
2020-05-28 15:06:38 +05:30 |
|
Shivam Mishra
|
6621e22c02
|
refactor: clean up desk pages (#22004)
* refactor: clean up desk pages
* refactor: update label for CRM
|
2020-05-28 14:48:50 +05:30 |
|
mergify[bot]
|
2f45fad47d
|
CRM dashboard fixes (#21989) (#22003)
(cherry picked from commit f10771029a88f987795eb46e5081cb109b1a8d6f)
Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
|
2020-05-28 14:43:38 +05:30 |
|
rohitwaghchaure
|
af91e13435
|
Merge pull request #22001 from nextchamp-saqib/price-rule-date-field-fix
fix: transaction date not found in sales invoice
|
2020-05-28 14:38:13 +05:30 |
|
Rucha Mahabal
|
3a51a97b2d
|
Merge branch 'develop' into sla-enhancements
|
2020-05-28 14:33:51 +05:30 |
|
Rucha Mahabal
|
376a46f1e5
|
test: hold time for Replied status
|
2020-05-28 14:33:30 +05:30 |
|
Rucha Mahabal
|
c8e8e29083
|
test: Issue Metrics
|
2020-05-28 13:48:09 +05:30 |
|
Deepesh Garg
|
cfcdd52bf4
|
fix: Inter-company Invoice currency for multicurrency transactions (#21984)
|
2020-05-28 13:35:29 +05:30 |
|
Anupam Kumar
|
f10771029a
|
CRM dashboard fixes (#21989)
|
2020-05-28 13:34:55 +05:30 |
|
Mangesh-Khairnar
|
706524f1ae
|
fix: make transaction date of the oldest transaction as the last integration date (#22000)
* fix: make transaction date of the oldest transaction as the last integration date
* chore: remove blank line after docstring
|
2020-05-28 13:33:58 +05:30 |
|
Saqib Ansari
|
dd39ba0014
|
chore: tests
|
2020-05-28 13:11:04 +05:30 |
|
Rucha Mahabal
|
0032d7765f
|
Merge pull request #21999 from frappe/michellealva-patch-3
fix: change modified time
|
2020-05-28 12:56:23 +05:30 |
|
Michelle Alva
|
8653419c4c
|
fix: change modified time
changed modified time to sync the changes
|
2020-05-28 12:52:58 +05:30 |
|
Saqib Ansari
|
603cc3d05e
|
fix: transaction date not found in sales invoice
|
2020-05-28 12:49:33 +05:30 |
|
Deepesh Garg
|
ab17b07f14
|
Merge pull request #21985 from marination/import-italian-invoice-dev
chore: Added Italian Import Supplier Invoice to Desk
|
2020-05-28 12:33:53 +05:30 |
|
rohitwaghchaure
|
063d344000
|
Merge pull request #21998 from rohitwaghchaure/fixed-label-for-date
fix: labels for date in manufacturing reports
|
2020-05-28 12:09:02 +05:30 |
|
Rohit Waghchaure
|
b86c0eb404
|
fix: labels for date in manufacturing reports
|
2020-05-28 12:07:13 +05:30 |
|
rohitwaghchaure
|
bf561f9387
|
Merge pull request #21738 from theopen-institute/fee-schedule-date
fix(Education): Added a posting_date field to Fee Schedule
|
2020-05-28 12:01:30 +05:30 |
|
totolouis
|
596b3dbeee
|
fix: translation from HTML code to apostrophe
For French translation, the apostrophe was in HTML code and thus is not displayed correctly.
Issue reported a few times: https://discuss.erpnext.com/t/apostrophe-is-showed-as-39-is-not-interpreted/49954/3 and https://discuss.erpnext.com/t/mega-thread-version-12-release-bugs/50987/49.
|
2020-05-27 22:51:03 -07:00 |
|
Michelle Alva
|
f7beeff2d8
|
fix: change description for field (#21995)
grammatical fixes for description of Default Customer
|
2020-05-28 11:05:19 +05:30 |
|
rohitwaghchaure
|
39308e72f9
|
Merge pull request #21994 from rohitwaghchaure/display-draft-job-card-as-open-job-card-develop
refactor: display draft job card as Open job card
|
2020-05-28 10:18:49 +05:30 |
|
Rohit Waghchaure
|
5226403b62
|
refactor: display draft job card as Open job card
|
2020-05-28 10:15:01 +05:30 |
|
rohitwaghchaure
|
82de993a69
|
Merge pull request #21993 from rohitwaghchaure/display-draft-job-card-as-open-job-card
refactor: display draft job card as Open job card
|
2020-05-28 10:11:58 +05:30 |
|
Rohit Waghchaure
|
b8ffaa7f07
|
refactor: display draft job card as Open job card
|
2020-05-28 10:10:22 +05:30 |
|
rohitwaghchaure
|
02a2bb77a8
|
Merge pull request #21992 from rohitwaghchaure/fixed-forecasting-data-and-changed-columns-pre-release
refactor: display the order's data for past period
|
2020-05-28 09:59:23 +05:30 |
|
Rohit Waghchaure
|
5255b714ef
|
refactor: showing the order's data for past period
|
2020-05-28 09:57:49 +05:30 |
|
rohitwaghchaure
|
7320a72237
|
Merge pull request #21991 from rohitwaghchaure/fixed-forecasting-data-and-changed-columns
refactor: showing the order's data for past period
|
2020-05-28 09:56:47 +05:30 |
|
Rohit Waghchaure
|
234a55c6bc
|
refactor: showing the order's data for past period
|
2020-05-28 09:55:24 +05:30 |
|
Deepesh Garg
|
6fe3a24c5d
|
Merge pull request #21986 from deepeshgarg007/tds_computation_summary
fix: TDS computation summary report
|
2020-05-27 22:49:42 +05:30 |
|
Deepesh Garg
|
33a08f1ea7
|
fix: TDS computation summary report
|
2020-05-27 22:44:50 +05:30 |
|
marination
|
50956aa29e
|
chore: Added to v13 desk under Regional Link Card
|
2020-05-27 22:24:39 +05:30 |
|
marination
|
29d7a7ea05
|
fix: Added permission via regional setup and patch
|
2020-05-27 22:14:36 +05:30 |
|
marination
|
3da51984f2
|
chore: Add Import Supplier Invoice to Menu
|
2020-05-27 22:13:40 +05:30 |
|
rohitwaghchaure
|
962e9bcd71
|
fix: raw material warehouse in Production Planning Report (#21983)
|
2020-05-27 21:53:29 +05:30 |
|
rohitwaghchaure
|
7ac731dd4f
|
fix: raw material warehouse in Production Planning Report (#21982)
|
2020-05-27 21:53:17 +05:30 |
|
Deepesh Garg
|
33bf90db0b
|
Merge pull request #21981 from frappe/mergify/bp/version-13-beta-pre-release/pr-21972
fix: Total for ageing column 121-Above (bp #21972)
|
2020-05-27 20:59:19 +05:30 |
|
Deepesh Garg
|
c63b689497
|
fix: Total for ageing column 121-Above (#21972)
(cherry picked from commit 152377f84d7de8b8a0d20d970660ee107d5eca26)
|
2020-05-27 15:27:23 +00:00 |
|
Marica
|
8f1aed73fd
|
fix: Buying Module fixes (#21966)
* fix: Buying Module fixes
* fix: Delete Report files as well
* fix: Add Purchase Order Analysis to Stock & Accounting
|
2020-05-27 20:57:02 +05:30 |
|
Marica
|
c2aabb0fbf
|
fix: Buying Module fixes (#21965)
* fix: Buying Module fixes
* fix: Delete Report files as well
* fix: Add Purchase Order Analysis to Stock & Accounting
|
2020-05-27 20:56:39 +05:30 |
|
mergify[bot]
|
8644a7f1fc
|
fix: Do not allow backdated stock transactions in previous fiscal year (#21967) (#21980)
(cherry picked from commit 873542bc7f57f6627d6a906f133ea179785a3795)
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
|
2020-05-27 20:50:28 +05:30 |
|
mergify[bot]
|
01dda8a000
|
fix: Filtering issues in opneing invoice creation tool (#21969) (#21979)
(cherry picked from commit 0030b95595e2a74b0167a5e791d62371af4bb24a)
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
|
2020-05-27 20:50:20 +05:30 |
|
rohitwaghchaure
|
c77a4b8486
|
Merge pull request #21978 from scmmishra/work-order-fix-v13-beta
fix: compare start and end time to prevent negative diff
|
2020-05-27 20:41:17 +05:30 |
|
Shivam Mishra
|
48b7a1a20f
|
fix: use get_datetime instead of getdate
|
2020-05-27 20:39:52 +05:30 |
|
Shivam Mishra
|
402ed10004
|
fix: compare start and end time to prevent negative diff (#21974)
* fix: compare start and end time to prevent negative diff
* feat: parse date when comparing
|
2020-05-27 20:39:52 +05:30 |
|
rohitwaghchaure
|
dc470b5382
|
Merge pull request #21977 from scmmishra/work-order-fix-datetime
fix: use get_datetime instead of getdate
|
2020-05-27 20:39:17 +05:30 |
|
Shivam Mishra
|
cb1a7d0fbc
|
fix: use get_datetime instead of getdate
|
2020-05-27 20:36:28 +05:30 |
|