Rucha Mahabal
eae39964e8
chore: Remove unused files
2022-07-19 13:04:07 +05:30
Marica
2a2db8c64a
Merge branch 'develop' into lcv-future-stock-update
2022-07-19 12:53:51 +05:30
Ankush Menat
885e731872
ci: lint commit messages ( #31625 )
2022-07-19 12:00:53 +05:30
Deepesh Garg
a6ff4db2ec
fix: Supplier details in TDS monthly report ( #31599 )
2022-07-19 10:14:44 +05:30
Rucha Mahabal
bc2c2aedad
fix(minor): Remove extra space from translated string ( #31617 )
2022-07-18 13:48:14 +05:30
Wolfram Schmidt
340bf905ec
fix: added Section translation in German for Salary Slip ( #31608 )
2022-07-18 13:33:51 +05:30
Ankush Menat
755a060ba7
refactor: dont force issue list options ( #31613 )
...
Setting route option forces the filters, only default filters should be
set and not forced for each visit.
2022-07-18 11:12:07 +05:30
Rucha Mahabal
2ae48fbdd4
Merge branch 'develop' into hr-separation
2022-07-18 10:58:22 +05:30
Deepesh Garg
b62028722e
Merge pull request #31549 from resilient-tech/ic-lingering-code
...
chore: remove missed code for India localisation
2022-07-15 15:20:06 +05:30
Ankush Menat
67a74a4d14
fix: dont check first row on report load
...
- This doesn't actually load the chart but leaves UI and data in
inconsistent state
- On refresh it randomly keeps toggling the first row - confusing
behaviour.
2022-07-15 14:09:58 +05:30
Ankush Menat
ceeea6180e
fix: dont override default report options in charts
...
Sales analytics and purchase analytics reports are clearing the default
options which includes number shortening, axis options etc. This makes
report unreadable when dealing with large numbers.
2022-07-15 14:09:58 +05:30
Devin Slauenwhite
1e20358c28
fix: sum stock_value and group by warehouse
2022-07-14 18:53:50 -04:00
Devin Slauenwhite
bc3023318e
chore: remove unused import
2022-07-14 18:09:52 -04:00
Devin Slauenwhite
73ade04dcf
pref: reduce count of db calls from n to 2
2022-07-14 18:09:08 -04:00
Sagar Vora
70c4117c22
fix: unlink custom fields in patch
2022-07-14 15:02:37 +05:30
Sagar Vora
be4a44fccd
Merge remote-tracking branch 'upstream/develop' into ic-lingering-code
2022-07-14 14:36:14 +05:30
Rucha Mahabal
f765428757
chore: Remove HRMS templates
2022-07-14 11:59:06 +05:30
Rucha Mahabal
db586afc7b
chore: Remove Salary Component Accounts doctype from Accounts module
2022-07-13 13:38:58 +05:30
Devin Slauenwhite
0a633a212d
fix: display customer name on picking list
2022-07-12 13:05:40 -04:00
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation
2022-07-12 19:27:19 +05:30
Deepesh Garg
d7446fd3ae
Merge pull request #31543 from lebmatter/loan_balance_adjustments
...
feat: Loan balance adjustment doctypes
2022-07-12 18:25:45 +05:30
marination
de9ea70ce3
test: LCV impact on future stock balancees
2022-07-12 13:00:00 +05:30
Ankush Menat
2224b6503b
chore: typo
...
[skip ci]
2022-07-12 12:39:22 +05:30
Deepesh Garg
0bac030ca7
chore: Linting Issues
2022-07-11 22:04:52 +05:30
Deepesh Garg
d933ff5cf6
chore: Linting Issues
2022-07-11 21:50:01 +05:30
Deepesh Garg
9b40f70ac2
Merge branch 'develop' into add_index_to_payment_ledger
2022-07-11 21:18:10 +05:30
Deepesh Garg
0b822dade0
Merge pull request #31566 from deepeshgarg007/ignore_account_currency
...
fix: Allow multi currency invoice against single party account
2022-07-11 21:14:02 +05:30
Deepesh Garg
e04e67c6bf
chore: fix query
2022-07-11 19:25:18 +05:30
Rucha Mahabal
5a51951224
test: Basic Payment Entry for Employee
2022-07-11 14:36:33 +05:30
Deepesh Garg
3cf609fab1
chore: Ignore validation
2022-07-11 13:46:59 +05:30
Deepesh Garg
c83fbd5c50
fix: Allow multi currency invoice against single party account
2022-07-11 13:43:01 +05:30
Rucha Mahabal
cd9a01be5f
test: Loan entries in Bank Reco Statement report
2022-07-11 11:57:25 +05:30
Ankush Menat
3031592368
chore: form tour location
...
closes https://github.com/frappe/frappe/issues/17247
[skip ci]
2022-07-11 11:50:57 +05:30
Marica
681b334236
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-11 11:22:51 +05:30
Marica
18a8e3fd60
Merge pull request #31550 from marination/rfq-email-addressing
...
fix: Use Contact Name instead of Supplier in RFQ Email
2022-07-11 11:21:17 +05:30
ruthra kumar
74d9fc2155
refactor: create index for payment ledger
2022-07-11 11:17:27 +05:30
Rucha Mahabal
f6fb00b59d
test: Matching Loan Repayment query in Bank Reco
2022-07-08 19:28:38 +05:30
Ankush Menat
4ec85cb2f0
test: don't silently fail reposts in tests ( #31559 )
2022-07-08 19:28:03 +05:30
Abhinav Raut
13b7ed1e2c
fix: on cancel for loan refund
2022-07-08 17:58:36 +05:30
Labeeb Mattra
35f2717ad2
Consider refund_amount in pending principal amount
2022-07-08 17:53:29 +05:30
Labeeb Mattra
9df1413adb
fix excess amount calculation in loan refund
2022-07-08 17:52:36 +05:30
Labeeb Mattra
245b0c7818
Update adjustment_type field options
2022-07-08 16:49:19 +05:30
Labeeb Mattra
6cc09ef3a2
fix adjustment amount field name
2022-07-08 16:38:41 +05:30
Marica
dc3d492c83
Merge branch 'develop' into rfq-email-addressing
2022-07-08 15:39:20 +05:30
marination
300e812a1f
chore: Instantiate variable unconditionally
2022-07-08 15:38:44 +05:30
Nabin Hait
8b69a3ec7a
Merge pull request #30955 from s-aga-r/subcontracting
...
feat: subcontracting module
2022-07-08 15:21:46 +05:30
Nabin Hait
a768b4cec3
Merge branch 'develop' into subcontracting
2022-07-08 15:21:03 +05:30
rohitwaghchaure
0c2e0693eb
Merge pull request #31553 from s-aga-r/fix/job-card/report/status
...
fix: status filter in Job Card Summary
2022-07-08 11:56:18 +05:30
Sagar Sharma
57b6dab1da
fix: status filter in Job Card Summary
2022-07-07 23:19:17 +05:30
Deepesh Garg
832a863d1e
Merge pull request #31451 from Altizo/develop
...
fix: update ru translate
2022-07-07 21:15:22 +05:30
