nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,943 Commits 402 Branches 1,700 Tags
2a615af00a754162c202d10f77e1c1d36a6d48cd
Commit Graph

40943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 f31122cbc3)

Co-authored-by: Ankush Menat <ankush@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 91cd5f5d4a)

Co-authored-by: Ankush Menat <ankush@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
Frappe PR Bot
53024be347 chore(release): Bumped to Version 13.28.0 
# [13.28.0](https://github.com/frappe/erpnext/compare/v13.27.1...v13.28.0) (2022-05-03)

### Bug Fixes

* Consistent accounting dimensions across Sales and Purchase docs ([5df5058](5df50588cf))
* convert default_item_manufacturer to link field ([#30835](https://github.com/frappe/erpnext/issues/30835)) ([#30866](https://github.com/frappe/erpnext/issues/30866)) ([37fad7e](37fad7e04c))
* Cost center filter on payment reconciliation ([22e7f03](22e7f03a03))
* filters not working in Shift Assignment Calendar view ([#30822](https://github.com/frappe/erpnext/issues/30822)) ([3cdbb65](3cdbb65b5a))
* Ignore custom field validation while setup ([ee54bf7](ee54bf7fe2))
* **india:** e-invoice generation for registered composition gst category type ([#30814](https://github.com/frappe/erpnext/issues/30814)) ([#30877](https://github.com/frappe/erpnext/issues/30877)) ([246869d](246869dd28))
* Multi currency opening invoices ([2e62d51](2e62d518e8))
* payment days calculation for employees joining/leaving mid-month ([#30863](https://github.com/frappe/erpnext/issues/30863)) ([#30883](https://github.com/frappe/erpnext/issues/30883)) ([a1b0813](a1b0813966))
* Period Closing Voucher is considering GL entries with is_cancelled=1 ([#30865](https://github.com/frappe/erpnext/issues/30865)) ([5a5b49b](5a5b49b61a))
* **pos:** number pad translations ([b01f855](b01f8555e5))
* **pos:** search field doesn't reset on checkout ([edbf551](edbf5513da))
* Supply type for overseas invoices with payment of tax ([fdcc591](fdcc591a5e))
* supply type for sez invoices with payment of tax ([cf08710](cf087103cb))
* Use `account_type == 'Stock'` to filter stock accounts ([93482f3](93482f3302))
* **UX:** misleading stock entry lables ([#30870](https://github.com/frappe/erpnext/issues/30870)) ([#30871](https://github.com/frappe/erpnext/issues/30871)) ([57b03f0](57b03f0bf2))
* **UX:** record reason for skipping attendance or marking absent for auto attendance ([#30846](https://github.com/frappe/erpnext/issues/30846)) ([f7bf4a3](f7bf4a3e62))
* Vat Audit report fixes ([d5319a4](d5319a4826))

### Features

* Copy task color from project template (backport [#30857](https://github.com/frappe/erpnext/issues/30857)) ([#30859](https://github.com/frappe/erpnext/issues/30859)) ([7ee18e8](7ee18e86a2))
* support product bundles in picklist (backport [#30762](https://github.com/frappe/erpnext/issues/30762)) ([#30826](https://github.com/frappe/erpnext/issues/30826)) ([645ee2d](645ee2d822))
v13.28.0 		2022-05-03 08:51:32 +00:00
Deepesh Garg
a1f31013e2 Merge pull request #30886 from frappe/version-13-pre-release 
chore: weekly release for version-13
 2022-05-03 14:19:46 +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 924cf7763e)

Co-authored-by: Rucha Mahabal <ruchamahabal2@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
Saqib Ansari
cf087103cb fix: supply type for sez invoices with payment of tax 
(cherry picked from commit c8aa77285e)
 2022-05-02 16:20:44 +00:00
Deepesh Garg
fdcc591a5e fix: Supply type for overseas invoices with payment of tax 
(cherry picked from commit d7cb269e0c)
 2022-05-02 16:20:44 +00:00
Deepesh Garg
0df96e1084 test: Add test for payment reconciliation 
(cherry picked from commit b440dabe12)
 2022-05-02 12:29:25 +00:00
Deepesh Garg
22e7f03a03 fix: Cost center filter on payment reconciliation 
(cherry picked from commit ab94b73e93)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
 2022-05-02 12:29:24 +00:00
Deepesh Garg
6aab9ca427 Merge pull request #30852 from deepeshgarg007/vat_ksa 
fix: Vat Audit report fixes
 2022-05-02 16:14:03 +05:30
mergify[bot]
57b03f0bf2 fix(UX): misleading stock entry lables (#30870) (#30871) 
* fix(UX): misleading stock entry lables

* chore: field labels

[skip ci]

Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 59a5090843)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-05-02 15:17:13 +05:30
Sherin KR
5a5b49b61a fix: Period Closing Voucher is considering GL entries with is_cancelled=1 (#30865) 
* fix: Period Closing Voucher - Period Closing Voucher is considering GL entry with is_cancelled=1 as well

* fix: condition

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-05-02 15:03:30 +05:30
mergify[bot]
37fad7e04c fix: convert default_item_manufacturer to link field (#30835) (#30866) 
(cherry picked from commit dcda55641b)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-05-02 14:58:05 +05:30
marination
964de1fc69 fix: Item Alternative Test 2022-05-02 14:44:26 +05:30
marination
5bc5af1066 chore: Tests for Stock Reconciliation 2022-05-02 14:41:08 +05:30
marination
a144548db9 chore: Tests for Stock Entry 2022-05-02 14:18:54 +05:30
marination
fc35323106 fix: Unlink and delete batch created from stock reco on cancel 2022-05-02 14:18:27 +05:30
Deepesh Garg
7c0069c0d3 chore: Education domain deprecation warning (#30861) 
* chore: Education domain deprecation warning

* chore: Education domain deprecation warning

* chore: Rename file and patch
 2022-05-02 13:29:25 +05:30
Deepesh Garg
0b9a59c605 Merge pull request #30856 from frappe/mergify/bp/version-13-hotfix/pr-30806 
fix: Consistent accounting dimensions across Sales and Purchase docs (backport #30806)
 2022-05-02 11:44:52 +05:30
Deepesh Garg
b9c326e3f6 chore: resolve conflicts 2022-05-02 11:16:48 +05:30
Deepesh Garg
d9756d54ad chore: resolve conflicts 2022-05-02 11:15:58 +05:30
mergify[bot]
7ee18e86a2 feat: Copy task color from project template (backport #30857) (#30859) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: sersaber <93864988+sersaber@users.noreply.github.com>
 2022-05-02 10:59:58 +05:30
Deepesh Garg
5df50588cf fix: Consistent accounting dimensions across Sales and Purchase docs 
(cherry picked from commit 82a0635c66)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/selling/doctype/sales_order/sales_order.json
 2022-05-01 16:33:16 +00:00
Deepesh Garg
87383680f0 Merge pull request #30853 from frappe/mergify/bp/version-13-hotfix/pr-30815 
fix: Ignore custom field validation while setup (backport #30815)
 2022-05-01 15:22:57 +05:30
Deepesh Garg
ee54bf7fe2 fix: Ignore custom field validation while setup 
(cherry picked from commit 67bb29026f)
 2022-04-30 16:33:44 +00:00
Deepesh Garg
d5319a4826 fix: Vat Audit report fixes 2022-04-30 22:01:05 +05:30
Deepesh Garg
a98263cd31 Merge pull request #30845 from frappe/mergify/bp/version-13-hotfix/pr-30843 
fix: Multi currency opening invoices (backport #30843)
 2022-04-29 23:04:03 +05:30