anandbaburajan
11ac20e5ee
fix: asset tests
2022-09-15 22:43:18 +05:30
Nabin Hait
786891c600
Merge branch 'develop' into bank-clearnance-perm-issue
2022-09-15 17:42:37 +05:30
Nabin Hait
0d732609f0
Merge branch 'develop' into consider-posting-time-for-internal-po
2022-09-15 17:42:26 +05:30
Nabin Hait
c5c6a69269
Merge branch 'develop' into cost-center-renaming
2022-09-15 17:42:13 +05:30
Nabin Hait
73f6c5fe35
Merge branch 'develop' into dunning-fix
2022-09-15 17:42:00 +05:30
anandbaburajan
ff5cad1cd6
fix: calculate depreciation properly on asset sale entry and scrap entry
2022-09-15 13:15:34 +05:30
Nabin Hait
29db084dc3
fix: create dunning from sales invoice
2022-09-15 13:11:53 +05:30
Nabin Hait
af21a11e1e
fix: abbreviation issue on renaming cost center
2022-09-15 12:09:18 +05:30
Rohit Waghchaure
cb763938dc
fix: consider posting time for internal transfer PO
2022-09-15 11:48:43 +05:30
Nabin Hait
c0da948a4e
fix: No permission to read doctype
2022-09-15 11:27:35 +05:30
Nabin Hait
3457105504
fix: test cases
2022-09-15 11:19:33 +05:30
Nabin Hait
a5b5885933
fix: test cases
2022-09-15 11:19:14 +05:30
Nabin Hait
cbf973d90f
fix: always set default expense account in company
2022-09-15 11:19:06 +05:30
Ankush Menat
97977cdb4b
fix: correct sql output format in CRM patch ( #32213 )
2022-09-14 19:19:05 +05:30
Abhinav Raut
f2209045f8
fix: pending accrual entries
2022-09-14 11:55:03 +05:30
Deepesh Garg
b6184ce471
test: Add tests
2022-09-14 09:13:02 +05:30
Deepesh Garg
b6d87ae25b
Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers
2022-09-13 22:31:21 +05:30
Sagar Sharma
bf1fa014f4
test: add test case for item master maintain-stock
2022-09-13 22:12:56 +05:30
Sagar Sharma
7b878ea3d8
fix: unknown column error while updating value of maintain-stock in item master
2022-09-13 21:52:58 +05:30
Deepesh Garg
3fb1595a4e
fix: Fetch vouchers to show in Invoice
2022-09-13 20:31:31 +05:30
Deepesh Garg
246c1a9380
fix: Add child table for tax withheld vouchers
2022-09-13 20:05:20 +05:30
Nabin Hait
e24a4b18c4
Merge branch 'SaiFi0102-asset-capitalization' into develop
2022-09-13 15:00:21 +05:30
Nabin Hait
58d430fe3e
feat: Asset Capitalization
...
- manual selection of entry type
- GLE cleanup with smaller functions
- GLE considering periodical inventory
- test cases
2022-09-13 14:56:21 +05:30
Deepesh Garg
dc985e0e83
Merge pull request #32190 from maharshivpatel/fix-item-wise-sales-register
...
fix: item wise sales register taxes and charges
2022-09-13 13:53:51 +05:30
Shadrak Gurupnor
f2b7c9ee66
fix: validate for active sla ( #32132 )
2022-09-13 13:42:45 +05:30
Ankush Menat
fffc245922
fix(UX): make Item attachments public by default ( #32196 )
2022-09-13 13:41:00 +05:30
Deepesh Garg
f8bee0e75f
Merge pull request #32091 from nabinhait/lead-notes-patch
...
fix: Migrate old lead notes as per the new format
2022-09-13 12:20:50 +05:30
Rucha Mahabal
eb01f9729d
fix(Employee): shorter tab titles ( #32192 )
2022-09-13 10:34:35 +05:30
Deepesh Garg
51c37aeee3
Merge branch 'develop' into lead-notes-patch
2022-09-13 09:42:07 +05:30
Raffael Meyer
e00ece7a78
fix: remove EmployeeBoardingController ( #32139 )
...
fix: remove employee boarding controller
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-09-13 02:00:04 +05:30
Maharshi Patel
62163ab3d3
fix: item wise sales register taxes and charges
...
i have added separate column for other charges. Instead of adding all values to tax_total, it checks if account_type is tax, and then only it adds to total_tax otherwise it adds to the total_other_charges.
2022-09-12 23:44:56 +05:30
Ahmad
4f1cc41b86
fix: pick_list - picked qty getting set to 1
...
(cherry picked from commit 3256e2b8b7cee0e7b95ca58a6f22f96090e2ffaa)
2022-09-12 16:49:45 +00:00
Sagar Sharma
2336bcfe20
Merge branch 'develop' into refactor/report/bom-stock-calculated
2022-09-12 19:20:58 +05:30
rohitwaghchaure
b3b1df7184
Merge pull request #32181 from rohitwaghchaure/fix-min-max-amount-configuration
...
fix: promotional scheme min and max amount configuration
2022-09-12 18:30:01 +05:30
Sagar Sharma
d3cd3bc5ef
Merge branch 'develop' into refactor/report/bom-stock-calculated
2022-09-12 17:23:15 +05:30
Sagar Sharma
e1a98c1ff7
test: add test cases for BOM Stock Calculated report
2022-09-12 17:11:00 +05:30
Rohit Waghchaure
a8fd92ddc1
fix: promotional scheme min and max amount configuration
2022-09-12 16:53:52 +05:30
rohitwaghchaure
8f787c08a2
fix: customer code max characters limit issue ( #32177 )
2022-09-12 16:48:53 +05:30
Sagar Sharma
7a968a5f0d
fix: add missing warehouse filter in BOM Stock Calculated report
2022-09-12 16:12:51 +05:30
Sagar Sharma
56192daabf
fix: required_qty in BOM Stock Calculated report
2022-09-12 16:12:49 +05:30
Nihantra C. Patel
e2b4ae13fa
fix: Set filter condition and spell in AR
2022-09-12 14:09:42 +05:30
Ankush Menat
12d99b3292
refactor: use util method for checking if job is queued
2022-09-12 13:14:48 +05:30
Deepesh Garg
6b94b5334c
Merge pull request #32144 from deepeshgarg007/internal_purchase_invoice_rate
...
fix: Rate for internal PI have non stock UOM items
2022-09-12 09:09:43 +05:30
Sagar Sharma
a86023eb09
Merge branch 'develop' into refactor/report/process-loss-report
2022-09-11 19:15:16 +05:30
Sagar Sharma
5245928648
refactor: rewrite Process Loss Report queries in QB
2022-09-11 19:03:59 +05:30
ruthra kumar
0aeb7c6484
Merge pull request #32156 from ruthra-kumar/bug_multiple_call_to_ple_creation
...
fix: remove duplicate call to ple creation
2022-09-11 12:21:01 +05:30
ruthra kumar
4adc372f9a
fix: remove multiple call to ple creation
2022-09-11 11:52:17 +05:30
ruthra kumar
4576c1ebc3
Merge pull request #32137 from ruthra-kumar/delete_payment_ledger_entries_on_src_doc_delete
...
refactor(minor): delete linked payment ledger entries on source doc deletion
2022-09-11 11:21:24 +05:30
Sagar Sharma
5558191a2a
Merge branch 'develop' into refactor/report/work-order-stock-report
2022-09-10 16:30:15 +05:30
Sagar Sharma
d4c4dddfc3
refactor: rewrite Work Order Stock Report queries in QB
2022-09-10 16:29:47 +05:30
ruthra kumar
70313df531
fix: delete linked payment ledger entries no source doc deletion
2022-09-10 09:30:45 +05:30
Sagar Sharma
723fa9eebc
refactor: BOM Stock Calculated report
2022-09-09 19:11:36 +05:30
Nabin Hait
fefe95052d
fix: resolved merge conflict
2022-09-09 14:40:36 +05:30
Sagar Sharma
2e314a20f1
Merge branch 'develop' into fix/stock-entry/sco
2022-09-09 13:48:14 +05:30
Sagar Sharma
9a3dcb9ad1
fix: validate Subcontracting Order in Stock Entry
2022-09-09 13:46:50 +05:30
Sagar Sharma
30909a9b79
fix: status filter for Subcontracting Order in Stock Entry
2022-09-09 13:45:31 +05:30
Deepesh Garg
0f655e4430
fix: Rate for internal PI have non stock UOM items
2022-09-09 12:40:57 +05:30
Sagar Sharma
b49caf170c
Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor
2022-09-09 11:37:12 +05:30
Deepesh Garg
33d0e09497
Merge pull request #32117 from deepeshgarg007/psoa_fontsize
...
fix: Reduce font size for Process Statement of accounts print/pdf
2022-09-09 11:18:13 +05:30
rohitwaghchaure
6da45144d0
Merge pull request #32135 from rohitwaghchaure/fixed-incorrect-gl-entries-for-internal-transfer
...
fix: reposting not working for internal transferred purchase receipt
2022-09-09 09:30:21 +05:30
Rohit Waghchaure
a03b4ce213
fix: reposting not working for internal transferred purchase receipt
2022-09-08 19:16:00 +05:30
Sagar Sharma
61110dbfe4
Merge branch 'develop' into fix/subcontracting-order/returned-qty
2022-09-08 18:26:50 +05:30
Sagar Sharma
3585daab95
fix: hide "Return of Components" button in closed SCO ( #32130 )
2022-09-08 18:23:56 +05:30
Sagar Sharma
aea7188304
test: add test case for returned-qty
2022-09-08 18:15:48 +05:30
Sagar Sharma
ccb2889cac
fix: SCO Supplied Items returned-qty
2022-09-08 18:15:45 +05:30
rohitwaghchaure
72d5366e96
Merge pull request #31918 from s-aga-r/fix/subcontracting-receipt/gl-entries
...
fix: Subcontracting Receipt GL Entries
2022-09-08 10:17:12 +05:30
rohitwaghchaure
448c5ff3dc
Merge pull request #32118 from rohitwaghchaure/provision-to-manual-reposting
...
fix: option to start reposting from repost item valuation
2022-09-07 16:57:43 +05:30
rohitwaghchaure
7dc8ab4069
Merge pull request #32115 from rohitwaghchaure/fixed-label-not-showing-for-filter
...
fix: inventory dimension filter's label not showing in the report
2022-09-07 16:38:59 +05:30
Rohit Waghchaure
f1c4aea7b5
fix: option to start reposting from repost item valuation
2022-09-07 16:38:17 +05:30
Deepesh Garg
6bfd193b0d
fix: Reduce font size for Process Statement of accounts print/pdf
2022-09-07 16:34:10 +05:30
ruthra kumar
741b5b4978
Merge pull request #32110 from ruthra-kumar/bank_import_statement_bug
...
fix: error on bank statement import
2022-09-07 15:22:14 +05:30
Sagar Sharma
f19049e643
Merge branch 'develop' into fix/subcontracting-receipt/gl-entries
2022-09-07 14:55:56 +05:30
Sagar Sharma
01c2e4d2cf
Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor
2022-09-07 14:52:16 +05:30
Rohit Waghchaure
ef7def8f1d
fix: inventory dimension filter's label not showing in the reort
2022-09-07 14:43:12 +05:30
rohitwaghchaure
5b02adbd33
Merge pull request #32113 from rohitwaghchaure/fixed-internal-transfer-flow
...
fix: internal transfer flow
2022-09-07 14:26:14 +05:30
Rohit Waghchaure
9d1be48bd2
test: added test case for internal transfer
2022-09-07 13:51:52 +05:30
Devin Slauenwhite
aab2c9c682
fix: require barcode item barcode. ( #31957 )
...
* fix: require barcode item barcode.
* fix: make supplier mandatory in Item Supplier DocType
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2022-09-07 12:59:46 +05:30
Rohit Waghchaure
b4a102d119
fix: internal transfer flow
2022-09-07 12:48:18 +05:30
ruthra kumar
a6fbb80b94
fix: import error on bank statement import
...
Name collision between frameworks file importer's internal log and
doctype fieldname - import_log.
Frameworks internal log overrode, doctypes field which caused failure
in basic fieldtype validation.
2022-09-07 11:19:54 +05:30
Sagar Sharma
008542b715
fix: AD not getting copied from SCO while creating a Material Transfer ( #32106 )
2022-09-07 10:15:43 +05:30
Deepesh Garg
8efd305afd
Merge pull request #32089 from frappe/mergify/bp/develop/pr-32086
...
fix: QR Code multi currency issue (backport #32086 )
2022-09-07 07:46:55 +05:30
Sagar Sharma
2f00413864
fix: consider Stock Entry purpose while getting total supplied qty
2022-09-06 16:42:15 +05:30
rohitwaghchaure
c6380a25d6
Merge pull request #32063 from rohitwaghchaure/fixed-fetch-from-parent
...
fix: inventory dimension issues
2022-09-06 10:45:36 +05:30
Rucha Mahabal
5ab5811770
feat: tabbed view for Employee form ( #31940 )
2022-09-06 10:18:14 +05:30
Rohit Waghchaure
75fcab04b1
test: test cases for PI and DN
2022-09-06 01:42:57 +05:30
Nabin Hait
4b13452022
fix: drop old notes column from lead and prospect
2022-09-05 18:28:09 +05:30
Nabin Hait
2a100abef1
perf: lesser SQL queries and no validation
...
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2022-09-05 18:16:34 +05:30
Nabin Hait
3abd00f3bb
fix: Migrate old lead notes as per the new format
2022-09-05 18:10:53 +05:30
Sagar Sharma
74c2458bdb
Merge branch 'develop' into t3
2022-09-05 13:56:21 +05:30
Sagar Sharma
a349b58306
refactor(test): test_update_reserved_qty_for_subcontracting
2022-09-05 13:55:55 +05:30
Sagar Sharma
4a7add2169
fix: validate available qty for consumption in SCR
2022-09-05 13:27:03 +05:30
hamzaali15
987ac513c8
fix: QR Code multi currency issue
...
When try to scan qr code on app it is showing correct values for multi currencies because it is not getting base amount
(cherry picked from commit b10a2b87b65f3c29ed0aae7f30099e9c8ad75377)
2022-09-05 07:13:32 +00:00
Nabin Hait
57257a1795
Merge pull request #32061 from resilient-tech/fix-appointment-creation
...
fix(Appointment): create lead notes as child table
2022-09-05 12:25:45 +05:30
Deepesh Garg
3c055f94e1
Merge pull request #31982 from FHenry/dev_enhance_upgrade_process
...
fix: upgrade process to version-14 when currency opportunity was not set
2022-09-04 19:03:43 +05:30
Deepesh Garg
118b0c0f86
chore: fix message
2022-09-04 19:03:16 +05:30
Deepesh Garg
10d94ed539
Merge pull request #32045 from SolufyPrivateLimited/Solufy-JET
...
fix: Naming series in Journal Entry Template
2022-09-04 16:34:05 +05:30
HENRY Florian
86395c6adb
feat: better Item Price list view ( #31954 )
...
* feat: better Item Price list view
2022-09-04 16:25:03 +05:30
Deepesh Garg
acb88e5c57
Merge pull request #31850 from HarryPaulo/add-two-new-filters-gross-profit
...
feat: two new filters for gross profit
2022-09-04 15:56:54 +05:30
Deepesh Garg
1a61d4e8a8
Merge branch 'develop' into fix-consolidation-precision-error
2022-09-04 13:18:10 +05:30
Deepesh Garg
ad8d0efa29
chore: Linting Issues
2022-09-04 13:15:59 +05:30
Rohit Waghchaure
237299948a
fix: fetch from parent not working for custom field
2022-09-03 17:27:00 +05:30
rohitwaghchaure
0efc6a9abe
Merge pull request #32065 from rohitwaghchaure/not-able-to-make-variant-item
...
fix: not able to make variant item
2022-09-03 11:52:56 +05:30
Rohit Waghchaure
92b0f9cd7e
fix: not able to make variant item
2022-09-03 11:42:04 +05:30
Sagar Vora
875ff15109
test: dont create lead manually, add coverage for notes
2022-09-02 18:30:39 +05:30
Sagar Vora
58e553151e
fix(Appointment): create lead notes as child table
2022-09-02 12:42:37 +00:00
HENRY Florian
7919513c8a
Merge branch 'develop' into dev_enhance_upgrade_process
2022-09-02 13:01:06 +02:00
ruthra kumar
e424ad5ff2
Merge pull request #32054 from ruthra-kumar/bug_in_process_deferred_accounting
...
fix: type error on cancellation of Process Deferred Accounting
2022-09-02 16:20:31 +05:30
ruthra kumar
64f8010a25
Merge pull request #32052 from ruthra-kumar/key_error_on_consolidate_financial_report
...
fix: key error on consolidated financial report
2022-09-02 16:13:19 +05:30
ruthra kumar
1c385541fa
test: pda document submission and cancellation
2022-09-02 12:34:02 +05:30
ruthra kumar
08f2e4edc3
fix: incorrect import parameter for cancel PDA
2022-09-02 10:51:51 +05:30
ruthra kumar
6e8395cccd
fix: key error on consolidated financial report
...
accounts with same name but different account number will throw key
error on consolidated report
2022-09-02 09:55:24 +05:30
Sagar Sharma
68907ca783
chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On ( #32048 )
...
chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On in Buying Settings
2022-09-01 19:31:55 +05:30
Dhananjay Palshikar
75396c02d2
Allow Item Templates in Work Order Items
...
Item Variants can be a part of the items tables, however, when BOM items are fetched to be a part of the Work Order items, item variants were being filtered out.
The filtering out does not serve a purpose. Having Item variants in BOMs allows for template like behaviour.
2022-09-01 19:07:13 +05:30
Solufyin
2085626390
fix: Naming series in Journal Entry Template
2022-09-01 11:49:13 +05:30
HENRY Florian
b05fdb28ff
Merge branch 'develop' into dev_enhance_upgrade_process
2022-08-31 13:52:28 +02:00
Ankush Menat
30039e8e62
fix: encode thumbnail URL
...
If it contains space the URL won't load
2022-08-31 17:06:20 +05:30
Ankush Menat
4a38ce659d
refactor!: drop redisearch
...
incr: replace text and tag fields
incr: use rediswrapper's make key
incr: indexDefinition from redis
incr: replace index creation
incr: replace AutoCompleter
incr: replace product search ac
incr: replace client querying
fix: broken redisearch load test
fix: pass actual query to get suggestion
2022-08-31 17:06:20 +05:30
Deepesh Garg
a76d3827ec
chore: Add check for principal amount
2022-08-30 19:24:57 +05:30
Deepesh Garg
eefc9b7172
fix: Loan Interest accruals for 0 rated loans
2022-08-30 19:16:36 +05:30
Ankush Menat
ffa3071d36
fix: force delete old report docs ( #32026 )
2022-08-30 15:43:57 +05:30
Deepesh Garg
9e0e308a44
Merge pull request #32005 from niyazrazak/patch-4
...
fix: lost quotation not to expired
2022-08-30 10:33:01 +05:30
Raffael Meyer
73f4d5931d
fix: permissions for Task Type ( #32016 )
2022-08-29 21:56:07 +05:30
Ankush Menat
2d41704424
fix(patch): update sla doctype directly ( #32014 )
...
fix: update sla doctype directly
2022-08-29 20:50:27 +05:30
ruthra kumar
25072e5d32
Merge pull request #32009 from ruthra-kumar/add_remarks_to_payment_ledger
...
refactor: readd remarks field to payment ledger
2022-08-29 19:48:36 +05:30
ruthra kumar
d522f13d55
chore: add remarks migration to patches.txt
2022-08-29 15:59:56 +05:30
ruthra kumar
3a6b095ed4
chore: patch for migrating remarks to payment ledger
2022-08-29 15:59:56 +05:30
ruthra kumar
5782c4469a
refactor: re-add remarks field to payment ledger and AR/AP report
2022-08-29 15:59:37 +05:30
Deepesh Garg
6881b68ed7
Merge pull request #32006 from deepeshgarg007/cash_and_non_trade_discount_rounded_total
...
fix: Rounded total for cash and non trade discount invoices
2022-08-29 15:35:23 +05:30
Sagar Sharma
9dbaaa33f5
fix: AD not getting copied from SCO while creating a SE ( #32004 )
2022-08-29 15:07:20 +05:30
MOHAMMED NIYAS
69ffef8c0e
fix: lost quotation not to expired
2022-08-29 14:47:43 +05:30
HENRY Florian
61c143cb82
Merge branch 'develop' into dev_enhance_upgrade_process
2022-08-29 10:49:11 +02:00
Deepesh Garg
318da16b99
fix: Rounded total for cash and non trade discount invoices
2022-08-29 14:18:39 +05:30
Sagar Sharma
af5cbc881f
chore: allow return of components in SCO ( #31994 )
...
chore: allow return of components in sco
2022-08-26 22:49:40 +05:30
Deepesh Garg
87ca23736d
Merge pull request #31988 from ruthra-kumar/remove_precision_discount_percentage
...
chore: remove precision on discount_percentage of Sales Invoice Item
2022-08-26 16:03:57 +05:30
HENRY Florian
6cd7ef9cc3
Merge branch 'develop' into dev_enhance_upgrade_process
2022-08-26 11:33:22 +02:00
ruthra kumar
c42fef541a
chore: remove precision on discount_percentage of Sales Invoice Item
2022-08-26 13:15:55 +05:30
Solufyin
bd4b4ddd8b
fix: Purchase Order creation from Sales Order
2022-08-26 11:18:56 +05:30
Florian HENRY
d19b664ba9
chore: better text
2022-08-25 22:35:44 +02:00
Florian HENRY
ac66538651
chore: remove debug
2022-08-25 22:35:08 +02:00
Florian HENRY
9d02fbadb4
fix: upgrade process to version-14 when currency opportunity wass not set
2022-08-25 20:45:35 +02:00
ruthra kumar
6aa8fd0f7b
fix: restrict party types to Supplier/Customer for AR/AP report
2022-08-25 15:50:06 +05:30
Sagar Sharma
8566832dd5
fix: add validation for PO in Stock Entry ( #31974 )
2022-08-25 15:05:13 +05:30
Deepesh Garg
9e43c9cff3
Merge pull request #31943 from nabinhait/asset-repair
...
fix: gl entries for asset repair
2022-08-25 13:24:26 +05:30
rohitwaghchaure
b27f3ab327
Merge pull request #31967 from rohitwaghchaure/connection-added-for-work-order
...
fix: material request connection on work order
2022-08-25 12:29:10 +05:30
rohitwaghchaure
dae112eed2
Merge pull request #31966 from rohitwaghchaure/set-default-supplier-from-item
...
fix: default supplier not set in the PP
2022-08-25 12:25:00 +05:30
Rohit Waghchaure
9ab10def49
fix: material request connection on work order
2022-08-25 12:13:17 +05:30
Deepesh Garg
c1f6dd46d1
chore: fix against account
2022-08-25 12:10:52 +05:30
Rohit Waghchaure
5fd468d9ec
fix: default supplier not set in the PP
2022-08-25 11:44:12 +05:30
Deepesh Garg
e9b0c7177f
Merge branch 'develop' into fix-consolidation-precision-error
2022-08-25 11:41:20 +05:30
Samuel Danieli
915102a400
chore: german translations ( #31463 )
2022-08-25 11:23:38 +05:30
Deepesh Garg
5187a9a5ad
Merge pull request #31776 from HarryPaulo/fix-net-amout-sales-analytics
...
fix: for Tree Type item and item group show net amout
2022-08-25 11:05:18 +05:30
Deepesh Garg
9b626d06fc
Merge pull request #31909 from s-aga-r/filters/repost-item-valuation/voucher-no
...
fix: Add docstatus filter for voucher_no in Repost Item Valuation
2022-08-25 10:49:29 +05:30
rohitwaghchaure
1af22e5312
Merge pull request #31951 from rohitwaghchaure/maintenance-visit-issue
...
fix: Purposes not set in Maintenance Visit
2022-08-25 10:48:41 +05:30
Deepesh Garg
77906ea4ab
Merge pull request #31934 from ruthra-kumar/disable_discount_accounting_for_buying
...
refactor: disable discount accounting on Buying module(PI)
2022-08-25 10:34:30 +05:30
Deepesh Garg
40bf1a50fd
Merge pull request #31950 from ruthra-kumar/party_currency_or_multi_currency
...
fix: display amount in account currency if party is supplied
2022-08-25 10:33:49 +05:30
Deepesh Garg
91d6454f87
Merge pull request #31955 from FHenry/dev_fr_translation
...
chore: update french translation
2022-08-25 10:26:17 +05:30
ruthra kumar
e5b04d54ff
fix: display amount in account currency if party is supplied
2022-08-25 10:05:25 +05:30
ruthra kumar
ee889afd4c
Merge pull request #31942 from ruthra-kumar/bug_ar_ap_report_include_payment_against_po
...
fix: include payment against PO in AR/AP report
2022-08-25 09:40:45 +05:30
Florian HENRY
299da5d596
chore: update fr translation
2022-08-24 21:29:22 +02:00
Florian HENRY
1f6f2747d4
chore: update fr translation
2022-08-24 21:20:23 +02:00
Florian HENRY
264f98af14
chore: update french translation
2022-08-24 15:52:00 +02:00
Suraj Shetty
122f1c0ced
fix: Explicitly commit "log_error" since its getting called during GET request ( #31952 )
2022-08-24 18:24:39 +05:30
Rohit Waghchaure
f9a7b31b5b
fix: Purposes not set
2022-08-24 17:16:01 +05:30
ruthra kumar
36f5883dda
test: payments against so/po will show up as outstanding amount
...
1. Class will use FrappeTestCase fixture
2. setup and teardown methods are introduced
3. test for payments against SO
2022-08-24 13:59:42 +05:30
Solufyin
0e26df331c
fix: Route condition set for stock ledger ( #31935 )
2022-08-24 13:28:55 +05:30
Nabin Hait
b4a2eb2e65
fix: gl entries for asset repair
2022-08-24 12:29:15 +05:30
ruthra kumar
fdd167cac1
fix: include payment against PO in AR/AP report
2022-08-24 12:24:55 +05:30
HENRY Florian
fe73d55f70
chore: add Work Order test dependencies ( #31936 )
2022-08-23 16:07:10 +05:30
ruthra kumar
277ef04b60
test: remove discount accounting tests
2022-08-23 15:17:27 +05:30
ruthra kumar
a956e20f29
refactor: disable discount accounting on Buying module(PI)
2022-08-23 11:36:00 +05:30
Deepesh Garg
9fd0c25c9f
Merge pull request #31910 from deepeshgarg007/cash_and_non_trade_discount_fix
...
fix: Cash and non trade discount calculation
2022-08-23 10:19:09 +05:30
Deepesh Garg
1cb7ae16ab
chore: Linting issues
2022-08-23 09:12:20 +05:30
Sagar Sharma
2effbb55ae
test: Add test case for Subcontracting Receipt GL Entries
2022-08-22 22:14:56 +05:30
Sagar Sharma
bf5c43322a
fix: don't allow to create SCR directly ( #31924 )
2022-08-22 18:36:42 +05:30
Sagar Sharma
e888639c7e
fix: Subcontracting Receipt GL Entries
2022-08-22 10:48:21 +05:30
Maharshi Patel
42de9ca49e
fix: TDS calculation for advance payment
...
"against_voucher": ["is", "not set"] was used in query due to which if TDS was added on "advance" payment vouchers and then reconciled against purchase invoice. it will not find those vouchers and consider this as first-time threshold due to which it will calculate Tax for all transactions.
(cherry picked from commit a4521437825a960e14556fa3963bd1bd1a55a2dc)
2022-08-22 03:29:46 +00:00
Deepesh Garg
ae3dce0cbd
fix: Test cases
2022-08-22 08:57:58 +05:30
Sagar Sharma
f4673941e0
chore: move function "add_gl_entry" from purchase_receipt.py to stock_controller.py
2022-08-21 21:26:06 +05:30
Deepesh Garg
3b15966cc9
fix: Cash and non trade discount calculation
2022-08-21 17:51:05 +05:30
Sagar Sharma
520306dc87
fix: Add docstatus filter for voucher_no in Repost Item Valuation
2022-08-21 12:09:08 +05:30
Sagar Sharma
588ca68171
fix: make rate field read-only in subcontracting receipt item ( #31905 )
2022-08-20 17:50:47 +05:30
Sagar Sharma
f92f3e0208
chore: add option for "Subcontracting Receipt" in "Voucher Type"
2022-08-19 20:52:26 +05:30
Sagar Sharma
f8c11847bb
chore: allow subcontracting receipt backdated entry
2022-08-19 20:44:13 +05:30
Sagar Sharma
dd719099bc
Merge branch 'develop' into fix/subcontracting/additional-cost
2022-08-19 11:47:23 +05:30
Sagar Sharma
c247cf728c
chore: add test for additional-cost
2022-08-19 11:46:36 +05:30
Sagar Sharma
addd7347d8
fix: test "test_pending_and_received_qty"
2022-08-19 11:46:27 +05:30
Saqib Ansari
756fe4b375
fix(pos): edge case while closing pos ( #31748 )
...
* fix(pos): edge case while closing pos
* fix: linter
* fix: setting posting_time in pos invoice merge log
2022-08-19 10:22:00 +05:30
Sagar Vora
aafb735283
perf: use create_custom_fields ( #31853 )
...
* perf: use `create_custom_fields`
* fix: default must be a string
2022-08-18 21:01:20 +05:30
Sagar Sharma
256b4245d5
chore: add additional-cost table in SCR
2022-08-18 20:59:30 +05:30
Sagar Sharma
2fc6833684
fix: recalculate rate of items based on "Recalculate Rate" checkbox
2022-08-18 19:50:00 +05:30
Sagar Sharma
7e88eb549f
chore: remove unwanted field "provisional_expense_account" from SCR ( #31847 )
2022-08-18 17:39:00 +05:30
Sagar Sharma
ea82fe5bc2
chore: move "set_missing_values_in_additional_costs" from SCO to SC"
2022-08-18 17:20:22 +05:30
Sagar Sharma
eabd3135f0
fix: base_amount and exchange_rate in additional-cost table
2022-08-18 17:16:29 +05:30
Sagar Sharma
d7ed4093d8
fix: additional-cost in items table
2022-08-18 16:45:11 +05:30
ruthra kumar
72a7ed5b58
Merge pull request #31871 from ruthra-kumar/fix_gross_profit_valuation_rate
...
fix: incorrect buying amount in Gross Profit rpt
2022-08-18 16:08:19 +05:30
Deepesh Garg
86bdddd1b8
Merge pull request #31875 from adityahase/fix-projects-typo
...
fix(projects): Add missing comma
2022-08-18 11:18:51 +05:30
Deepesh Garg
1a6508972e
fix: Make expense account editable in Purchase Receipt Item ( #31730 )
...
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2022-08-18 10:59:39 +05:30
Sagar Sharma
8704ca783d
fix: Add dimension section in subcontracting doctypes ( #31849 )
2022-08-18 10:58:33 +05:30
Aditya Hase
d38778e400
fix(projects): Add missing comma
...
Added with https://github.com/frappe/erpnext/pull/31360
2022-08-17 18:21:43 +05:30
Sagar Sharma
f1a612245c
fix: Transit filter for Default Target Warehouse in SE ( #31839 )
2022-08-17 16:44:12 +05:30
ruthra kumar
967dd398e7
fix: incorrect buying amount in Gross Profit rpt
2022-08-17 16:21:03 +05:30
Sagar Sharma
2d04e71412
fix: Make expense account editable in Subcontracting Receipt Item ( #31848 )
2022-08-17 15:57:41 +05:30
rohitwaghchaure
396667b702
Merge pull request #31860 from rohitwaghchaure/delete-custom-fields-on-dimension-delete
...
fix: delete custom fields on deletion of inventory dimension
2022-08-17 15:43:54 +05:30
ruthra kumar
ea84c157e0
Merge pull request #31856 from ruthra-kumar/incorrect_tax_due_to_exchange_rate
...
fix: incorrect tax amt due to different exchange rate in PR and PI
2022-08-17 15:05:57 +05:30
Rohit Waghchaure
0b39a0123e
fix: delete custom fields on deletion of inventory dimension
2022-08-17 14:55:02 +05:30
rohitwaghchaure
dd08045f28
Merge pull request #31863 from rohitwaghchaure/allow-to-make-material-issue
...
fix: not able to issue expired batches
2022-08-17 14:45:14 +05:30
Rohit Waghchaure
795c94384a
fix: not able to issue expired batches
2022-08-17 14:03:55 +05:30
Sagar Sharma
313625c349
fix: incorrect rate in BOM exploded items ( #31513 )
2022-08-17 13:51:53 +05:30
Sagar Sharma
538cd6fdcf
fix: incorrect produced-qty in production-plan-item ( #31706 )
2022-08-17 13:01:56 +05:30
ruthra kumar
5fd0770372
fix: incorrect tax amt due to different exchange rate in PR and PI
2022-08-16 16:41:33 +05:30
ruthra kumar
3b4c0a3fc0
fix(minor): don't print tax rate if its '0' ( #31838 )
2022-08-16 16:35:46 +05:30
hrzzz
3ef551872a
fix: remove spaces and order import
2022-08-15 09:23:56 -03:00
hrzzz
27891ecb77
feat: two new filters for gross profit
2022-08-15 09:14:23 -03:00
Sagar Sharma
0047e18a9b
fix: check item_code in all rows of po_items ( #31741 )
...
fix: check item-code in each row of po-items
2022-08-13 11:07:22 +05:30
Sagar Sharma
e5e88bb9f1
fix: contact search in request for quotation ( #31828 )
2022-08-13 11:05:48 +05:30
Deepesh Garg
79ac50d0f7
fix: Unable to make payment entry against Fees using education app
2022-08-11 19:31:31 +05:30
Deepesh Garg
72869ed197
Merge pull request #31799 from abhinavxd/fix-process-loan-interest-accrual
...
fix: process loan interest accrual
2022-08-11 15:47:18 +05:30
ruthra kumar
5018472840
Merge pull request #31817 from ruthra-kumar/fix_pos_recent_order_crash_due_to_large_data
...
fix: limit pos recent order page result
2022-08-10 15:48:28 +05:30
Saqib Ansari
33762dbbac
fix(pos): error while consolidating pos invoices
2022-08-10 14:17:28 +05:30
Nabin Hait
eb25eddc22
Merge pull request #31816 from nabinhait/crm-no-of-employees
...
fix: limited options for no-of-employees in the crm documents
2022-08-09 20:47:52 +05:30
Nabin Hait
909945c0ac
fix: map old data as per new options of no-of-employees
2022-08-09 20:47:18 +05:30
ruthra kumar
bb40e38451
fix: limit pos recent order page result
2022-08-09 19:35:43 +05:30
Nabin Hait
7ecd67605f
fix: limited options for no-of-employees in crm
2022-08-09 19:06:57 +05:30
Ankush Menat
08d7c48dc7
refactor: use browser native lazy loading ( #31814 )
2022-08-09 18:49:14 +05:30
Akash Krishna
32b30bc5de
Tds report ( #31801 )
...
* fix: TDS Computation Summary Report not loading, too many values to unpack
2022-08-09 17:41:02 +05:30
rohitwaghchaure
e93a1cc02e
Merge pull request #31804 from rohitwaghchaure/fixed-incorret-incoming-rate-for-internal-suppliier
...
fix: incorrect incoming rate set for inter transfer purchase receipt
2022-08-09 16:00:31 +05:30
Raffael Meyer
6b510546ae
fix: german translations ( #31732 )
2022-08-09 15:11:52 +05:30
Rohit Waghchaure
ddd24ea8c8
fix: incorrect incoming rate set for inter transfer purchase receipt
2022-08-09 14:50:20 +05:30
Abhinav Raut
534d7ce64b
fix: term loan interest calculation
2022-08-08 17:35:31 +05:30
Deepesh Garg
5c4cc5ae5b
Merge pull request #31779 from ruthra-kumar/bug_add_accouting_dimension_in_asset_repair
...
Bug add accouting dimension in asset repair
2022-08-08 16:39:21 +05:30
Abhinav Raut
9ef8d5c5c3
fix: process loan interest accrual
2022-08-08 16:29:13 +05:30
Deepesh Garg
b85dbdc3c1
Merge pull request #31777 from ruthra-kumar/intercompany_po_bug
...
fix: intercompany SO created from Purchase Order throws exception
2022-08-08 16:06:09 +05:30
Sagar Vora
d05082987f
fix: set company_address for purchases in party.js
2022-08-08 06:04:10 +00:00
Sagar Vora
a3625b3817
fix: set billing_address for purchases in get_party_details
2022-08-08 06:04:10 +00:00
ruthra kumar
80f508c4b1
chore: patch for creating existing dimensions in asset repair
2022-08-05 15:22:38 +05:30
Abhinav Raut
a272d73dd9
fix: pending principal- amount
2022-08-04 19:04:34 +05:30
ruthra kumar
452584c4bd
fix: add asset repair to accounting dimension list
2022-08-04 14:09:26 +05:30
ruthra kumar
af0a353b79
fix: intercompany SO throws exception
2022-08-04 14:01:23 +05:30
ruthra kumar
ef312b8fc4
test: posting_date should not affect outstanding amount calculation
2022-08-04 09:38:01 +05:30
ruthra kumar
5f1562c5b2
fix: posting_date of linked vouchers should not affect outstanding
...
posting_date filter should not be applied for linked vouchers.
2022-08-04 09:38:01 +05:30
hrzzz
91762097a5
fix: for Tree Type item and item group show net amout
2022-08-03 13:09:23 -03:00
Ankush Menat
17b9bfd249
fix(ecommerce): remove query to non-existing field ( #31771 )
2022-08-03 16:48:27 +05:30
HarryPaulo
ea88451875
fix: getting error to show sales invoice group or print rep… ( #31756 )
...
fix: formatter getting error to show sales invoice group or print report.
1 - When I view the Gross Profit report in Sales Invoice mode, the table is all broken.
Error on browser console:
TypeError: Cannot read properties of undefined (reading 'indent')
2 - When I try to print, no matter the Group (Sales Invoice, Item Code, Item Group...) nothing happens. in browser log console I have the following error:
TypeError: Cannot read properties of undefined (reading 'content')
i fixed both errors and all working perfectly.
2022-08-03 11:21:30 +05:30
Devin Slauenwhite
9c580dde39
fix: linter ( #31763 )
2022-08-03 11:16:59 +05:30
Sagar Vora
9baa222976
fix: specify allowed doctype in queries ( #31761 )
2022-08-03 11:12:30 +05:30
Rohit Waghchaure
0e7c4314b4
fix: minor changed link
2022-08-01 14:03:12 +05:30
Marica
1a2ffc7c6e
Merge pull request #31601 from pps190/pref-wh-wise-stock-value
...
perf: reduce db calls for warehouse wise stock value chart
2022-07-27 17:47:43 +05:30
HENRY Florian
cc1f837685
fix: update fr translations ( #31687 )
...
* fix: update fr translations
* fix: update fr translation
* fix: update fr translation
* chore: Replace apostrophe encoding by symbol
Co-authored-by: marination <maricadsouza221197@gmail.com>
2022-07-27 17:21:01 +05:30
Nabin Hait
67fefa37ce
Merge pull request #31678 from nabinhait/crm-fixes-5
...
fix: mentions in notes, workspace links, no-of-employees field type and report fixes
2022-07-27 16:50:18 +05:30
Marica
4fa58d7931
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-27 14:53:03 +05:30
Suraj Shetty
273c6ff598
Merge pull request #31690 from phot0n/fix-payments-stuff
2022-07-27 14:37:15 +05:30
Marica
56db91b322
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-27 14:12:09 +05:30
marination
af38baeb3b
fix: Map Item image to Website Item website_image only if published via UI (v13)
...
- For v12 Items, `website_image` should be mapped from `Item` to `Website Item`
2022-07-27 14:09:49 +05:30
phot0n
0048bcb067
chore: fix linter
2022-07-27 12:34:52 +05:30
Nabin Hait
02dd174bc7
Merge branch 'develop' into crm-fixes-5
2022-07-27 11:56:36 +05:30
Deepesh Garg
1e3918d637
Merge pull request #31286 from SolufyPrivateLimited/solufy_rec_pay_report
...
fix: Added total of future amount, Remaining Balance in Payable and Receivable reports
2022-07-27 08:26:16 +05:30
rohitwaghchaure
cdec6f60de
Merge pull request #31681 from rohitwaghchaure/dont-show-zero-qty-data-in-report
...
fix: dont show zero qty available items in stock ageing report
2022-07-27 00:44:11 +05:30
mergify[bot]
5b7b58322f
fix: hero image not loading in portal homepage (backport #31699 ) ( #31700 )
...
fix: hero image not loading in portal homepage (#31699 )
(cherry picked from commit 8a6432ec3f4bf63c39d1f687f618cec2360ebccf)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-07-26 13:46:03 +05:30
Deepesh Garg
98b42ce786
Merge pull request #31676 from ruthra-kumar/fix_tax_withholding_checkbox_on_PI
...
fix: enable tax withholding checkbox in PI with supplier_tds
2022-07-25 12:56:29 +05:30
Marica
d2d651a0c3
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-25 12:43:08 +05:30
Gavin D'souza
3c26415b6f
fix(gd): Scan FY only if current_fiscal_year set
2022-07-25 11:54:49 +05:30
Gavin D'souza
cb73528c9c
test: Use assertSequenceEqual for comparision between Tuple / Lists
...
Use AssertSequence for type agnostic checks
2022-07-25 11:54:49 +05:30
ruthra kumar
9439a7fd30
Merge pull request #31576 from ruthra-kumar/return_not_updating_so_billed_percentage
...
fix: credite note for returned delivery note updates SO's billed percentage
2022-07-25 11:24:00 +05:30
phot0n
8004550444
fix: add payments as a required app for erpnext
2022-07-25 10:46:46 +05:30
phot0n
ef14da21bc
fix: payment utils import paths
...
Since we're splitting payments app from frappe, updating
ERPnext paths as well
2022-07-25 10:38:09 +05:30
Rohit Waghchaure
5da7e01db2
fix: dont show zero qty available items in stock ageing report
2022-07-22 17:54:46 +05:30
Nabin Hait
29b8715205
fix: mentions in notes, workspace links, no-of-employees field type and report fixes
2022-07-22 15:33:39 +05:30
ruthra kumar
b461724416
fix: enable tax withholding checkbox in PI with supplier_tds
2022-07-22 14:32:14 +05:30
Deepesh Garg
538f5a9964
Merge pull request #31497 from HarryPaulo/develop
...
fix: translated message for credit limit blocking
2022-07-22 14:22:58 +05:30
Deepesh Garg
80b354f1c7
Merge pull request #31656 from ruthra-kumar/use_current_profile_in_pos_return
...
fix: use current pos profile on sales return
2022-07-22 13:10:53 +05:30
Rucha Mahabal
7b0e5661c6
fix(patch): ignore links while deleting hr payroll doctypes ( #31674 )
2022-07-22 12:46:59 +05:30
Marica
6883fc95ae
Merge pull request #31579 from pps190/fix-pl-customer-name
...
fix: display customer name on picking list
2022-07-21 18:38:08 +05:30
billy995
8629d01dd5
Update de.csv ( #31596 )
...
IN,IM to IN,EIN
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2022-07-21 14:49:11 +05:30
HENRY Florian
3ba0d6cc5c
fix: update fr translations ( #31526 )
...
* fix: update fr translations
* fix: update fr translations
* fix: update fr translations
* fix: update fr translations
* chore: Update french translation
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2022-07-21 14:48:42 +05:30
mergify[bot]
89f516c32b
fix: assign duplicate_items_msg outside conditional (backport #31639 ) ( #31650 )
...
fix: assign duplicate_items_msg outside conditional (#31639 )
duplicate_items_msg was defined inside if the statement of stock_item so when duplicate was found in non_stock_item it raised referenced before assignment
(cherry picked from commit 8e23c6ad69dee213f0252d2b231317490fab760f)
Co-authored-by: Maharshi Patel <39730881+maharshivpatel@users.noreply.github.com>
2022-07-21 13:57:03 +05:30
Marc de Lima Lucio
048c037842
FIX: quality inspection quick creation from purchase receipt: pre-fill sample size if available ( #31544 )
...
FIX: quality inspection quick creation from transaction documents: pre-fill sample size if available
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2022-07-21 13:46:59 +05:30
Sagar Vora
bf2833b8ee
fix: ensure defaults removed in bad frappe patch get set again ( #31659 )
2022-07-21 13:32:03 +05:30
ruthra kumar
243f66fcd3
test: SO percentage billed when cr_note made against delivery return
2022-07-21 13:05:34 +05:30
ruthra kumar
04c1019242
fix: update SO's percentage billed on credit note
...
Credit Note created from Sales Return will update precentage billed in
Sales Order accordingly
2022-07-21 13:05:34 +05:30
Marco Fonseca
d30f8387d9
fix: correct Brazilian portuguese translations ( #31498 )
...
* fix brazilian portuguese translations
* minor adjustments
* fix minor adjustments
* fix: remove legacy pt_br.csv
* chore: Fix translation quotation marks
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2022-07-21 12:59:04 +05:30
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
Labeeb Mattra
88cd780ca1
Add refund amount to loan
2022-07-06 18:52:04 +05:30
Labeeb Mattra
a81da2ea85
Add more loan interest accrual types
2022-07-06 18:52:04 +05:30
Labeeb Mattra
900c878e03
update loan interest accrual types
2022-07-06 18:52:04 +05:30
Suraj Shetty
f0e8a518cd
fix: Update font awesome path
2022-07-06 15:10:39 +05:30
Suraj Shetty
32fd753a14
fix: Update html2text import path
2022-07-06 15:09:44 +05:30
Marica
b58d7d1c89
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-06 14:43:23 +05:30
rohitwaghchaure
8eb676eb5a
Merge pull request #31519 from rohitwaghchaure/fixed-time-out-error-reposting
...
fix: timeout error while reposting
2022-07-06 11:45:02 +05:30
Marica
9b6bb1b3fc
Merge pull request #31529 from marination/petty-purchase
...
fix: Use fallback conversion factor while setting incoming rate for petty purchase
2022-07-06 00:38:37 +05:30
Nihantra C. Patel
3e670eda68
fix: Set the condition to create a purchase receipt
2022-07-05 21:19:50 +05:30
marination
eec07833f4
chore: Remove image from ProductQuery fields
2022-07-05 20:31:04 +05:30
marination
aa043fe961
fix: Use fallback conversion factor while setting incoming rate for petty purchase
...
- PIs for petty items (that do not need an Item record) are allowed using Item Name field
- If a different UOM is used in this case, conversion factor stays 0 and causes an error
- Fallback to 1 in `set_incoming_rate` for buying
- Selling will need a proper item, so this change is not needed there
2022-07-05 19:43:02 +05:30
rohitwaghchaure
96f46b220b
Merge branch 'develop' into fixed-time-out-error-reposting
2022-07-05 19:23:46 +05:30
Deepesh Garg
37f7801cfb
Merge pull request #29884 from resilient-tech/remove-india
...
refactor: remove India specific code
2022-07-05 18:50:41 +05:30
Rohit Waghchaure
78c8bb251e
fix: timeout error while reposting
2022-07-05 18:45:13 +05:30
rohitwaghchaure
c2432778ef
Merge branch 'develop' into fix_test_for_pr_tool
2022-07-05 17:18:50 +05:30
rohitwaghchaure
d5b0b5e798
Merge pull request #31523 from rohitwaghchaure/fixed-test-case-backflushed_batch-raw-materials
...
fix: test case
2022-07-05 15:10:59 +05:30
Rohit Waghchaure
7282c8e65b
fix: test case
2022-07-05 15:10:28 +05:30
Sagar Sharma
f75d35ed60
Merge branch 'develop' into subcontracting
2022-07-05 11:25:08 +05:30
Ankush Menat
90942d2ba5
chore: remove currency info from boot ( #31520 )
...
refactor: remove currency info from boot
Framework loads this info by default now, so no need to add it here.
2022-07-05 11:22:32 +05:30
Sagar Sharma
a7161d3875
fix: SCO status on SCR cancel
2022-07-05 09:27:56 +05:30
