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
Deepesh Garg
edecd5b0c6
fix: Update einvoice json test
2021-06-10 12:04:30 +05:30
Deepesh Garg
0b5fe1b5eb
fix: Failing test case
2021-06-10 10:34:49 +05:30
Deepesh Garg
911818a9e2
fix: Add multiple fixes
2021-06-09 22:55:10 +05:30
Saqib
42557c4ad3
feat: cost-center wise period closing entry ( #25766 )
2021-06-09 19:48:31 +05:30
Saqib
26f0609390
feat: enable/disable gl entry posting for change given in pos ( #25822 )
2021-06-09 19:47:28 +05:30
Deepesh Garg
9e648183db
fix: Test case
2021-06-09 18:26:16 +05:30
Deepesh Garg
7dabb6be30
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-09 18:10:55 +05:30
Deepesh Garg
b57ebba3fd
fix: Validate negative allocated amount in Payment Entry ( #25799 )
2021-06-09 17:56:41 +05:30
Deepesh Garg
4c1dad8207
fix: Debug tests
2021-06-09 14:18:23 +05:30
Deepesh Garg
8090965162
fix: Debug test
2021-06-09 13:45:42 +05:30
Deepesh Garg
758db793be
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-09 13:39:07 +05:30
Deepesh Garg
bf5f87c2fe
Merge pull request #25969 from deepeshgarg007/inernal_transfer_invoices_ignore
...
fix: Ignore internal transfer invoices from GST Reports
2021-06-09 13:32:52 +05:30
Deepesh Garg
be631d1caf
Merge pull request #25986 from nextchamp-saqib/einvoicing-service-item-check
...
fix(e-invoicing): service item check
2021-06-09 13:00:43 +05:30
Anupam Kumar
21b8e2f0d8
fix: hiding Rounding Adjustment field ( #25380 )
...
* fix: hiding Rounding Adjustment field
* fix: updating purchase_invoice.json
2021-06-09 12:57:21 +05:30
Deepesh Garg
9a282aa593
Merge pull request #25858 from alyf-de/item-tax-templates
...
feat: Item Tax Templates for Germany
2021-06-09 12:50:27 +05:30
Rohit Waghchaure
99b583f688
fix: on click of duplicate button system copy the difference account from first row
2021-06-09 00:06:35 +05:30
Saqib Ansari
18eed58fc5
fix(e-invoicing): service item check
2021-06-08 20:52:14 +05:30
Rucha Mahabal
5ed2ef493a
Merge pull request #25984 from pateljannat/quiz-fixes-v13
...
fix: Quiz fixes v13
2021-06-08 18:57:24 +05:30
pateljannat
7ace06ac21
fix: sider
2021-06-08 18:26:23 +05:30
Ganga Manoj
0ea4d850e1
fix: Allow all System Managers to delete company transactions ( #25834 )
2021-06-08 17:23:44 +05:30
pateljannat
bbf07d9214
fix: quiz timer issues
2021-06-08 17:05:44 +05:30
Deepesh Garg
e4fcc5562f
refactor: Advance taxes and charges calculation
2021-06-08 16:35:47 +05:30
Sagar Vora
3f1231b77c
Merge pull request #25981 from resilient-tech/ssa-selection-v13
...
fix: choose correct Salary Structure Assignment when getting data for formula eval
2021-06-08 15:21:10 +05:30
Sagar Vora
062e247353
test: remove unused imports
2021-06-08 14:43:28 +05:30
Sagar Vora
ca205be5ac
fix: tests
2021-06-08 14:43:28 +05:30
Sagar Vora
0e5e1350b2
perf: use frappe.get_value with wildcard instead of another frappe.get_doc call
2021-06-08 14:43:28 +05:30
Sagar Vora
74818c7b62
fix: improve filter for from_date
; validation for joining and relieving date
2021-06-08 14:43:28 +05:30
Sagar Vora
447c978757
fix: choose correct Salary Structure Assignment when getting data for formula eval
2021-06-08 14:43:28 +05:30
Anuja Pawar
d4398fd84a
fix: update cost center from pos ( #25971 )
2021-06-07 16:20:21 +05:30
rohitwaghchaure
cf7baeab16
Merge pull request #25956 from rohitwaghchaure/fixed-conversion-factor-issue
...
fix: custom conversion factor field not mapped from job card to stock entry
2021-06-07 11:45:44 +05:30