Subin Tom
6f9de8c86f
fix: removed extra space from label rate
2021-06-16 20:01:29 +05:30
Afshan
3b1b4684ba
fix: check for duplicate payment terms in Payment Term Template ( #26003 )
2021-06-16 14:30:45 +05:30
Afshan
8c73f6f19e
fix(pos): pos loyalty card alignment ( #26051 )
2021-06-16 14:28:26 +05:30
Saqib
60ce00531d
fix: label for enabling ledger posting of change amount ( #26070 )
2021-06-16 14:25:55 +05:30
Saqib
1fd80992d7
fix(pos): 'NoneType' object is not iterable ( #26066 )
2021-06-16 13:27:34 +05:30
Deepesh Garg
d70c6996f2
Merge pull request #25951 from nextchamp-saqib/invoice-opening-pnl-validation
...
fix: opening invoices can alter profit and loss of a closed year
2021-06-16 10:52:40 +05:30
Deepesh Garg
fb9cb78980
Merge pull request #26045 from GangaManoj/filter-cc-project
...
fix(General Ledger): Filter Cost Center and Project drop-down lists by Company
2021-06-15 21:18:49 +05:30
Noah Jacob
b5a1491176
fix: escaped warehouse value for sql query ( #26049 )
2021-06-15 12:44:04 +05:30
Deepesh Garg
5149101045
Merge pull request #26037 from deepeshgarg007/payment_entry_auto_tax_fixes
...
fix: Auto tax calculations in Payment Entry
2021-06-14 20:39:41 +05:30
Deepesh Garg
4cd0f6ce23
fix: Revert unintended changes
2021-06-14 20:01:04 +05:30
Deepesh Garg
cf1fc40b06
Merge pull request #25906 from deepeshgarg007/gst_taxtable_value_with_discount
...
fix(India): Taxable value for invoices with additional discount
2021-06-14 17:11:08 +05:30
GangaManoj
75b30efb05
fix(General Ledger): Filter Project drop-down list by Company
2021-06-14 16:42:27 +05:30
GangaManoj
27ec51f021
fix(General Ledger): Filter Cost Center drop-down list by Company
2021-06-14 16:41:56 +05:30
Marica
18833b5ea1
Merge pull request #26043 from marination/subcontracted-rm-transfer-report-test
...
fix: Flaky test for Report Subcontracted Raw materials to be transferred
2021-06-14 15:25:05 +05:30
marination
3b070d1b05
fix: Flaky test for Report Subcontracted Raw materials to be transferred
2021-06-14 14:51:33 +05:30
Deepesh Garg
9eac4d0af6
fix: Import throw
2021-06-14 14:44:19 +05:30
Deepesh Garg
8718013c96
fix: Add separate function to validate payment entry taxes
2021-06-14 14:34:44 +05:30
Nabin Hait
ad58182395
Merge pull request #26030 from ruchamahabal/add-inactive-status-to-employee-v13
...
feat: add Inactive status to Employee
2021-06-14 12:33:28 +05:30
Deepesh Garg
856484aeb0
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount
2021-06-14 11:29:41 +05:30
Deepesh Garg
580346360f
fix: Auto tax calculations in Payment Entry
2021-06-14 11:16:39 +05:30
Anoop
28cdff10cf
fix: update linked Customer on Patient update only if Link Customer to Patient is enabled ( #25926 )
2021-06-12 14:17:04 +05:30
Rucha Mahabal
cf349aadf9
fix: unable to enter score in Assessment Result details grid ( #25945 ) ( #26031 )
2021-06-12 14:05:12 +05:30
Rucha Mahabal
17550fb4bf
feat: add Inactive status to Employee
2021-06-12 13:36:47 +05:30
Anupam Kumar
400205cc8a
fix: payroll entry employee detail issue ( #25968 )
...
* fix: payroll entry employee detail issue
* fix: review changes
2021-06-12 12:30:53 +05:30
Marica
d7d5c4c329
Merge pull request #26011 from marination/subcontracted-rm-to-transfer-report
...
fix: Report Subcontracted Raw Materials to be Transferred
2021-06-11 17:50:30 +05:30
marination
c4d851e45f
fix: Test
2021-06-11 17:27:43 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions ( #25645 )
2021-06-11 16:00:48 +05:30
Ankush Menat
5bb89b0ead
test(perf): eliminate repeat creation of HSN codes ( #25947 )
2021-06-11 15:57:01 +05:30
marination
ec4a3723cc
fix: Sider
2021-06-11 12:47:06 +05:30
marination
687ad9b942
fix: Report Raw Materials to be Transferred
2021-06-10 21:18:19 +05:30
Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13
...
feat: Tax deduction against advance payments
2021-06-10 20:25:30 +05:30
Nabin Hait
002ec69b2f
Merge pull request #25961 from deepeshgarg007/dynamic_gst_rates
...
feat: Item Taxes based on net rate
2021-06-10 19:39:48 +05:30
Deepesh Garg
3b34fc4cce
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-10 18:57:31 +05:30
Deepesh Garg
5434dd048b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates
2021-06-10 18:56:39 +05:30
Deepesh Garg
0d49b6c211
Merge pull request #26004 from gavindsouza/patch-tests-v13
...
ci: Update Patch tests (backport)
2021-06-10 18:52:27 +05:30
Saqib
9a67141bfb
fix(einvoicing): service item check ( #26010 )
2021-06-10 18:48:55 +05:30
Deepesh Garg
d52539798c
Merge pull request #26009 from deepeshgarg007/account_balance_test
...
fix: Sort account balances by account name
2021-06-10 18:47:43 +05:30
Deepesh Garg
9a243ed469
fix: Sort account balances by account name
2021-06-10 18:16:46 +05:30
Deepesh Garg
a5c3427293
fix: Sort account balances by account name
2021-06-10 18:09:49 +05:30
Deepesh Garg
88176e65e4
fix: Check for gst_hsn_code
2021-06-10 17:31:28 +05:30
Gavin D'souza
137d08a9d7
fix: Manually link_fields from flags before rename_doc
2021-06-10 15:09:17 +05:30
Gavin D'souza
96f8ebc308
fix(patch): Handle NULL values from fieldtype change
2021-06-10 15:08:55 +05:30
Gavin D'souza
43a24f2aa8
ci: Update ERPNext backup patch test >= v10
...
* Generated v10 backup archive
* used old v7 erpnext backup hosted via build.erpnext.com
* upgraded to v10 frappe + erpnext
* Hosted backup on https://erpnext.com/files/v10-erpnext.sql.gz
2021-06-10 15:08:42 +05:30
Gavin D'souza
3dfbfe87e9
chore: Drop < v10 patches from list
...
v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer
There are older version patches still left since they're being used in later ERPNext versions too.
2021-06-10 15:07:56 +05:30
Gavin D'souza
aedf25ba46
chore: Drop old patches
...
v7 backup was restored and upgraded to latest v10.x.x branch. The
patches run uptil the upgrade are removed in this change. This means
only existing v10 sites are allowed direct upgrade to v13 and newer
2021-06-10 15:07:39 +05:30
rohitwaghchaure
8975c5241e
Merge pull request #25988 from rohitwaghchaure/donot-copy-difference-account
...
fix: on click of duplicate button system has not copied the difference account
2021-06-10 14:39:56 +05:30
Deepesh Garg
882913ca4e
Merge pull request #26000 from GangaManoj/gst-settings-card
...
fix: Only display GST card in Accounting Workspace if it's in India
2021-06-10 12:46:15 +05:30
Deepesh Garg
d063f9a5d1
fix: GL Entry ordering
2021-06-10 12:26:21 +05:30
GangaManoj
076bd5eaab
fix: Only display GST card in Accounting Workspace if it's in India
2021-06-10 12:08:44 +05:30
Deepesh Garg
701cba7f03
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount
2021-06-10 12:04:38 +05:30