Noah Jacob
d8668f78f4
fix: validation check when no conversion_factor ( #26219 )
2021-07-15 18:32:15 +05:30
Afshan
9b9b18c286
fix: improving ux for additional discount field ( #26502 )
2021-07-15 18:11:22 +05:30
Afshan
c66277e06b
fix: improving ux for additional discount field ( #26495 )
2021-07-15 18:10:17 +05:30
Noah Jacob
26a9d38547
fix: WIP needs to be set before submit on skip_transfer ( #26500 )
2021-07-15 16:50:41 +05:30
Noah Jacob
d319e10883
fix: set default operation time to 0 ( #26511 )
2021-07-15 16:49:55 +05:30
Noah Jacob
6442b5df11
fix: set default operation time to 0 ( #26510 )
2021-07-15 16:47:50 +05:30
Noah Jacob
2f775ee53c
fix: WIP needs to be set before submit on skip_transfer ( #26507 )
2021-07-15 16:29:28 +05:30
Rohit Waghchaure
9997cce1ea
fix: FG item not fetched in manufacture entry
2021-07-15 15:32:21 +05:30
rohitwaghchaure
4d444559ff
Merge pull request #26508 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item
...
fix: FG item not fetched in manufacture entry
2021-07-15 15:32:05 +05:30
Noah Jacob
eeecb25a02
fix: WIP needs to be set before submit on skip_transfer ( #26499 )
2021-07-15 15:31:42 +05:30
Rohit Waghchaure
74b97b5ec9
fix: FG item not fetched in manufacture entry
2021-07-15 14:52:21 +05:30
Deepesh Garg
cc73e7d6fa
Merge pull request #26472 from deepeshgarg007/payment_entry_taxes_unallocated_amount_v13
...
fix: Unallocated amount in Payment Entry after taxes
2021-07-15 12:38:45 +05:30
Deepesh Garg
5ad759897f
Merge pull request #26471 from deepeshgarg007/payment_entry_taxes_unallocated_amount
...
fix: Unallocated amount in Payment Entry after taxes
2021-07-15 12:38:32 +05:30
Deepesh Garg
1524e7f5ba
Merge pull request #26412 from deepeshgarg007/payment_entry_taxes_v12
...
fix: Unallocated amount in Payment Entry after taxes
2021-07-15 12:38:23 +05:30
18alantom
12f7befa13
fix: check if field_filters is None
2021-07-15 12:09:33 +05:30
18alantom
ca1169eeba
fix: check if field_filters is None
2021-07-15 12:03:41 +05:30
marination
219623279f
fix: Paging buttons not working on item group portal page
2021-07-14 20:50:22 +05:30
marination
f40da4ac4c
fix: Paging buttons not working on item group portal page
2021-07-14 20:48:06 +05:30
Marica
dbf835ced3
Merge branch 'develop' into paging-btns
2021-07-14 20:15:22 +05:30
marination
4c6e952902
fix: Paging buttons not working on item group portal page
2021-07-14 20:01:36 +05:30
Afshan
74d7baa80a
fix: filter by accounts with group by accounts ( #26438 )
...
* fix: filter by accounts with group by accounts
* fix: parsing json
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-07-14 19:59:11 +05:30
18alantom
9ea5072c52
fix: set item group as a persistent filter
2021-07-14 17:41:38 +05:30
18alantom
b24c0bfbf9
fix: show child item group items on portal
2021-07-14 17:41:32 +05:30
18alantom
e244560fb9
fix: set item group as a persistent filter
2021-07-14 17:40:10 +05:30
18alantom
7558e7f115
fix: show child item group items on portal
2021-07-14 17:40:04 +05:30
Marica
3f599b049c
Merge branch 'develop' into fix-item-group-portal-issues
2021-07-14 17:15:18 +05:30
Deepesh Garg
13fffeb97b
Merge pull request #26473 from deepeshgarg007/bootstrapped_gst_setup_develop
...
feat(India): Bootstrapped GST Setup
2021-07-14 16:44:12 +05:30
Noah Jacob
03f4db0606
fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) ( #26488 )
...
* fix(ux): added filter for valid batch nos.
* fix: not validating batch no if entry type stock reconciliation
* test: validate batch_no
2021-07-14 16:28:54 +05:30
Noah Jacob
2c67894135
fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) ( #26487 )
...
* fix(ux): added filter for valid batch nos.
* fix: not validating batch no if entry type stock reconciliation
* test: validate batch_no
2021-07-14 16:28:40 +05:30
Noah Jacob
c932baeb32
fix: validation check for batch for stock reconciliation type in stock entry ( #26370 )
...
* fix(ux): added filter for valid batch nos.
* fix: not validating batch no if entry type stock reconciliation
* test: validate batch_no
2021-07-14 16:25:42 +05:30
Kenneth Sequeira
513375f264
fix: Nested/Multi-level BOM help link ( #26409 )
...
Updated the link for multi-level boms. Current link is broken.
2021-07-14 16:07:47 +05:30
Kenneth Sequeira
7a89033163
fix: update integration links in help.js ( #26483 )
2021-07-14 16:07:31 +05:30
Kenneth Sequeira
24e08301bc
fix: update integration links in help.js ( #26483 )
2021-07-14 16:02:49 +05:30
Saqib
72715956f1
fix: tds computation summary shows cancelled invoices ( #26486 )
2021-07-14 15:56:20 +05:30
18alantom
ddbf7c0020
fix: set item group as a persistent filter
2021-07-14 15:43:22 +05:30
Saqib
ac721ae147
fix: tds computation summary shows cancelled invoices ( #26485 )
2021-07-14 15:20:14 +05:30
Jannat Patel
ccb52f19bc
fix: task status loop ( #26006 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-14 14:46:16 +05:30
Saqib
1c76154096
fix: tds computation summary shows cancelled invoices ( #26456 )
2021-07-14 14:45:39 +05:30
Saqib
9c04079d04
fix: test fails due to improper gain loss account set ( #26482 ) ( #26484 )
2021-07-14 14:45:11 +05:30
Afshan
9168bb369a
fix: filter by accounts with group by accounts ( #26439 )
2021-07-14 13:57:14 +05:30
Saqib
d86cdb4368
Merge branch 'develop' into payment_entry_taxes_unallocated_amount
2021-07-14 13:55:09 +05:30
Saqib
be773f4052
Merge branch 'develop' into bootstrapped_gst_setup_develop
2021-07-14 13:55:00 +05:30
Saqib
c978fdf3df
fix: test fails due to improper gain loss account set ( #26482 )
2021-07-14 13:53:30 +05:30
Saqib
bb493a0602
Merge pull request #26159 from GangaManoj/asset-credit-note
2021-07-14 12:02:02 +05:30
Ganga Manoj
05d7c69aa2
fix: delete child docs when parent doc is deleted ( #26239 )
2021-07-14 11:54:27 +05:30
Ganga Manoj
f4fc1384a5
fix(Issue): Calculate first_response_time based on working hours ( #25991 )
2021-07-14 11:43:10 +05:30
Saqib
59bf2df28e
fix: pos item cart dom updates ( #26461 )
2021-07-14 11:40:58 +05:30
Saqib
cbf7e1b676
fix: pos item cart dom updates ( #26460 )
2021-07-14 11:40:47 +05:30
Anurag Mishra
adfdc71844
fix: Tax calculation for Recurring additional salary ( #24206 )
...
* fix: Tax calculation for Recurring additional salary
* fix: conflicts
2021-07-14 09:59:41 +05:30
rohitwaghchaure
96eb147bb6
Merge pull request #26457 from rohitwaghchaure/fixed-multi-currency-issue
...
fix: multi-currency issue
2021-07-13 23:01:30 +05:30
GangaManoj
6357ffe4a1
fix: Create asset data
2021-07-13 22:31:01 +05:30
Deepesh Garg
7ff6865817
Merge pull request #26470 from deepeshgarg007/new_company_error_v13
...
fix: Errors on parallel requests creation of company for India
2021-07-13 20:30:06 +05:30
Deepesh Garg
75f66f78d7
Merge pull request #26420 from deepeshgarg007/new_company_error
...
fix: Errors on parallel requests creation of company for India
2021-07-13 20:29:56 +05:30
Deepesh Garg
3b68735e25
Merge branch 'develop' into payment_entry_taxes_unallocated_amount
2021-07-13 17:33:06 +05:30
Deepesh Garg
1ee63f31e5
Merge branch 'develop' of https://github.com/frappe/erpnext into bootstrapped_gst_setup_develop
2021-07-13 16:51:47 +05:30
Deepesh Garg
2de11fbbc4
fix: Test Cases
2021-07-13 16:50:35 +05:30
Deepesh Garg
3ef394c556
fix: Test cases
2021-07-13 16:50:35 +05:30
Deepesh Garg
b2af6b4583
fix: Create mode of payment if doesn't exists
2021-07-13 16:50:35 +05:30
Deepesh Garg
8f6f86aff4
fix: Test cases for M-pesa
2021-07-13 16:50:35 +05:30
Deepesh Garg
779d2afa60
fix: Update account heads in GST test cases
2021-07-13 16:50:04 +05:30
Deepesh Garg
bb679cc036
fix: Add validate bank account method back
2021-07-13 16:49:21 +05:30
Deepesh Garg
2908f2ee20
fix: Revert Changes
2021-07-13 16:49:21 +05:30
Deepesh Garg
0dfea4d134
fix: Test Cases
2021-07-13 16:49:21 +05:30
Deepesh Garg
22683cf19b
fix: Tests
2021-07-13 16:49:21 +05:30
Deepesh Garg
b71497067d
chore: Add comments
2021-07-13 16:49:21 +05:30
Deepesh Garg
87f4df80ea
fix: Move tax categories up in country wise json
2021-07-13 16:49:21 +05:30
Deepesh Garg
ed54e4e276
fix: Check for tax category
2021-07-13 16:48:44 +05:30
Deepesh Garg
269510b98f
fix: Regional settings setup
2021-07-13 16:48:22 +05:30
Deepesh Garg
a72589cb7e
fix: Add accounts and templates for reverse charge
2021-07-13 16:48:06 +05:30
Deepesh Garg
0380cca3b7
fix: Add GST accounts to GST Settings
2021-07-13 16:47:38 +05:30
Deepesh Garg
96300fa791
fix: Add validation for GST Settings
2021-07-13 16:47:38 +05:30
Deepesh Garg
1001f29784
fix: Gracefully handle duplicate bank account name to make setup faster
2021-07-13 16:47:38 +05:30
Deepesh Garg
8ed1afd93d
fix: Remove redundant get_doc
2021-07-13 16:47:38 +05:30
Deepesh Garg
8fd2d8b5d0
fix: Ignore validations for Tax Setup
2021-07-13 16:47:38 +05:30
Deepesh Garg
a90e5fd2e1
fix: Issues on new company setup
2021-07-13 16:47:38 +05:30
Deepesh Garg
e166c264b4
fix: Update country-wise-tax JSON and tax setup
2021-07-13 16:47:38 +05:30
Deepesh Garg
3031535a24
fix: Add tax categories on company setup
2021-07-13 16:47:36 +05:30
Deepesh Garg
de8c6eb0da
fix: Item Tax templates for GST
2021-07-13 16:46:30 +05:30
Deepesh Garg
2a9726b09f
feat(India): Separate Input and Output GST tax accounts
2021-07-13 16:46:30 +05:30
Deepesh Garg
c00d851a88
fix: Unallocated amount for inclusive charges
2021-07-13 16:42:21 +05:30
Deepesh Garg
740d5c6c53
fix: Deduct included taxes from unallocated amount
2021-07-13 16:42:10 +05:30
Deepesh Garg
01c89eaad9
fix: Remove unintentional changes
2021-07-13 16:42:10 +05:30
Deepesh Garg
2f350bf450
fix: Remove unintentional changes
2021-07-13 16:42:10 +05:30
Deepesh Garg
9513d61a50
fix: Hide amount after tax fields
2021-07-13 16:42:10 +05:30
Deepesh Garg
51ae46f0de
fix: Unallocated amount in Payment Entry after taxes
2021-07-13 16:42:10 +05:30
Deepesh Garg
4478c547bf
fix: Unallocated amount for inclusive charges
2021-07-13 16:35:58 +05:30
Deepesh Garg
754f432d97
fix: Deduct included taxes from unallocated amount
2021-07-13 16:35:47 +05:30
Deepesh Garg
7c634f66ca
fix: Remove unintentional changes
2021-07-13 16:35:47 +05:30
Deepesh Garg
5179f85e63
fix: Remove unintentional changes
2021-07-13 16:35:47 +05:30
Deepesh Garg
5cc4a201cb
fix: Hide amount after tax fields
2021-07-13 16:35:47 +05:30
Deepesh Garg
f661d82c00
fix: Unallocated amount in Payment Entry after taxes
2021-07-13 16:35:47 +05:30
Deepesh Garg
2f89b5b38e
Merge pull request #26466 from deepeshgarg007/amended_doc_discount_v13
...
fix: Incorrect discount amount on amended document
2021-07-13 16:24:54 +05:30
Deepesh Garg
41c5357602
Merge pull request #26468 from deepeshgarg007/gstr_1_json_dpwnload_error_v13
...
fix: Unable to download GSTR-1 json
2021-07-13 16:17:52 +05:30
Deepesh Garg
fc20ff02d0
Merge pull request #26418 from deepeshgarg007/gstr_1_json_dpwnload_error
...
fix: Unable to download GSTR-1 json
2021-07-13 16:17:37 +05:30
rohitwaghchaure
bd8699b8a9
Merge pull request #26458 from rohitwaghchaure/fixed-multi-currency-issue-pre
...
fix: multi-currency issue
2021-07-13 16:05:36 +05:30
Deepesh Garg
fea29ae8cb
fix: Use update flag for company dependant fixtures
2021-07-13 16:05:05 +05:30
Deepesh Garg
7be9f8dab1
fix: Error on creation of company for India
2021-07-13 16:04:56 +05:30
Deepesh Garg
0bad696faf
fix: Unable to download GSTR-1 json
2021-07-13 15:46:58 +05:30
Deepesh Garg
fc9714b871
fix: Unable to download GSTR-1 json
2021-07-13 15:45:34 +05:30
Deepesh Garg
07d9f3f74b
fix: Incorrect discount amount on amended document
2021-07-13 15:35:59 +05:30
Rohit Waghchaure
4acbeecbbe
fix: multi-currency issue
2021-07-13 15:35:30 +05:30
Deepesh Garg
a5200d6a43
Merge pull request #26429 from deepeshgarg007/amended_doc_discount_develop
...
fix: Incorrect discount amount on amended document
2021-07-13 15:34:32 +05:30
18alantom
a4eba7a409
fix: show child item group items on portal
2021-07-13 15:34:25 +05:30
Deepesh Garg
eef8e4a9d4
Merge pull request #26292 from deepeshgarg007/amended_doc_discount
...
fix: Incorrect discount amount on amended document
2021-07-13 15:34:24 +05:30
Rohit Waghchaure
0d190bb930
fix: multi-currency issue
2021-07-13 15:32:39 +05:30
Subin Tom
5265ba39f0
feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill
2021-07-13 14:58:17 +05:30
Saqib
621927d9f9
fix: move the rename abbreviation job to long queue ( #26462 )
2021-07-13 14:13:39 +05:30
Saqib
7c5711ddf4
fix: pos item cart dom updates ( #26459 )
2021-07-13 14:09:06 +05:30
Anupam Kumar
a8b6cf8114
fix: bank remittance report issue ( #26398 )
2021-07-13 11:45:34 +05:30
rohitwaghchaure
84f23ac8d2
Merge pull request #26222 from 18alantom/teabox-cogs-by-item-group
...
feat: report to show cogs by item groups
2021-07-13 11:24:59 +05:30
Deepesh Garg
4a2e4748ac
fix: Unallocated amount for inclusive charges
2021-07-13 11:22:55 +05:30
Noah Jacob
74b3fc1e1c
refactor: suggested changes
2021-07-13 11:05:53 +05:30
Noah Jacob
1e8f598ba5
fix: Sider
2021-07-13 11:05:53 +05:30
Noah Jacob
dd0a8f20e2
test: updated test cases
2021-07-13 11:05:53 +05:30
Noah Jacob
fedee0e8da
test: test cases for fetching customer group details
2021-07-13 11:05:53 +05:30
Noah Jacob
f07f7e9305
test: test case for fetching supplier group details
2021-07-13 11:05:53 +05:30
Noah Jacob
1cb2af00a8
feat: details fetched from customer group in customer
2021-07-13 11:05:53 +05:30
Noah Jacob
9965af166e
feat: details fetched from supplier group in supplier
2021-07-13 11:05:53 +05:30
Marica
73c9a21987
Merge branch 'develop' into supplier_defaults_fix
2021-07-13 10:31:10 +05:30
Deepesh Garg
30f771b26c
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payment_entry_taxes_v12
2021-07-12 23:34:13 +05:30
Deepesh Garg
855e9030f2
fix: Deduct included taxes from unallocated amount
2021-07-12 22:11:57 +05:30
Saqib
0683337f14
fix: incorrect response by variance & resolution by variance ( #26173 )
2021-07-12 20:21:07 +05:30
Saqib
7fb64d1645
fix: exchange gain loss not set for advances linked with invoices ( #26436 )
2021-07-12 18:33:16 +05:30
Deepesh Garg
1298956482
fix: Use update flag for company dependant fixtures
2021-07-12 18:29:52 +05:30
Nabin Hait
ca6e4bed9f
Merge pull request #26431 from nabinhait/reposting-optimization
...
refactor: Optimized code for reposting item valuation
2021-07-12 15:42:24 +05:30
Nabin Hait
826d2b1e7b
Merge pull request #26433 from nabinhait/reposting-optimization-develop
...
refactor: Optimized code for reposting item valuation
2021-07-12 15:42:14 +05:30
Saqib
a20999cfbc
fix: exchange gain loss not set for advances linked with invoices ( #25369 )
2021-07-12 14:33:23 +05:30
Saqib
b75b556bbb
fix: move the rename abbreviation job to long queue ( #26435 )
2021-07-12 14:32:37 +05:30
Saqib
9e1819d366
fix: move the rename abbreviation job to long queue ( #26434 )
2021-07-12 14:31:57 +05:30
Nabin Hait
97bce3af9a
refactor: Optimized code for reposting item valuation
2021-07-12 13:33:08 +05:30
Nabin Hait
0003938f2b
refactor: Optimized code for reposting item valuation
2021-07-12 13:29:20 +05:30
Nabin Hait
01aada6c90
refactor: Optimized code for reposting item valuation
2021-07-12 13:28:19 +05:30
Nabin Hait
45e6cffa4f
refactor: Optimized code for reposting item valuation
2021-07-12 13:26:08 +05:30
Jannat Patel
b4ea185eca
fix: added company filter while fetching loans ( #26295 )
...
* fix: added company filter while fetching loans
* fix: added set_query in refresh
* fix: quotes
* fix: tests
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-12 13:15:41 +05:30
Jannat Patel
38994bd494
fix: Added Company filters for Loan ( #26294 )
...
* fix: loan validations
* fix: added company filter while fetching loans
* fix: tests
2021-07-12 13:01:31 +05:30
rohitwaghchaure
e2c97b1a2b
Merge pull request #26351 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt-develop
...
fix: stock entry with putaway rule not working
2021-07-12 12:49:25 +05:30
Nabin Hait
470c7e773f
fix: merge conflict
2021-07-12 12:45:49 +05:30
Deepesh Garg
4ff98cc171
fix: Incorrect discount amount on amended document
2021-07-12 11:27:28 +05:30
Afshan
7e05bea6a9
fix: dunning calculation of grand total when rate of interest is 0% ( #26286 )
2021-07-12 11:11:58 +05:30
Afshan
10473b1195
fix: dunning calculation of grand total when rate of interest is 0% ( #26285 )
2021-07-12 11:11:29 +05:30
Afshan
bf03671a33
fix(report): iterate on accounts only when accounts exist ( #26391 )
2021-07-12 11:10:28 +05:30
Afshan
4b4ac7c051
fix(report): iterate on accounts only when accounts exist ( #26390 )
2021-07-12 11:10:00 +05:30
Afshan
f60c3f0655
fix: error popup for COA errors ( #26358 )
2021-07-12 11:07:30 +05:30
Afshan
6467632f60
fix: error popup for COA errors ( #26357 )
2021-07-12 11:07:06 +05:30
Saqib
432d8efa3d
fix(pos): taxes amount in pos item cart ( #26411 )
2021-07-12 10:47:40 +05:30
Ankush
caacd0ad2c
fix: stock levels disapperaing on refresh (bp #26305 )
...
refresh_section removes all sections with `custom` class, added
different class to avoid this behaviour.
# Conflicts:
# erpnext/stock/doctype/item/item.js
2021-07-12 10:20:19 +05:30
Ankush Menat
22cb642831
chore: update test company FY
2021-07-12 10:09:50 +05:30
Ankush Menat
b99469cdab
fix: stock levels disapperaing on refresh
...
refresh_section removes all sections with `custom` class, added
different class to avoid this behaviour.
2021-07-12 10:09:50 +05:30
Noah Jacob
0be6583083
refactor: suggested changes
2021-07-12 09:18:19 +05:30
Noah Jacob
34a5cb9106
fix: Sider
2021-07-12 08:48:04 +05:30
Marica
f7748e4109
Merge pull request #26133 from marination/qi-rejection
...
feat: Optionally allow rejected quality inspection on submission
2021-07-10 21:04:32 +05:30
marination
f67f13c384
chore: Test case for QI Rejection in Stock Entry
...
- Use `get_single_value` instead of `get_doc` in validation
- Test Case to check impact of stock settings on SE with rejected qi
2021-07-10 21:02:36 +05:30
Marica
9ba3fce4fd
fix: Consistent alert indicators
2021-07-10 21:02:28 +05:30
marination
654e9d85d1
fix: sider and semgrep
2021-07-10 21:02:19 +05:30
marination
9ac9a4ef21
feat: Optionally allow rejected quality inspection on submission
2021-07-10 21:02:03 +05:30
Deepesh Garg
e282effaed
fix: Error on creation of company for India
2021-07-10 20:23:52 +05:30
marination
c8a825c478
chore: Test case for QI Rejection in Stock Entry
...
- Use `get_single_value` instead of `get_doc` in validation
- Test Case to check impact of stock settings on SE with rejected qi
2021-07-10 18:26:36 +05:30
Deepesh Garg
77f2d2d01e
fix: Unable to download GSTR-1 json
2021-07-10 10:06:38 +05:30
Kenneth Sequeira
862ce916ae
fix: Nested/Multi-level BOM help link ( #26409 )
...
Updated the link for multi-level boms. Current link is broken.
2021-07-09 21:52:50 +05:30
Afshan
f4d45d60f4
Revert "fix: updated onboarding steps for selling module" ( #26414 )
...
This reverts commit 446171acc4
.
2021-07-09 20:45:43 +05:30
Deepesh Garg
eae7c1891f
fix: Remove unintentional changes
2021-07-09 20:08:29 +05:30
Deepesh Garg
c13ac4ab11
fix: Remove unintentional changes
2021-07-09 20:00:55 +05:30
Anuja
446171acc4
fix: updated onboarding steps for selling module
2021-07-09 19:31:44 +05:30
GangaManoj
ef42e80065
fix: Sider issues
2021-07-09 19:25:54 +05:30
Deepesh Garg
171ee51507
fix: Hide amount after tax fields
2021-07-09 18:52:39 +05:30
Saqib
2098684bc0
fix(pos): taxes amount in pos item cart ( #26410 )
2021-07-09 18:09:26 +05:30
Deepesh Garg
38fa3a3f89
fix: Unallocated amount in Payment Entry after taxes
2021-07-09 18:04:24 +05:30
Saqib
13d7043451
fix: column 'outstanding_amount' cannot be null ( #26404 )
2021-07-09 15:33:14 +05:30
Saqib
fe4f58d0f6
fix(e-invoicing): allow export invoice even if no taxes applied ( #26405 )
2021-07-09 15:32:54 +05:30
Saqib
8e8434a78a
fix: omit item discount amount for e-invoicing ( #26353 ) ( #26407 )
2021-07-09 15:32:28 +05:30
Marica
e6ce3bb7ff
Merge branch 'develop' into order-by-weightage-for-web-items-develop
2021-07-09 15:05:46 +05:30
Saqib
77e00403c8
fix: omit item discount amount for e-invoicing ( #26353 )
2021-07-09 14:41:03 +05:30
Saqib
b199702977
fix(e-invoicing): allow export invoice even if no taxes applied ( #26363 )
2021-07-09 14:37:34 +05:30
Saqib
47ccfd6c9d
fix: column 'outstanding_amount' cannot be null ( #26371 )
2021-07-09 14:36:13 +05:30
Subin Tom
9ac63da457
fix: value fetching for custom field in POS ( #26367 )
2021-07-09 14:35:11 +05:30
Marica
50170a8e62
Merge branch 'develop' into order-by-weightage-for-web-items-develop
2021-07-09 14:34:56 +05:30
Subin Tom
95a15ed85d
fix: value fetching for custom field in POS ( #26366 )
2021-07-09 14:34:51 +05:30
Subin Tom
d53991857c
fix: Fixed Budget Variance Graph color from all black to default ( #26368 )
2021-07-09 14:33:00 +05:30
marination
99f449939d
fix: Order Items by weightage in the web items query
2021-07-09 13:44:29 +05:30
Marica
eb0dea09bb
Merge pull request #26333 from marination/lcv-validate-invoice
...
fix: Validate LCV for Invoices without Update Stock
2021-07-09 13:41:34 +05:30
marination
98173038b5
fix: Rename function and tweak logic
...
- Dont validate PI on `else`
2021-07-09 13:38:23 +05:30
marination
86f5dfbb8f
fix: Validate LCV for Invoices without Update Stock
2021-07-09 13:38:15 +05:30
Marica
01be96adb2
Merge branch 'version-13-hotfix' into qi-rejection
2021-07-09 13:30:21 +05:30
marination
bf462abb00
fix: Rename function and tweak logic
...
- Dont validate PI on `else`
2021-07-09 13:12:33 +05:30
Anurag Mishra
afafe406c8
Merge pull request #26388 from Anurag810/training_fix_v13
...
fix: Query for Training Event
2021-07-09 12:21:17 +05:30
Anurag Mishra
6949114569
Merge pull request #26389 from Anurag810/training_v13_fix
...
fix: Query for Training Event
2021-07-09 12:20:57 +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
Alan
257cbd3b92
fix: track changes on batch ( #26382 )
2021-07-08 18:44:30 +05:30
Anurag Mishra
a82e9e42e1
fix: query for training Event
2021-07-08 17:27:21 +05:30
Anurag Mishra
b6ff8917e8
fix: query for training Event
2021-07-08 17:25:37 +05:30
Rucha Mahabal
a4132d7ec6
Merge branch 'develop' into fix-sla-test
2021-07-08 16:20:11 +05:30
Rucha Mahabal
091f41e986
fix: yet another fix for flaky SLA Test
2021-07-08 14:57:54 +05:30
Jannat Patel
42214999a6
Merge branch 'develop' into salary-slip-fix--develop
2021-07-08 13:44:12 +05:30
Jannat Patel
cf28950327
Merge pull request #26349 from Anurag810/salary-slip-fix--hotfix
...
fix: payroll-entry minor fix
2021-07-08 13:43:55 +05:30
Anurag Mishra
8f945a9852
fix: Removed un-used flag
2021-07-08 13:06:04 +05:30
Anurag Mishra
fac420ee09
fix: Removed un-used flag
2021-07-08 13:05:14 +05:30
Saqib
eaef371585
fix: escape quotes while fetching customer emails ( #26329 )
2021-07-08 10:52:41 +05:30