Ankush Menat
15fdc1cf7f
Merge pull request #30958 from gavindsouza/dashboard-chart-fixes
...
fix(charts): Pass fieldtype for chart data in selling reports
2022-05-10 17:40:01 +05:30
Gavin D'souza
7bf0e4f8e5
fix(charts): Pass fieldtype for chart data in selling reports
2022-05-10 15:58:31 +05:30
Ankush Menat
198b91f8d4
fix: only carry-forward balances till today's period
...
Showing data in future doesn't make sense. Only carry-forward till last
bucket that contains today's day.
2022-05-10 15:38:02 +05:30
Ankush Menat
287b255ad6
fix: batch_no doesn't maintain qty_after_transaction
2022-05-10 15:38:02 +05:30
Ankush Menat
6ab0046e9c
fix: consider previous balance is missing
...
Also remove `total`, total of total is a meaningless value.
2022-05-10 15:38:02 +05:30
Ankush Menat
d81422fb58
test: basic test for stock analytics report
2022-05-10 15:38:02 +05:30
Ankush Menat
d25841369d
Merge pull request #30913 from ankush/against_voucher_processing
...
fix: double future qty updates
2022-05-10 14:46:37 +05:30
marination
494ddd1eb4
fix: Calculate totals even though pricing rule is not applied on mapped doc
...
- `apply_pricing_rule` is triggered due to change in some data which most likely contributes to Total.
2022-05-10 14:02:43 +05:30
Saqib Ansari
8dd046cc51
fix(india): invoice type for a debit note e-invoice ( #30948 )
2022-05-10 13:39:41 +05:30
Ankush Menat
3b6752dc8b
Merge pull request #30938 from rohitwaghchaure/formatting-for-to-discuss-field
...
fix: allow to use formatting for the field to_discuss in opportunity
2022-05-10 12:10:42 +05:30
Saqib Ansari
cf13a20438
feat(india): generate qrcode button for e-invoice ( #30939 )
2022-05-10 12:07:47 +05:30
Rohit Waghchaure
3f41cb762d
fix: allow to use formatting for the field to_discuss in opportunity
2022-05-10 11:47:01 +05:30
Rucha Mahabal
51fcbe5826
feat(HR): Leave Type configuration to allow over allocation ( #30940 )
2022-05-09 21:29:58 +05:30
Ankush Menat
f047fa1aa8
Merge pull request #30942 from frappe/mergify/bp/develop/pr-30869
...
fix: Unlink and delete batch created from stock reco on cancel (backport #30869 )
2022-05-09 19:38:03 +05:30
Ankush Menat
05dd1d6d15
refactor: tax rule validity query ( #30934 )
2022-05-09 19:26:13 +05:30
marination
a65b20d976
style: Spaces to Tabs
...
(cherry picked from commit a2fff8741e7ea928c4152d8f867db3ef9eb08b19)
2022-05-09 13:32:45 +00:00
marination
9fd673e498
fix: Remove commit from stock entry test. The assertion is not important
...
(cherry picked from commit c449b35cc11615fc7d9e616c2038b9e90c3957d6)
2022-05-09 13:32:44 +00:00
marination
64f3b4d68b
fix: Wrap SLE actual_qty in flt to avoid NoneType operation
...
- Since Batch cancellation SLEs do not set qtys (will fix separately), `merge_similar_entries` gets `actual_qty` as None
- This causes NoneType operation error on tests that cancel batch-serial reco
- Modified tests to avoid using commit and rollback explicitly
(cherry picked from commit d53228b153437f9dedcb1229bf579411f3122729)
2022-05-09 13:32:43 +00:00
marination
de3d90c5ab
fix: Item Alternative Test
...
(cherry picked from commit 964de1fc69b32d377f8c2a6f15d6ab7381669606)
2022-05-09 13:32:42 +00:00
marination
14ea40d270
chore: Tests for Stock Reconciliation
...
(cherry picked from commit 5bc5af1066e0bb4bead98598ed4bf9911d340734)
2022-05-09 13:32:41 +00:00
marination
3bc3cf34eb
chore: Tests for Stock Entry
...
(cherry picked from commit a144548db95ec829b953ca6305fe898b1a9cdeb0)
2022-05-09 13:32:40 +00:00
marination
577df1753e
fix: Unlink and delete batch created from stock reco on cancel
...
(cherry picked from commit fc353231065f1c33890d5b7e55c2e4e2506d986d)
2022-05-09 13:32:37 +00:00
maharshivpatel
e5ebbf4799
fix(india): re-arrange e-way bill dialog fields ( #30920 )
2022-05-09 18:20:20 +05:30
HarryPaulo
ebbe27c183
fix: subtract change_amount from paid_amount field on POS Register ( #30922 )
2022-05-09 15:14:57 +05:30
Saqib Ansari
867494edad
fix(pos): creating pos returns resets pricing rules & discounts ( #30935 )
2022-05-09 15:05:05 +05:30
Deepesh Garg
dbb37aefae
Merge pull request #30926 from frappe/mergify/bp/develop/pr-30065
...
fix: HSN-wise-summary of outward supplies Updated Report (backport #30065 )
2022-05-09 13:21:58 +05:30
Ankush Menat
7e2fbc050a
fix: sort before picking next stock reco
2022-05-09 13:16:02 +05:30
marination
1ce45f623e
fix: Set actual qty and basic rate in SE on warehouse triggers (get_warehouse_details)
...
- set `actual_qty` on source and target warehouse change
2022-05-09 13:00:00 +05:30
Rucha Mahabal
f92bc4dd33
fix: remove check for already allocated earned leaves ( #30931 )
...
* fix: remove check for already allocated earned leaves
* fix: do not set New Leaves Allocated field as read-only for earned leaves
- removing this until there's a better way to update existing allocations
2022-05-09 12:15:02 +05:30
Ankush Menat
ae842d8145
chore: remove datettime formatting from debug report
...
This hides some information that would otherwise help during debugging
2022-05-09 11:29:00 +05:30
Ankush Menat
7c839c4503
fix: double future qty updates
...
update_qty_in_future_sle is reprocessing rows which are already
processed by process_sle_against_current_voucher
2022-05-09 11:28:21 +05:30
Deepesh Garg
c9f6405b2a
chore: Resolve conflicts
2022-05-09 10:33:03 +05:30
Deepesh Garg
b3d5c74df5
Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-30065
2022-05-09 10:21:46 +05:30
Ankush Menat
95e41b0d48
chore: correct version in hooks
...
[skip ci]
2022-05-08 22:04:14 +05:30
Deepesh Garg
85c137b3aa
chore: Remove print statement
...
(cherry picked from commit a8fbd2451b498ad49356cf0e6a710616ab802465)
2022-05-08 14:07:00 +00:00
Deepesh Garg
3ae4b9033f
chore: Remove extra columns
...
(cherry picked from commit b0e929b8ae8780ada76ea6b699a2b4d840b31487)
# Conflicts:
# erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
2022-05-08 14:07:00 +00:00
Govind S Menokee
d99b4e29b9
fix: HSN-wise-summary of outward supplies Updated Report
...
Report changes done in order to meet the specification as per govt guideline - [GUIDELINE](https://taxguru.in/goods-and-service-tax/12-points-note-filing-gstr-1-01st-2021-onwards.html )
(cherry picked from commit 363752510ead7d3b86693d3659b2157753f2762d)
# Conflicts:
# erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
2022-05-08 14:06:58 +00:00
maharshivpatel
b8dc40b7a0
feat(india): cancel e-way bill is enabled with e-invoicing APIs. ( #30888 )
2022-05-07 18:59:27 +05:30
maharshivpatel
b825179286
feat(india): store e-way bill auto calculated distance in sales invoice ( #30908 )
2022-05-07 18:46:12 +05:30
Raffael Meyer
f3ad4f3c3b
Merge branch 'develop' into de-translate-employee
2022-05-06 19:57:42 +02:00
Rucha Mahabal
7f1024f8aa
feat(minor): fetch default salary structure and base from Employee Grade in Salary Structure Assignment ( #30918 )
2022-05-06 17:44:30 +05:30
Deepesh Garg
c05144fb60
Merge pull request #30897 from deepeshgarg007/general_ledger_consolidated
...
fix: Consider party and party type as well in group by consolidated view
2022-05-06 13:10:00 +05:30
Deepesh Garg
f255741b16
Merge pull request #30855 from Altizo/develop
...
fix: update translate
2022-05-06 13:04:24 +05:30
Deepesh Garg
d5dca69090
Merge pull request #30901 from alyf-de/translate-party
...
feat(German Translation)!: translate "Party" as "Partei"
2022-05-06 13:02:27 +05:30
Deepesh Garg
cf4128edba
Merge pull request #30900 from alyf-de/bank-account-website
...
feat: remove website from bank account
2022-05-06 13:01:28 +05:30
Ahmad
458f2fcd62
Merge branch 'develop' into feat-request-for-quotation
2022-05-06 11:54:07 +05:00
maharshivpatel
ee7a7eb782
fix(india): keyerror while generating e-way bill from an e-invoice ( #30879 )
2022-05-06 11:23:16 +05:30
barredterra
02b38a439f
fix: german translations for Employee
2022-05-05 20:37:51 +02:00
Devin Slauenwhite
e9cf5cb4b0
feat: add prompt qty flag to pick list
2022-05-05 10:47:06 -04:00
Devin Slauenwhite
0a77c28594
fix: cast value to Number type
2022-05-05 10:46:40 -04:00
