Rucha Mahabal
|
1cc8c79807
|
test: fix flaky carry forwarded leave expiry test (#30810)
|
2022-04-26 17:43:08 +05:30 |
|
Saqib Ansari
|
078f26bef3
|
Merge pull request #30808 from nextchamp-saqib/pos-search-ux-fix
fix(pos): search field doesn't reset on checkout
|
2022-04-26 14:47:22 +05:30 |
|
Saqib Ansari
|
b1ac5ff9d2
|
fix(pos): number pad translations
|
2022-04-26 14:41:36 +05:30 |
|
Saqib Ansari
|
03a6103fe5
|
fix(pos): search field doesn't reset on checkout
|
2022-04-26 14:28:33 +05:30 |
|
Deepesh Garg
|
00ace8f62c
|
Merge branch 'develop' into accounting_dimension_consistency
|
2022-04-26 14:26:08 +05:30 |
|
Deepesh Garg
|
82a0635c66
|
fix: Consistent accounting dimensions across Sales and Purchase docs
|
2022-04-26 14:01:13 +05:30 |
|
ruthra kumar
|
b0ead459a0
|
feat: add payment terms status rpr to Selling homepage
|
2022-04-26 13:30:13 +05:30 |
|
Ankush Menat
|
8d20da9b7a
|
Merge pull request #30774 from ankush/postgres/stock
fix(postgres): minimum required changes for postgres builds
|
2022-04-26 12:11:34 +05:30 |
|
Ankush Menat
|
88e257ff6d
|
fix: column name in party query
|
2022-04-26 11:47:05 +05:30 |
|
Ankush Menat
|
052171f51c
|
fix: date condition in tax rule
|
2022-04-26 11:47:05 +05:30 |
|
Ankush Menat
|
a90e7e32a4
|
fix: proper quoting in sql queries
|
2022-04-26 11:47:05 +05:30 |
|
Ankush Menat
|
7e555d3d8c
|
fix: item price query for postgres
postgres doesn't like bad type comparisons and doesn't have `isnull`
funciton
|
2022-04-26 11:47:02 +05:30 |
|
Ankush Menat
|
7d2587c0a9
|
fix: nullish check and table name
|
2022-04-26 11:03:32 +05:30 |
|
Ankush Menat
|
0fdfc1e76e
|
fix: only query fields that exist
|
2022-04-26 11:03:32 +05:30 |
|
Ankush Menat
|
ce75fe0ec4
|
fix: out of range date value
|
2022-04-26 11:03:32 +05:30 |
|
Ankush Menat
|
cdac2b8c63
|
fix: ignore duplicate fixtures
|
2022-04-26 11:03:32 +05:30 |
|
Ankush Menat
|
e1c1687661
|
refactor: use db agnostic CombineDatetime
|
2022-04-26 11:03:32 +05:30 |
|
Deepesh Garg
|
d3582ea399
|
fix: Allow multi-currency opening invoices
|
2022-04-25 18:18:39 +05:30 |
|
Deepesh Garg
|
4ffea617ef
|
Merge pull request #30754 from deepeshgarg007/round_off_account_cost_center
fix: First preference to parent cost center rather than round off cost center
|
2022-04-25 17:06:19 +05:30 |
|
Deepesh Garg
|
3fa1c63479
|
test: Unit test for round off entry dimensions
|
2022-04-25 16:29:26 +05:30 |
|
Deepesh Garg
|
b1158bcb7c
|
Merge pull request #30799 from nextchamp-saqib/einv-cess-fix
fix(india): cess value not considered while validating e-invoice totals
|
2022-04-25 14:39:15 +05:30 |
|
Deepesh Garg
|
f064e0b15e
|
Merge pull request #30642 from rahib-hassan/separate-discount-account
feat: separate discount accounting for buying and selling
|
2022-04-25 14:07:20 +05:30 |
|
Saqib Ansari
|
8e6c7a6bf7
|
fix(india): cess value not considered while validating e-invoice totals
|
2022-04-25 14:02:46 +05:30 |
|
Deepesh Garg
|
02aaa6546c
|
chore: Remove dead code
|
2022-04-25 12:42:06 +05:30 |
|
Deepesh Garg
|
22bc107d70
|
Merge pull request #30778 from deepeshgarg007/accpunting_dimension_validate_ignore_new
fix: Do not validate while creating accounting dimension
|
2022-04-25 12:30:51 +05:30 |
|
rahib-hassan
|
6c86067d90
|
Merge branch 'develop' into separate-discount-account
|
2022-04-25 12:17:50 +05:30 |
|
Ankush Menat
|
d6a43a39ae
|
test: tie breaking in SLEs (#30796)
[skip ci]
|
2022-04-25 11:46:01 +05:30 |
|
Deepesh Garg
|
618fa0e8ea
|
Merge branch 'develop' into accpunting_dimension_validate_ignore_new
|
2022-04-24 20:55:50 +05:30 |
|
Deepesh Garg
|
afc6aa88f0
|
Merge pull request #30763 from deepeshgarg007/loan_reconciliation
fix: Add loan doctypes in bank clearance
|
2022-04-24 20:55:29 +05:30 |
|
Deepesh Garg
|
c515abc392
|
test: Remove teardown method
|
2022-04-24 19:20:29 +05:30 |
|
Deepesh Garg
|
c312cd3725
|
fix: Check if accounting dimension exists
|
2022-04-24 18:11:32 +05:30 |
|
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 |
|