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
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
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
Deepesh Garg
8535ad46e9
Merge pull request #30882 from fproldan/issue_25414
...
fix: "Supplier Quotation Comparison" - Tools - Select Default Supplier
2022-05-04 14:23:17 +05:30
Ankush Menat
91cd5f5d4a
fix: show group warehouse in Sales Order ( #30891 )
2022-05-04 13:07:58 +05:30
Deepesh Garg
564f5b2394
Merge pull request #30890 from frappe/mergify/bp/develop/pr-30884
...
fix: Ignore loan repayments made from salary slip (backport #30884 )
2022-05-04 10:19:36 +05:30
Deepesh Garg
e8d6eb207d
fix: Ignore loan repayments made from salary slip
...
(cherry picked from commit b7e1d40e43c136f0e967111e10af95ddc80e2fd5)
2022-05-04 04:15:07 +00:00
Francisco Roldán
5604dccdb6
Merge branch 'develop' into issue_25414
2022-05-03 13:27:10 -03:00
Deepesh Garg
1b285cf662
Merge pull request #30820 from deepeshgarg007/erpnext_setup_cleanup
...
chore: Remove domains from setup wizard
2022-05-03 20:05:52 +05:30
Deepesh Garg
322f0db1e9
chore: Resolve conflicts
2022-05-03 18:28:50 +05:30
Deepesh Garg
2e3e666784
Merge branch 'develop' of https://github.com/frappe/erpnext into erpnext_setup_cleanup
2022-05-03 18:17:36 +05:30
Francisco Roldán
288e2258f6
Merge branch 'develop' into issue_25414
2022-05-03 08:48:30 -03:00
Rucha Mahabal
924cf7763e
fix: payment days calculation for employees joining/leaving mid-month ( #30863 )
2022-05-03 11:27:25 +05:30
Francisco Roldan
26654e5e29
fix: supplier quotation comparission report button
2022-05-02 21:07:54 -03:00
Francisco Roldán
62225e0956
Merge pull request #174 from frappe/develop
...
Fetch upstream
2022-05-02 20:44:38 -03:00
maharshivpatel
80a13c38bc
fix(india): e-invoice generation for registered composition gst category type ( #30814 )
2022-05-02 21:51:27 +05:30
Saqib Ansari
2b354270eb
Merge pull request #30875 from deepeshgarg007/supply_type_einvoice
...
fix(India): Supply type for overseas invoices with payment of tax
2022-05-02 21:49:52 +05:30
Saqib Ansari
c8aa77285e
fix: supply type for sez invoices with payment of tax
2022-05-02 21:15:54 +05:30
Deepesh Garg
d7cb269e0c
fix: Supply type for overseas invoices with payment of tax
2022-05-02 19:23:43 +05:30
Deepesh Garg
f8db6f0ac5
Merge pull request #30872 from frappe/mergify/bp/develop/pr-30852
...
fix: Vat Audit report fixes (backport #30852 )
2022-05-02 17:59:10 +05:30
Deepesh Garg
e0fd980bcc
Merge pull request #30848 from deepeshgarg007/cost_center_filter_p_r
...
fix: Cost center filter in payment reconciliation
2022-05-02 17:58:45 +05:30
