Commit Graph

31369 Commits

Author SHA1 Message Date
Deepesh Garg
8a4dc521cd Revert 'fix: tests depending on global default company' 2020-05-30 11:40:16 +05:30
Deepesh Garg
36f7710356 Revert "fix: tests depending on global default company"
This reverts commit 1f20c99ecf.
2020-05-30 11:38:04 +05:30
Deepesh Garg
f8550790fa This reverts commit aa196c0a66 2020-05-30 11:37:36 +05:30
Deepesh Garg
dfa32a77c1 fix: Patch to remove Property Setter 2020-05-29 17:20:33 +05:30
Deepesh Garg
52baf8f863 fix: Test Cases 2020-05-29 17:20:03 +05:30
Deepesh Garg
c897e800ed Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-05-29 11:04:20 +05:30
Saqib
cd8b5d1e4c
fix: cannot assign same task to other asset maintenance (#22024) 2020-05-29 10:21:20 +05:30
Mangesh-Khairnar
c302d066a3
fix: only save end date when transactions are returned (#22023) 2020-05-29 10:19:58 +05:30
Anurag Mishra
cf0168668f
fix: Correct filters (#22022) 2020-05-29 10:19:33 +05:30
Saqib
3c460364b5
fix: disposed asset creates inconsistencies in asset depr report (#22021) 2020-05-29 10:18:06 +05:30
Anupam Kumar
8385fed042
crm onboarding typos (#22008) 2020-05-28 22:14:59 +05:30
Rucha Mahabal
b18606c0d7
Merge pull request #22019 from ruchamahabal/fix-chart
fix: empty filters in Healthcare Charts
2020-05-28 19:19:23 +05:30
Rucha Mahabal
a3dd75e77f fix: empty filters in Healthcare Charts 2020-05-28 19:03:37 +05:30
sahil28297
9209b9a7de
fix(set_purchase_receipt_delivery_note_detail): commit after every 100 sql updates (#22016) 2020-05-28 18:49:47 +05:30
Deepesh Garg
1f3fe59e36
fix: Default period start date and period end date for financial statements (#22011) 2020-05-28 18:36:21 +05:30
sahil28297
517ab955ac
fix(rename_bank_reconcilliation): do not delete doc after renaming (#22013) 2020-05-28 18:32:16 +05:30
Marica
1a25aa83de
fix: Delete Auto Email Reports (#22009) 2020-05-28 18:16:24 +05:30
mergify[bot]
fd351f8268
fix: set fiscal year for Profit and Loss chart (#22006)
(cherry picked from commit 4afda76015)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
2020-05-28 15:18:47 +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
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
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
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
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
7ac731dd4f
fix: raw material warehouse in Production Planning Report (#21982) 2020-05-27 21:53:17 +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
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
Shivam Mishra
8fcbf1b90e
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:31:30 +05:30
Deepesh Garg
152377f84d
fix: Total for ageing column 121-Above (#21972) 2020-05-27 20:29:10 +05:30
Marica
a49f045d14
fix: Grammar fixes (#21970) 2020-05-27 20:28:37 +05:30
Deepesh Garg
0030b95595
fix: Filtering issues in opneing invoice creation tool (#21969) 2020-05-27 20:27:33 +05:30
Deepesh Garg
873542bc7f
fix: Do not allow backdated stock transactions in previous fiscal year (#21967) 2020-05-27 20:26:38 +05:30