Deepesh Garg
b9a557599e
fix: Failing accounting dimension patch
...
(cherry picked from commit b14a7b8a5d
2022-05-12 09:48:53 +00:00
Ankush Menat
6863a59472
Merge branch 'version-13-hotfix' into version-13-pre-release
2022-05-10 15:20:35 +05:30
Ankush Menat
f64ba80913
Merge pull request #30953 from frappe/mergify/bp/version-13-hotfix/pr-30913
...
fix: double future qty updates (backport #30913 )
2022-05-10 15:16:37 +05:30
mergify[bot]
b7e873b55d
fix: subtract change_amount from paid_amount field on POS Register ( #30937 )
...
Co-authored-by: HarryPaulo <paulo_fabris@hotmail.com >
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com >
2022-05-10 14:54:19 +05:30
Ankush Menat
4d682face2
chore: remove datettime formatting from debug report
...
This hides some information that would otherwise help during debugging
(cherry picked from commit ae842d8145
2022-05-10 14:51:02 +05:30
Ankush Menat
6312938fed
chore: conflicts
2022-05-10 14:50:35 +05:30
Ankush Menat
e27fb58130
fix: sort before picking next stock reco
...
(cherry picked from commit 7e2fbc050a
2022-05-10 14:50:35 +05:30
Ankush Menat
0db3013c9b
fix: double future qty updates
...
update_qty_in_future_sle is reprocessing rows which are already
processed by process_sle_against_current_voucher
(cherry picked from commit 7c839c4503
2022-05-10 09:17:34 +00:00
Deepesh Garg
a85fe517df
Merge pull request #30951 from frappe/version-13-hotfix
...
chore: Pre release for version-13
2022-05-10 14:42:16 +05:30
Deepesh Garg
3373ce5c47
Merge pull request #30949 from frappe/mergify/bp/version-13-hotfix/pr-30948
...
fix(india): invoice type for a debit note e-invoice (backport #30948 )
2022-05-10 14:13:48 +05:30
Saqib Ansari
c46add3760
fix(india): invoice type for a debit note e-invoice ( #30948 )
...
(cherry picked from commit 8dd046cc51
2022-05-10 08:10:34 +00:00
mergify[bot]
7bd5b2ba29
feat(india): generate qrcode button for e-invoice ( #30946 )
2022-05-10 12:29:52 +05:30
mergify[bot]
64440fc4fb
feat(HR): Leave Type configuration to allow over allocation (backport #30940 ) ( #30944 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
2022-05-10 09:25:32 +05:30
mergify[bot]
7ce5c93f44
fix(india): re-arrange e-way bill dialog fields ( #30941 )
2022-05-09 21:36:57 +05:30
Ankush Menat
c1f6586e39
Merge pull request #30869 from marination/batch-source-reference-v13
...
fix: Unlink and delete batch created from stock reco on cancel
2022-05-09 19:01:59 +05:30
mergify[bot]
a0e39db200
fix(pos): creating pos returns resets pricing rules & discounts ( #30936 )
2022-05-09 17:43:36 +05:30
mergify[bot]
80f7d66255
fix: remove check for already allocated earned leaves ( #30931 ) ( #30932 )
...
* 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
(cherry picked from commit f92bc4dd33ruchamahabal2@gmail.com >
2022-05-09 12:34:21 +05:30
Rucha Mahabal
9189653f2e
fix: patch for renaming membership settings ( #30929 )
2022-05-09 10:11:52 +05:30
Deepesh Garg
4e53dd71db
Merge pull request #30065 from govindsmenokee/patch-9
...
fix: HSN-wise-summary of outward supplies Updated Report
2022-05-08 19:36:11 +05:30
mergify[bot]
4ef2ffd14c
feat(india): cancel e-way bill is enabled with e-invoicing APIs. ( #30924 )
2022-05-08 19:11:04 +05:30
mergify[bot]
b96f1565c5
feat(india): store e-way bill auto calculated distance in sales invoice ( #30923 )
2022-05-08 19:10:22 +05:30
Saqib Ansari
713a84bb73
Merge branch 'version-13-hotfix' into patch-9
2022-05-08 12:49:28 +05:30
Saqib Ansari
2972ef8f2c
chore: fix linter ( #30925 )
2022-05-08 12:48:57 +05:30
Deepesh Garg
a8fbd2451b
chore: Remove print statement
2022-05-07 22:53:59 +05:30
Deepesh Garg
b0e929b8ae
chore: Remove extra columns
2022-05-07 22:44:53 +05:30
Deepesh Garg
ac362c75db
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into patch-9
2022-05-07 19:04:14 +05:30
Ganga Manoj
bf2eaecb1d
fix: Set available-for-use date if missing ( #30838 )
2022-05-06 18:06:21 +05:30
Deepesh Garg
e9e2dcc1bf
Merge pull request #30915 from frappe/mergify/bp/version-13-hotfix/pr-30897
...
fix: Consider party and party type as well in group by consolidated view (backport #30897 )
2022-05-06 13:37:54 +05:30
Deepesh Garg
189fc89e2d
fix: Consider paryt and party type as well in group by consolidated view
...
(cherry picked from commit c2d52a1ac0
2022-05-06 07:40:39 +00:00
Deepesh Garg
4c2fdfe2c1
Merge pull request #30914 from deepeshgarg007/payment_reco_linting_issue
...
chore: Linting issues
2022-05-06 13:08:57 +05:30
Deepesh Garg
b7698aa210
chore: Linting issues
2022-05-06 13:08:09 +05:30
Deepesh Garg
96db9ee17b
Merge pull request #30912 from frappe/mergify/bp/version-13-hotfix/pr-30879
...
fix(india): keyerror while generating e-way bill from an e-invoice (backport #30879 )
2022-05-06 13:05:21 +05:30
maharshivpatel
98d799e7cc
fix(india): keyerror while generating e-way bill from an e-invoice ( #30879 )
...
(cherry picked from commit ee7a7eb782
2022-05-06 05:53:50 +00:00
mergify[bot]
d60a6cb2f8
fix: disable form save on naming series tool ( #30909 ) ( #30910 )
...
(cherry picked from commit f31122cbc3ankush@frappe.io >
2022-05-05 17:38:11 +05:30
marination
a2fff8741e
style: Spaces to Tabs
2022-05-05 13:00:00 +05:30
mergify[bot]
c458e14e68
fix: show group warehouse in Sales Order ( #30891 ) ( #30893 )
...
(cherry picked from commit 91cd5f5d4aankush@frappe.io >
2022-05-05 11:07:11 +05:30
Deepesh Garg
59686093b4
Merge pull request #30902 from frappe/mergify/bp/version-13-hotfix/pr-30899
...
fix: Show linked time sheets in sales invoice dashboard (backport #30899 )
2022-05-04 21:01:08 +05:30
Deepesh Garg
4f4af523e0
fix: Show linked time sheets in sales invoice dashboard
...
(cherry picked from commit 3e38dc7ea8
2022-05-04 14:24:57 +00:00
marination
c449b35cc1
fix: Remove commit from stock entry test. The assertion is not important
2022-05-04 13:00:00 +05:30
Deepesh Garg
57409b6ffd
Merge pull request #30884 from deepeshgarg007/loan_repayment_clearance_v3
...
fix: Ignore loan repayments made from salary slip
2022-05-04 09:44:22 +05:30
Deepesh Garg
64d96f436b
Merge pull request #30885 from frappe/version-13-hotfix
...
chore: pre release for version-13
2022-05-03 13:41:33 +05:30
Deepesh Garg
fda250606a
Merge branch 'version-13-pre-release' into version-13-hotfix
2022-05-03 13:21:10 +05:30
Deepesh Garg
2126dee8ca
Merge pull request #30874 from frappe/mergify/bp/version-13-hotfix/pr-30848
...
fix: Cost center filter in payment reconciliation (backport #30848 )
2022-05-03 13:18:31 +05:30
marination
d53228b153
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
2022-05-03 13:00:00 +05:30
Deepesh Garg
b7e1d40e43
fix: Ignore loan repayments made from salary slip
2022-05-03 12:55:04 +05:30
Deepesh Garg
937d358fbf
Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-30848
2022-05-03 12:46:10 +05:30
Deepesh Garg
366cd6171c
chore: resolve conflicts
2022-05-03 12:21:06 +05:30
mergify[bot]
a1b0813966
fix: payment days calculation for employees joining/leaving mid-month ( #30863 ) ( #30883 )
...
(cherry picked from commit 924cf7763eruchamahabal2@gmail.com >
2022-05-03 11:46:46 +05:30
Saqib Ansari
4db588e72e
Merge pull request #30876 from frappe/mergify/bp/version-13-hotfix/pr-30875
...
fix(India): Supply type for overseas invoices with payment of tax (backport #30875 )
2022-05-02 22:17:56 +05:30
mergify[bot]
246869dd28
fix(india): e-invoice generation for registered composition gst category type ( #30814 ) ( #30877 )
2022-05-02 22:16:43 +05:30
