ruthra kumar
739d328412
Merge pull request #31537 from ruthra-kumar/add_index_to_payment_ledger
...
refactor: create index for payment ledger
2022-07-21 12:50:39 +05:30
Saqib Ansari
d578afab55
fix: rounding errors while closing pos ( #31654 )
2022-07-21 12:18:28 +05:30
Saqib Ansari
2eaa8b17bd
fix(pos): validate product bundles while submitting pos invoice ( #31615 )
2022-07-21 12:17:58 +05:30
ruthra kumar
5b85af5f1a
fix: use current pos profile on sales return
2022-07-21 12:16:16 +05:30
rohitwaghchaure
5a3999e236
Merge pull request #31424 from rohitwaghchaure/feat-inventory-dimension
...
feat: Inventory Dimension
2022-07-20 19:47:14 +05:30
Deepesh Garg
6d61525ae4
Merge pull request #31648 from deepeshgarg007/dimension-patch-fix
...
fix: Patch to make accounting dimension in orders
2022-07-20 19:02:00 +05:30
Deepesh Garg
cad2035e07
chore: do not re run patch
2022-07-20 19:01:14 +05:30
Deepesh Garg
d46e406db7
fix: Patch to make accounting dimension in orders
2022-07-20 18:59:36 +05:30
Rucha Mahabal
8b67d627d8
fix(patch): Remove missed records for HR & Payroll separation ( #31646 )
...
* fix(patch): delete HR Payroll custom fields from core
* fix: delete HR Payroll dashboard chart, number card, web forms
2022-07-20 18:56:37 +05:30
Rohit Waghchaure
289e6cd4ce
fix: change frappe.db.sql to frappe.qb
2022-07-20 16:02:13 +05:30
Rohit Waghchaure
e576f7f07e
test: test cases for inventory dimension
2022-07-20 16:02:13 +05:30
Rohit Waghchaure
dbec5cff00
feat: Inventory Dimension
2022-07-20 16:02:13 +05:30
Rucha Mahabal
f222284c33
Merge branch 'develop' into hr-separation
2022-07-20 15:47:40 +05:30
Nabin Hait
409c2e98a9
Merge pull request #31628 from nabinhait/pcv-perf-enhancements-dev
...
perf: Optimization of gl entry processing logic in period closing voucher
2022-07-20 15:38:34 +05:30
Nabin Hait
e1fa723eef
fix: set args to empty list if None to avoid enumerate error
2022-07-20 15:19:09 +05:30
Nabin Hait
b26438ccf7
test: Fixed test for WDV method depreciation schedule
2022-07-20 14:27:06 +05:30
Nabin Hait
6c29146c91
fix: Removed 'Allow Monthly Depreciation' checkbox
2022-07-20 14:27:06 +05:30
Rucha Mahabal
f2532a6aaa
Merge branch 'develop' into hr-separation
2022-07-20 14:22:27 +05:30
Nabin Hait
516be870df
fix: Renamed status field to gle_processing_status
2022-07-20 11:07:02 +05:30
Devin Slauenwhite
7083b3148b
fix: make customer_name field read only.
2022-07-19 11:02:43 -04:00
Devin Slauenwhite
d3f0897420
Merge branch 'develop' into fix-pl-customer-name
2022-07-19 11:01:28 -04:00
rohitwaghchaure
60dbd6a246
Merge pull request #31631 from rohitwaghchaure/slow-stock-reposting-issue
...
fix: slow stock reposting
2022-07-19 18:47:23 +05:30
Rucha Mahabal
b30f66c029
chore: use get_single_value in place of get_value
2022-07-19 17:51:03 +05:30
Vladislav
756a7bcc5c
fix: update ru translate ( #31594 )
...
* 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
* chore: Missing comma
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2022-07-19 17:35:08 +05:30
Rohit Waghchaure
1d80d37ccf
fix: slow stock reposting
2022-07-19 16:36:22 +05:30
Nabin Hait
69b906438d
fix: set status on submit/cancel
2022-07-19 15:05:56 +05:30
Nabin Hait
914a388ee3
test: Added test for PCV cancellation
2022-07-19 14:34:01 +05:30
Nabin Hait
4caaab32d1
perf: Optimization of gl entry processing logic in period closing voucher
2022-07-19 14:33:49 +05:30
Rucha Mahabal
8ce526115d
patch: Add HR & Payroll deprecation warning
2022-07-19 13:19:34 +05:30
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
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
a768b4cec3
Merge branch 'develop' into subcontracting
2022-07-08 15:21:03 +05:30
Sagar Sharma
57b6dab1da
fix: status filter in Job Card Summary
2022-07-07 23:19:17 +05:30
Deepesh Garg
5eb2e71f0f
Merge branch 'develop' into develop
2022-07-07 21:15:03 +05:30
Rucha Mahabal
108cce2785
refactor: rewrite raw sql queries with frappe.qb and database API
2022-07-07 19:00:19 +05:30
Labeeb Mattra
0ed6382ab6
fix indent and imports
2022-07-07 17:40:50 +05:30
Rucha Mahabal
64075cbebc
Merge branch 'develop' into hr-separation
2022-07-07 17:36:01 +05:30
Labeeb Mattra
8434ec09c3
fix lint
2022-07-07 17:20:21 +05:30
marination
88ac519b24
fix: Use Contact Name instead of Supplier in RFQ Email
2022-07-07 16:59:23 +05:30
Sagar Vora
93f87cb6e2
chore: remove missed code for India localisation
2022-07-07 16:41:41 +05:30
Ankush Menat
bc3f99321a
refactor: department creation ( #31548 )
...
- all department creation always fails after first company, this is
handled in exception handling code but better to not attempt this in
first place.
- move department creation to company.py this has nothing to do with
setup and previous function signature made no sense.
2022-07-07 16:05:18 +05:30
marination
7a6ee8cf2d
chore: Remove image use in website item list
2022-07-07 14:25:02 +05:30
Rucha Mahabal
2248276fe9
chore: Remove gratuity rule patch
2022-07-07 13:48:59 +05:30
Rucha Mahabal
ef02e58859
Merge branch 'develop' into hr-separation
2022-07-07 13:46:54 +05:30
Deepesh Garg
f73408bfd6
fix: Unable to open quotation
2022-07-07 10:47:48 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting
2022-07-07 09:56:23 +05:30
Suraj Shetty
c9dc902dee
Merge branch 'develop' into update-library-usage
2022-07-07 09:40:21 +05:30
Labeeb Mattra
1b5b2138ee
Use adjustment amounts in pending principal amnt
2022-07-06 18:52:04 +05:30
Labeeb Mattra
a1a51ce1a6
Add ref no to balance adjustment remarks
2022-07-06 18:52:04 +05:30
Labeeb Mattra
74dbf8c5d9
Add reference number to repayment remarks
2022-07-06 18:52:04 +05:30
Labeeb Mattra
27a8e16b28
Add NPA checkbox in Loan
2022-07-06 18:52:04 +05:30
Labeeb Mattra
7d6e4898c4
Update list view for Accrual and Shortfall
2022-07-06 18:52:04 +05:30
Labeeb Mattra
6febcd529b
Remove loan account field from doctype
2022-07-06 18:52:04 +05:30
Labeeb Mattra
7d468a8778
Use new adjustment amount fields
2022-07-06 18:52:04 +05:30
Labeeb Mattra
d6f632a770
Seperate credit and debit adjust amount fields in Loan
2022-07-06 18:52:04 +05:30
Abhinav Raut
5c0a25012c
feat: add adjustment amount to loan
...
- fix: bugs in loan balance adjustment
2022-07-06 18:52:04 +05:30
Labeeb Mattra
2e8f056514
Add Loan Balance Adjustment doctype
2022-07-06 18:52:04 +05:30
Labeeb Mattra
e1682965c5
Add Loan Refund doctype
2022-07-06 18:52:04 +05:30
