Ankush Menat
e2e0700499
Merge pull request #30962 from marination/update-items-zero-qty
...
fix: Block 0 Qty via Update Items to be consistent with form validation
2022-05-11 12:41:40 +05:30
Marica
061cd3220f
Merge branch 'develop' into update-items-zero-qty
2022-05-11 11:42:39 +05:30
marination
0c9154389b
fix: Block 0 Qty via Update Items to be consistent with form validation
2022-05-10 18:09:07 +05:30
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
d25841369d
Merge pull request #30913 from ankush/against_voucher_processing
...
fix: double future qty updates
2022-05-10 14:46:37 +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
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
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
maharshivpatel
ee7a7eb782
fix(india): keyerror while generating e-way bill from an e-invoice ( #30879 )
2022-05-06 11:23:16 +05:30
Ankush Menat
f31122cbc3
fix: disable form save on naming series tool ( #30909 )
2022-05-05 17:35:58 +05:30
Ankush Menat
ad7c113c0d
test: activation
2022-05-05 11:02:23 +05:30
Aditya Hase
912c1d0a1b
chore: Remove reference to Instructor doctype ( #30903 )
...
References:
https://github.com/frappe/erpnext/pull/30830
44c54f69f8
2022-05-05 10:40:42 +05:30
Deepesh Garg
826c3f5c63
Merge pull request #30899 from deepeshgarg007/timesheet_link
...
fix: Show linked time sheets in sales invoice dashboard
2022-05-04 19:54:06 +05:30
barredterra
5435da6d2b
feat(German Translation): translate "Party" as "Partei"
2022-05-04 16:20:20 +02:00
barredterra
f1b8a969cf
feat: remove website from bank account
2022-05-04 15:51:52 +02:00
Deepesh Garg
3e38dc7ea8
fix: Show linked time sheets in sales invoice dashboard
2022-05-04 17:30:52 +05:30
Deepesh Garg
c2d52a1ac0
fix: Consider paryt and party type as well in group by consolidated view
2022-05-04 15:59:24 +05:30
