Deepesh Garg
783793deac
Merge branch 'develop' of https://github.com/frappe/erpnext into round_off_account_cost_center
2022-04-23 21:40:38 +05:30
Deepesh Garg
015812b0b8
fix: Add accounting dimensions for round off GL Entry
2022-04-23 21:40:08 +05:30
Deepesh Garg
d4d83f4bb6
test: Fixes in test case
2022-04-23 12:33:35 +05:30
Deepesh Garg
0eacc99ab7
test: Fixes in test case
2022-04-23 12:08:30 +05:30
Rucha Mahabal
deed9702cf
Merge pull request #30780 from ruchamahabal/promotion-enhancements
2022-04-22 22:33:39 +05:30
Rucha Mahabal
8e5327a0e0
fix: clear property child table on changing employee
2022-04-22 21:33:24 +05:30
Rucha Mahabal
9d158088ee
chore: remove unused Employee Transfer Property doctype
2022-04-22 20:20:12 +05:30
Rucha Mahabal
cfa4dfe7a8
fix: reset old CTC on promotion cancellation
2022-04-22 20:20:04 +05:30
Rucha Mahabal
9b93c63830
fix: tests
2022-04-22 17:54:32 +05:30
Wolfram Schmidt
43c1d63ab2
fix translation ( #30781 )
...
fixed the short word for March in german language
2022-04-22 17:32:34 +05:30
Rucha Mahabal
788e0a1c6c
chore: format employee_property_update.js
2022-04-22 17:25:37 +05:30
Marica
f99ba8dba9
Merge pull request #30779 from marination/validate-shopping-cart-quote-items
...
fix: Shopping cart quotation without website item.
2022-04-22 17:21:09 +05:30
Rucha Mahabal
ed04241cf4
Merge branch 'develop' into promotion-enhancements
2022-04-22 16:38:01 +05:30
Rucha Mahabal
833a33a94b
test: employee property update via Employee Promotion
2022-04-22 16:28:25 +05:30
Rucha Mahabal
a93867de19
feat: add CTC fields in Employee master and Promotion
2022-04-22 16:28:14 +05:30
marination
8d632e9b9c
style: Re-run pre-commit
2022-04-22 16:27:29 +05:30
marination
b848e61954
fix: Skip unpublished Variants with published templates in shopping cart quote validation
2022-04-22 16:25:56 +05:30
Devin Slauenwhite
53d8168dea
fix: linter format string after translation
2022-04-22 16:25:28 +05:30
Devin Slauenwhite
ea6d6e31b3
fix: linter trilaing whitespace
2022-04-22 16:25:21 +05:30
Devin Slauenwhite
48da3b4482
fix: sider issues
2022-04-22 16:23:18 +05:30
Devin Slauenwhite
b88d5d135e
fix(test): validate exception without website item
2022-04-22 16:23:07 +05:30
Devin Slauenwhite
86832fb7fe
test: assert error if quotation contains non website item
2022-04-22 16:22:58 +05:30
Devin Slauenwhite
678a1179d4
fix: shopping cart quotation without website item
2022-04-22 16:22:32 +05:30
Deepesh Garg
9bb132fdd3
fix: Do not validate while creating accounting dimension
2022-04-22 13:39:43 +05:30
Vladislav
e088e65871
fix: update translation ( #30725 )
...
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
2022-04-22 11:00:57 +05:30
Deepesh Garg
81b3342480
Merge pull request #30757 from nextchamp-saqib/einv-401-fix
...
fix(india): 401 & 403 client error while generating IRN
2022-04-21 18:55:26 +05:30
Deepesh Garg
8a8476bb5c
test: Add test coverage for bank clearance
2022-04-21 18:53:18 +05:30
Ankush Menat
d5ab626a31
Merge pull request #30726 from ankush/dependent_gle_reposting
...
fix: dependent gle reposting
2022-04-21 18:06:40 +05:30
Ankush Menat
ee3036651a
fix: batch_no filtering not working when batch no is also a number in scientific notation ( #30770 )
...
[skip ci]
2022-04-21 16:34:31 +05:30
rahib-hassan
78c8e46511
Merge branch 'develop' into separate-discount-account
2022-04-21 15:06:58 +05:30
Ankush Menat
4dced7dfeb
Merge pull request #30733 from marination/field-filters-e-com
...
fix: Filter fields in E Commerce Settings (use Website Item)
2022-04-21 14:30:31 +05:30
Deepesh Garg
c42547d40f
fix: Use parent cost center for Sales and Purchase Invoice
2022-04-21 13:26:44 +05:30
Marica
87f1617780
Merge branch 'develop' into field-filters-e-com
2022-04-21 12:32:33 +05:30
marination
c5d4bed932
test: setup e commerce settings before running invalid filtrs test
2022-04-21 12:29:30 +05:30
Rucha Mahabal
c3dc5d5ce7
fix: property addition not working for select fields
2022-04-21 08:17:00 +05:30
rahib-hassan
02e17dbded
fix: removed manual enable-discount-account method
2022-04-21 02:42:42 +05:30
rahib-hassan
2c78cc2014
fix: removed manual rollback - enable discount account
2022-04-21 02:40:59 +05:30
Deepesh Garg
3d0e68acaa
fix: select doctype as payment_document
2022-04-20 19:49:53 +05:30
Deepesh Garg
c3e27b5556
fix: Loan doctypes in bank reconciliation
2022-04-20 19:07:53 +05:30
marination
8981405a62
test: Field filter validation and Custom field as field filter
...
- Test to block Item fields (which aren’t in Website Item) in E Commerce Settings as filters
- Removed unnecessary function and setup in E Commerce Settings test
- Removed commented useless test
- Test to check custom field as filter
2022-04-20 18:50:47 +05:30
marination
6d750e185e
fix: Handle Multiselect field mapping separately
...
- Map Multiselect child table to Website Item (copy rows)
2022-04-20 17:40:03 +05:30
rahib-hassan
13092bcc2d
fix: enable discount roll_back
2022-04-20 16:46:29 +05:30
rahib-hassan
1e143e7479
fix: use @change_settings to enable_discount_account
2022-04-20 16:06:55 +05:30
rahib-hassan
f3fa6ac4c2
fix: account setting seperation gl discount account creation
2022-04-20 16:01:12 +05:30
Rucha Mahabal
5411e69553
fix: filters not working in Shift Assignment Calendar view ( #30752 )
2022-04-20 14:56:06 +05:30
Saqib Ansari
ee8047aba3
fix(india): 401 & 403 client error while generating IRN
2022-04-20 14:14:29 +05:30
rahib-hassan
f058755ad3
fix: test cases updated
2022-04-20 13:24:15 +05:30
HENRY Florian
143786aaa0
fix: Must not be able to start Job Card if it is related to Work Order that is not started yet ( #29072 )
...
* fix: Cannot start Job strat if related to Work Order not started yet
* fix: Cannot start Job strat if related to Work Order not started yet
* test
* test
* fix siders
* PR review
* chore: Code cleanup
- Better short circuit for if condition (make it such that both conditions dont always have to be computed)
- Remove `r.message` extraction by avoiding `then()`
* chore: Remove unnecessary json change
Co-authored-by: marination <maricadsouza221197@gmail.com>
2022-04-20 12:29:52 +05:30
marination
5660b335ba
fix: Mistyped variable name in patch
2022-04-20 12:25:59 +05:30
Deepesh Garg
0ac11a5b30
fix: First preference to parent cost center rather than round off cost center
2022-04-20 12:18:11 +05:30
