Subin Tom
|
d53991857c
|
fix: Fixed Budget Variance Graph color from all black to default (#26368)
|
2021-07-09 14:33:00 +05:30 |
|
Saqib
|
f6f924b340
|
Merge branch 'develop' into asset-credit-note
|
2021-07-09 10:38:50 +05:30 |
|
Saqib
|
8f3c7ab402
|
fix: escape quotes while fetching customer emails (#26329) (#26376)
|
2021-07-09 10:35:55 +05:30 |
|
Rucha Mahabal
|
3888488b36
|
fix: precision for expected values in payment entry test
|
2021-07-08 23:21:48 +05:30 |
|
Rucha Mahabal
|
88929b055c
|
fix: precision for expected values in payment entry test
|
2021-07-08 19:27:53 +05:30 |
|
Saqib
|
eaef371585
|
fix: escape quotes while fetching customer emails (#26329)
|
2021-07-08 10:52:41 +05:30 |
|
GangaManoj
|
cfff3b8726
|
fix: Test GL Entries made when an Asset is returned
|
2021-07-07 21:04:20 +05:30 |
|
GangaManoj
|
3a7f25b218
|
fix: Make functions more readable
|
2021-07-07 15:59:52 +05:30 |
|
GangaManoj
|
ca87745be1
|
fix: Rename get_gl_entries_on_asset_movement to get_gl_entries_on_asset_disposal_and_regain
|
2021-07-06 23:43:08 +05:30 |
|
Nabin Hait
|
11d56903e7
|
Merge pull request #25415 from deepeshgarg007/bootstraped_gst_setup
feat(India): Bootstrapped GST Setup
|
2021-07-06 21:44:30 +05:30 |
|
Deepesh Garg
|
bd40669dab
|
Merge pull request #26289 from nemesis189/fixed-budget-variance-report-color
fix: Fixed Budget Variance Graph color from all black to default
|
2021-07-06 20:36:00 +05:30 |
|
Deepesh Garg
|
3636efd7e6
|
Merge pull request #26355 from deepeshgarg007/flaky_test
test: Purchase Invoice advance test case
|
2021-07-06 18:22:26 +05:30 |
|
Deepesh Garg
|
7f794cc0ea
|
fix: Purchase Invoice advance test case
|
2021-07-06 17:58:44 +05:30 |
|
Deepesh Garg
|
a62f94379b
|
Merge pull request #26324 from deepeshgarg007/bank_statement_import_fix_develop
fix: Bank statement import
|
2021-07-06 17:25:21 +05:30 |
|
Deepesh Garg
|
2f3f87dc66
|
Merge branch 'develop' into multi-company-deferred-revenue_develop
|
2021-07-06 16:14:25 +05:30 |
|
Deepesh Garg
|
26dc02aa38
|
Merge branch 'develop' into bank_statement_import_fix_develop
|
2021-07-06 16:14:13 +05:30 |
|
Deepesh Garg
|
381c05eb87
|
Merge pull request #26322 from deepeshgarg007/party_dashboard_develop
fix: Do not consider cancelled entries in party dashboard
|
2021-07-06 16:13:49 +05:30 |
|
Deepesh Garg
|
8985231a96
|
fix: Rewrite tests
|
2021-07-06 15:34:47 +05:30 |
|
Afshan
|
c8eca8a448
|
fix: remove cancelled entries in consolidated financial statements (#26331)
|
2021-07-06 14:37:57 +05:30 |
|
Afshan
|
53e3435770
|
fix: remove cancelled entries in consolidated financial statements (#26330)
|
2021-07-06 14:37:21 +05:30 |
|
Deepesh Garg
|
8c1b764a90
|
fix: Debug tests
|
2021-07-05 21:49:10 +05:30 |
|
Deepesh Garg
|
ddf87594a1
|
Merge pull request #26287 from deepeshgarg007/bank_statement_import_fix
fix: Bank statement import
|
2021-07-04 20:34:10 +05:30 |
|
Deepesh Garg
|
9d295ca939
|
fix: Bank statement import
|
2021-07-04 20:33:36 +05:30 |
|
Deepesh Garg
|
ea5b7d38bb
|
Merge pull request #26277 from deepeshgarg007/multi-company-deferred-revenue
fix: Auto process deferred accounting for multi-company setup
|
2021-07-04 20:32:22 +05:30 |
|
Deepesh Garg
|
5069095984
|
fix: Auto process deferred accounting for multi-company setup
|
2021-07-04 20:31:37 +05:30 |
|
Deepesh Garg
|
cd036e115b
|
Merge pull request #26231 from deepeshgarg007/party_dashboard
fix: Do not consider cancelled entries in party dashboard
|
2021-07-04 20:30:34 +05:30 |
|
Deepesh Garg
|
802e63a9d7
|
fix: Do not consider cancelled entries in party dashboard
|
2021-07-04 20:29:41 +05:30 |
|
Deepesh Garg
|
63096014a7
|
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
|
2021-07-02 20:30:18 +05:30 |
|
GangaManoj
|
f8ee8058e7
|
fix(Sales Invoice): Reset disposal_date on returning the Asset
|
2021-07-02 15:45:52 +05:30 |
|
GangaManoj
|
4cf3d9ac20
|
fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice
|
2021-07-02 15:25:04 +05:30 |
|
Deepesh Garg
|
d4146a91d6
|
Merge pull request #25323 from m1ngaa/patch-1
Delete accounts (an empty file)
|
2021-07-01 23:38:56 +05:30 |
|
Subin Tom
|
d2c86bb9d7
|
fix: Fixed Budget Variance Graph color from all black to default
|
2021-07-01 19:59:08 +05:30 |
|
Deepesh Garg
|
ba2c3c776f
|
fix: Bank statement import
|
2021-07-01 18:56:51 +05:30 |
|
Anuja Pawar
|
d8bc514226
|
fix: to fetch the correct field in Tax Rule (#25927)
|
2021-07-01 14:06:01 +05:30 |
|
Nabin Hait
|
fa006402b8
|
fix: merge conflict
|
2021-07-01 12:47:28 +05:30 |
|
Deepesh Garg
|
68c697b354
|
fix: Auto process deferred accounting for multi-company setup
|
2021-07-01 09:31:31 +05:30 |
|
Deepesh Garg
|
cf7af62b05
|
fix: Code cleanup
|
2021-06-30 14:14:32 +05:30 |
|
GangaManoj
|
d748e7f49c
|
fix: Create common function for fetching conversion rate details of linked docs
|
2021-06-28 22:39:43 +05:30 |
|
GangaManoj
|
506d5ac3d5
|
fix: Make exchange rate handling more efficient
|
2021-06-28 22:39:43 +05:30 |
|
GangaManoj
|
8f52db788a
|
fix(Purchase Invoice): Improve test for exchange rate difference handling
|
2021-06-28 22:39:41 +05:30 |
|
GangaManoj
|
3f5e7bf6d7
|
fix(Purchase Invoice): Fetch Purchase Receipt details using a function
|
2021-06-28 22:38:59 +05:30 |
|
GangaManoj
|
206313d69b
|
fix(Purchase Invoice): Add test for exchange rate difference handling
|
2021-06-28 22:02:20 +05:30 |
|
GangaManoj
|
6233eaa3bb
|
fix(Purchase Invoice): Fix condition
|
2021-06-28 22:00:49 +05:30 |
|
GangaManoj
|
785a71dcd2
|
fix(Purchase Invoice): Resolve difference caused by change in exchange rate
|
2021-06-28 22:00:49 +05:30 |
|
Saqib
|
4277e4c94b
|
fix: unreachable test case (#26234)
|
2021-06-28 19:10:46 +05:30 |
|
Deepesh Garg
|
7d7d797ffc
|
fix: Do not consider cancelled entries in party dashboard
|
2021-06-28 11:24:32 +05:30 |
|
Deepesh Garg
|
ebc46c1e09
|
fix: Update account heads in GST test cases
|
2021-06-28 10:52:38 +05:30 |
|
Deepesh Garg
|
cf445eb7b4
|
fix: Add validate bank account method back
|
2021-06-26 23:59:47 +05:30 |
|
Subin Tom
|
43f85a2877
|
fix: changed profitability analysis report width (#26165)
|
2021-06-25 11:38:11 +05:30 |
|
Deepesh Garg
|
dce2676f7a
|
Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_payment_tax
|
2021-06-24 21:08:57 +05:30 |
|
Deepesh Garg
|
c151c67d97
|
fix: Flaky test
|
2021-06-24 21:08:19 +05:30 |
|
Deepesh Garg
|
970d2af7ad
|
Merge pull request #26211 from deepeshgarg007/include_dimension_filter
fix: Account filter not working with accounting dimension filter
|
2021-06-24 19:55:12 +05:30 |
|
Deepesh Garg
|
1564d39bf4
|
Merge pull request #26188 from deepeshgarg007/internal_transfer_payment_tax_v13
fix: Taxes on Internal Transfer payment entry
|
2021-06-24 19:51:48 +05:30 |
|
Deepesh Garg
|
e3ca177828
|
fix: Remove debug flag
|
2021-06-24 19:51:23 +05:30 |
|
Deepesh Garg
|
bdba29bab5
|
fix: Account filter not working with accounting dimension filter
|
2021-06-24 19:48:11 +05:30 |
|
Saqib
|
3b5978cdb8
|
Merge pull request #26093 from nextchamp-saqib/pr-item-gl-fix
fix: purchase receipt gl entries with same item code
|
2021-06-24 19:29:08 +05:30 |
|
Deepesh Garg
|
9382b1f154
|
fix: Flaky test
|
2021-06-24 19:03:22 +05:30 |
|
Anuja Pawar
|
a50196bcd9
|
fix: dunning permission error in payment entry (#26204)
|
2021-06-24 18:25:16 +05:30 |
|
Saqib Ansari
|
1ca8f6a51d
|
fix: purchase receipt gl entries with same item code
|
2021-06-24 17:41:44 +05:30 |
|
Saqib
|
c10fea8a59
|
Merge branch 'develop' into pr-item-gl-fix
|
2021-06-24 17:39:36 +05:30 |
|
Deepesh Garg
|
e693cceb58
|
Merge pull request #26132 from noahjacob/shipping_address_fix
fix: fetch preferred shipping address
|
2021-06-24 17:31:21 +05:30 |
|
Noah Jacob
|
dbdf2515cd
|
fix: fetches correct preferred shipping address
|
2021-06-24 17:06:18 +05:30 |
|
Nabin Hait
|
5b462ad11a
|
fix: merge conflict
|
2021-06-24 15:36:51 +05:30 |
|
Nabin Hait
|
c1954ec72a
|
Merge pull request #26195 from deepeshgarg007/deferred_revenue_error
fix: Error while booking deferred revenue
|
2021-06-24 15:35:02 +05:30 |
|
Deepesh Garg
|
f79a72dbf3
|
fix: Error while booking deferred revenue
|
2021-06-24 14:49:09 +05:30 |
|
Deepesh Garg
|
ca2e914715
|
fix: Error while booking deferred revenue
|
2021-06-24 14:14:46 +05:30 |
|
Deepesh Garg
|
ab7a16a952
|
Merge pull request #26180 from deepeshgarg007/pi_billing_address_develop
fix: Billing address not fetched in Purchase Invoice
|
2021-06-24 12:13:17 +05:30 |
|
Deepesh Garg
|
9d8e8f8bdf
|
fix: Do not show received amount after tax for internal tarnsfers
|
2021-06-24 12:02:39 +05:30 |
|
Deepesh Garg
|
bd9317956b
|
fix: Taxes on Internal Transfer payment entry
|
2021-06-24 12:02:32 +05:30 |
|
Ganga Manoj
|
604f0b8f01
|
fix: message on successful creation of opening invoices (#25998)
|
2021-06-24 11:04:27 +05:30 |
|
Deepesh Garg
|
03b629c851
|
Merge pull request #26100 from deepeshgarg007/pi_billing_address
fix: Billing address not fetched in Purchase Invoice
|
2021-06-24 10:29:01 +05:30 |
|
Deepesh Garg
|
7bef18f3d8
|
fix: Remove unintentional changes
|
2021-06-24 10:28:25 +05:30 |
|
Deepesh Garg
|
c8a6b31f06
|
Merge branch 'develop' of https://github.com/frappe/erpnext into pi_billing_address_develop
|
2021-06-24 10:27:16 +05:30 |
|
Deepesh Garg
|
da7f45130b
|
fix: Billing address not fetched in Purchase Invoice
|
2021-06-24 10:25:24 +05:30 |
|
Noah Jacob
|
b4b6288596
|
fix: fetches correct preferred shipping address
|
2021-06-23 17:05:44 +05:30 |
|
GangaManoj
|
88348e2da7
|
fix(Sales Invoice): Print appropriate message if Asset isn't specified when the Item is a Fixed Asset
|
2021-06-23 11:57:53 +05:30 |
|
Deepesh Garg
|
e8817f97d6
|
Merge pull request #26150 from nemesis189/changed-profitability-analysis-report-width
fix: Changed profitability analysis report width
|
2021-06-23 11:36:43 +05:30 |
|
Deepesh Garg
|
673470705b
|
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
|
2021-06-23 11:33:15 +05:30 |
|
GangaManoj
|
32d7b1f6ad
|
fix(Sales Invoice): Fix GL Entry creation for Return Invoices linked with Assets
|
2021-06-23 11:24:05 +05:30 |
|
Saqib
|
46ae97dfd3
|
Merge branch 'develop' into pr-item-gl-fix
|
2021-06-23 11:02:48 +05:30 |
|
Saqib
|
5a824cad81
|
fix: cannot cancel payment entry if linked with invoices (#26075)
|
2021-06-23 11:02:05 +05:30 |
|
GangaManoj
|
8127208774
|
fix(Sales Invoice): Reset Asset status on issuing Credit Note
|
2021-06-22 23:12:56 +05:30 |
|
GangaManoj
|
721ff9438a
|
Merge branch 'develop' into asset-credit-note
|
2021-06-22 22:45:11 +05:30 |
|
Deepesh Garg
|
7b0d86ead5
|
fix: Do not show received amount after tax for internal tarnsfers
|
2021-06-22 20:38:35 +05:30 |
|
Deepesh Garg
|
2af8c171c1
|
fix: Taxes on Internal Transfer payment entry
|
2021-06-22 19:48:08 +05:30 |
|
Subin Tom
|
a446d61e10
|
fix: Changed profitability analysis report width
|
2021-06-22 16:51:15 +05:30 |
|
GangaManoj
|
d0d5fedd48
|
fix(Sales Invoice): Print appropriate message if item.asset is missing when the Item is a Fixed Asset
|
2021-06-22 00:22:08 +05:30 |
|
GangaManoj
|
5b07e58412
|
fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice
|
2021-06-21 23:51:09 +05:30 |
|
GangaManoj
|
600333875a
|
fix(Sales Invoice): Let item.asset be copied on duplicating the doc
|
2021-06-21 23:41:35 +05:30 |
|
Afshan
|
127d637b3d
|
fix: check for duplicate payment terms in Payment Term Template (#25999)
|
2021-06-21 11:24:45 +05:30 |
|
Saqib Ansari
|
d329e27346
|
Merge branch 'develop' of https://github.com/frappe/erpnext into pr-item-gl-fix
|
2021-06-21 11:18:45 +05:30 |
|
Saqib
|
fb89008a13
|
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' (#26097)
|
2021-06-21 10:49:09 +05:30 |
|
Saqib
|
7ff19ebec8
|
fix(pos): unsupported operand type -= for 'float' and 'NoneType' (#26096)
|
2021-06-21 10:48:50 +05:30 |
|
Saqib Ansari
|
99531a35e0
|
fix(pos): unsupported operand type -= for 'float' and 'NoneType'
|
2021-06-21 10:47:23 +05:30 |
|
Rohit Waghchaure
|
110e152fa3
|
fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice
|
2021-06-20 15:28:23 +05:30 |
|
Rohit Waghchaure
|
7b7ceaadd9
|
feat: subcontract code refactor and enhancement
|
2021-06-20 15:27:01 +05:30 |
|
Rohit Waghchaure
|
5cc3f14506
|
fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice
|
2021-06-19 23:16:23 +05:30 |
|
Rohit Waghchaure
|
a94b89727c
|
feat: subcontract code refactor and enhancement
|
2021-06-19 23:16:22 +05:30 |
|
Anuja Pawar
|
b066fe9519
|
fix: insufficient permission for dunning error (#26092)
|
2021-06-18 11:29:07 +05:30 |
|
Saqib
|
cceabff6e1
|
Merge branch 'develop' into pr-item-gl-fix
|
2021-06-18 11:24:54 +05:30 |
|