Ankush Menat
8043f4fc10
chore: let frappe pr bot raise stable branch PRs
...
[skip ci]
2022-09-13 15:14:53 +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
Sagar Sharma
2ecd2a3c44
Merge pull request #32188 from frappe/mergify/bp/develop/pr-32179
...
fix: pick_list - picked qty getting set to 1 (backport #32179 )
2022-09-12 23:15:54 +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
d4071575a4
Merge pull request #32150 from s-aga-r/refactor/report/bom-stock-calculated
...
refactor: BOM Stock Calculated report, fix required-qty
2022-09-12 19:21:18 +05:30
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
ruthra kumar
ce0676ac70
Merge pull request #32175 from SolufyPrivateLimited/filter_AR
...
fix: Set filter condition and spell in AR
2022-09-12 15:00:36 +05:30
Nihantra C. Patel
e2b4ae13fa
fix: Set filter condition and spell in AR
2022-09-12 14:09:42 +05:30
Ankush Menat
a30f38481d
chore: correct license text for GPLv3 ( #32170 )
...
[skip ci]
2022-09-12 13:54:08 +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
ada1ab3509
Merge pull request #32161 from s-aga-r/refactor/report/process-loss-report
...
refactor: rewrite Process Loss Report queries in QB
2022-09-11 19:47:38 +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
e4a1cf0cd2
Merge pull request #32153 from s-aga-r/refactor/report/work-order-stock-report
...
refactor: rewrite Work Order Stock Report queries in QB
2022-09-10 16:51:00 +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
Sagar Sharma
1dce3c98d8
Merge pull request #32145 from s-aga-r/fix/stock-entry/sco
...
fix: validate Subcontracting Order Status in Stock Entry
2022-09-09 14:55:26 +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
659d007bf0
Merge pull request #32102 from s-aga-r/fix/v14/stock-entry/send-to-subcontractor
...
fix: consider Stock Entry purpose while getting total supplied qty
2022-09-09 12:13:42 +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
9d453c91f1
Merge pull request #32128 from s-aga-r/fix/subcontracting-order/returned-qty
...
fix: SCO Supplied Items returned-qty
2022-09-08 19:00:59 +05:30
