Commit Graph

36016 Commits

Author SHA1 Message Date
Anupam Kumar
b4bad63e25 Delete parameter.js 2020-11-06 17:11:47 +05:30
Anupam Kumar
ec7002625f Delete __init__.py 2020-11-06 17:11:33 +05:30
Anupam
14ef229b12 Revert "Update item_add_to_cart.html"
This reverts commit 5b3af82e75.
2020-11-06 16:50:15 +05:30
Anupam
886b680e1b revert changes 2020-11-06 16:48:39 +05:30
Anupam
beba8da0a6 Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into pre-release 2020-11-06 16:38:16 +05:30
Anupam Kumar
ca9b58589b fix: replaced formatdate -> format_date (#23847)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-11-06 14:56:27 +05:30
Deepesh Garg
3e69756e15 fix: Add better remarks for Loan GL entries 2020-11-06 14:25:09 +05:30
Marica
d07f6b7ef6 Merge pull request #23848 from AfshanKhan/fix-stock-mismatch-filter-pre-release
fix: showing error for wrong filters.
2020-11-06 13:42:07 +05:30
Marica
0d441b66cd Merge pull request #23808 from nabinhait/web-page-bank-statement-section-pre-release
fix: Added link of bank reconciliation and clearance in accounting desk page
2020-11-06 13:16:44 +05:30
marination
0b4946ba27 fix: Add missing links
- Added Bank Transaction Statement Entry and Bank Statement Settings
2020-11-06 13:15:46 +05:30
Nabin Hait
06ba92be7a fix: Added link of bank reconciliation and clearance in accounting desk page 2020-11-06 13:15:38 +05:30
marination
427c1bb0a7 fix: Add missing links
- Added Bank Transaction Statement Entry and Bank Statement Settings
2020-11-06 13:08:53 +05:30
Marica
7e1511f527 Merge branch 'develop' into purchase-invoice-payment-terms 2020-11-06 12:28:55 +05:30
Anupam
c3307f7900 fix: replaced formatdate -> format_date 2020-11-06 12:28:38 +05:30
Afshan
4d3e83682e fix: showing error for wrong filters. 2020-11-06 12:25:46 +05:30
Marica
d845e8a53a Merge branch 'develop' into pr-dn-return 2020-11-06 12:25:11 +05:30
Marica
d967ad6b5b Merge pull request #23789 from marination/dialog-cleanup
chore: Get Items From Dialog cleanup (Buying)
2020-11-06 12:22:14 +05:30
Marica
9694432270 Merge branch 'develop' into dialog-cleanup 2020-11-06 12:19:41 +05:30
Anupam
bab078b4f5 fix: replaced formatdate -> format_date 2020-11-06 12:05:45 +05:30
Suraj Shetty
c2d97e9d9c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-06 10:26:19 +05:30
rohitwaghchaure
c83769c3d1 Merge pull request #23842 from rohitwaghchaure/multiple-pricing-rules-are-not-applied-pre-release
fix: multiple pricing rules are not working on selling side
2020-11-06 01:06:45 +05:30
Raffael Meyer
a62d138748 Merge branch 'develop' into datev_check_fiscal_year 2020-11-05 17:29:42 +01:00
barredterra
f91d82b538 fix: imports 2020-11-05 17:28:39 +01:00
barredterra
815341d454 feat: validate fiscal year 2020-11-05 16:57:23 +01:00
Deepesh Garg
1145b3796c fix: Remove accrual type from process 2020-11-05 21:21:40 +05:30
Deepesh Garg
a2bff7fbfc fix: Penalty amount calculation fix 2020-11-05 21:14:29 +05:30
Deepesh Garg
49cc57e76e fix: Negative amount check for amounts 2020-11-05 21:14:07 +05:30
Rohit Waghchaure
88e0a64df2 added test cases 2020-11-05 20:07:27 +05:30
Rohit Waghchaure
2fe3b1807f fix: multiple pricing rules are not working on selling side 2020-11-05 20:07:19 +05:30
Anupam Kumar
3a9dc90695 fix: fix: replaced formatdate -> format_date (#23829) 2020-11-05 18:51:56 +05:30
rohitwaghchaure
9a62858da2 Merge pull request #23831 from rohitwaghchaure/incorrect-assign-to-in-asset-maintenance-develop
fix: incorrect assign to in Maintenance Schedule
2020-11-05 18:43:51 +05:30
Marica
c070f2ed57 Merge branch 'develop' into dialog-cleanup 2020-11-05 18:37:56 +05:30
Marica
08f6c9d5f9 Merge pull request #23820 from marination/so-to-po-dialog-fix
fix: SO to PO Mapping Issue
2020-11-05 18:29:52 +05:30
pateljannat
5b02d32826 fix: trailling spaces removed 2020-11-05 18:04:14 +05:30
Saqib
65820f6b6c fix: cannot expand row in update items dialog (#23840) 2020-11-05 17:38:43 +05:30
Saqib
bc919e2e7d fix: cannot expand row in update items dialog (#23839) 2020-11-05 17:38:35 +05:30
Saqib
19df4534f5 fix: asset finance book depreciation posting date fix (#23833) 2020-11-05 16:37:40 +05:30
Saqib
76cd680c57 fix: asset finance book depreciation posting date fix (#23834) 2020-11-05 16:37:19 +05:30
Deepesh Garg
59ccb64e18 fix: Auto Statewise gst tax template 2020-11-05 16:29:34 +05:30
pateljannat
403822afb3 fix: correcting description field in taxes and charges for accounts that have account number + account name 2020-11-05 16:24:33 +05:30
Afshan
5c93ca7bef fix: leave ledger patch (#23807)
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-11-05 15:45:15 +05:30
Rohit Waghchaure
421348a5f2 fix: not able to select assign to 2020-11-05 15:43:41 +05:30
Marica
6d2bcd2404 Merge branch 'develop' into purchase-invoice-payment-terms 2020-11-05 12:25:38 +05:30
Marica
fd2b7d3c1d Merge branch 'develop' into dialog-cleanup 2020-11-05 12:22:50 +05:30
Marica
7e9b9e7278 Merge branch 'develop' into so-to-po-dialog-fix 2020-11-05 12:19:49 +05:30
Marica
9a4975d3fe Merge pull request #23823 from marination/delete-quoted-item-old-report
chore: Delete Quoted Item Comparison Report
2020-11-05 12:19:26 +05:30
rohitwaghchaure
64059db69f Merge pull request #23814 from Anurag810/stock_ledger_report
fix:  list index out of range on including UOM
2020-11-05 11:49:46 +05:30
Marica
a45f98ba99 Merge branch 'develop' into pr-dn-return 2020-11-05 10:34:23 +05:30
Marica
596656b372 Merge pull request #23824 from marination/delete-quoted-item-old-report-pre-release
chore: Delete Quoted Item Comparison Report
2020-11-05 10:03:58 +05:30
Marica
6ae1b269ea Merge branch 'develop' into delete-quoted-item-old-report 2020-11-05 09:32:47 +05:30