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 |
|
Marica
|
6bbdc58d56
|
Merge branch 'develop' into link-to-mr
|
2020-11-05 09:31:39 +05:30 |
|
Marica
|
144fef0097
|
Merge branch 'develop' into item-price-pricing-rule-conflict
|
2020-11-05 09:28:30 +05:30 |
|
Marica
|
364916fa7b
|
Merge branch 'develop' into dialog-cleanup
|
2020-11-05 09:27:57 +05:30 |
|
Marica
|
0c74cd8872
|
Merge pull request #23821 from marination/so-to-po-dialog-fix-v13-beta
fix: SO to PO Mapping Issue
|
2020-11-05 09:26:32 +05:30 |
|
Marica
|
2f0bd68fde
|
Merge branch 'develop' into so-to-po-dialog-fix
|
2020-11-05 09:25:00 +05:30 |
|
Marica
|
5c4b35e65e
|
Merge pull request #23827 from marination/rfq-test-fixes-pre-release
chore: Reposition RFQ fields
|
2020-11-05 09:24:29 +05:30 |
|
Marica
|
24d0bd4435
|
Merge pull request #23826 from marination/rfq-test-fixes
chore: Reposition RFQ fields
|
2020-11-05 09:24:18 +05:30 |
|
Abhishek Balam
|
48d9173a55
|
Merge pull request #23828 from abhishekbalam/psoa_testcase_fix
fix(PSOA): key error if no customers found
|
2020-11-05 00:21:24 +05:30 |
|
Abhishek Balam
|
5db99e0649
|
fix: code improvement, match error type for message
|
2020-11-04 23:43:11 +05:30 |
|
Abhishek Balam
|
5fe3abcfae
|
fix: sales person without customer link throwing keyerror
|
2020-11-04 23:23:34 +05:30 |
|
marination
|
edd9080ea6
|
chore: Reposition RFQ fields
|
2020-11-04 22:13:57 +05:30 |
|
marination
|
2b3412ea05
|
chore: Reposition RFQ fields
|
2020-11-04 22:07:33 +05:30 |
|
Rucha Mahabal
|
dd7f4df669
|
fix: Budget test cases (#23822)
|
2020-11-04 21:59:08 +05:30 |
|
Marica
|
4c81de0810
|
Merge branch 'develop' into so-to-po-dialog-fix
|
2020-11-04 21:24:45 +05:30 |
|
marination
|
75fcfbb49c
|
chore: Delete Quoted Item Comparison Report
|
2020-11-04 21:24:04 +05:30 |
|