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
42d72b55b8
Merge branch 'version-13-hotfix' into version-13-pre-release
2021-06-10 20:26:31 +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
27299cfcc5
Merge branch 'version-13-hotfix' into version-13-pre-release
2021-06-10 19:45:38 +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
dad6a596eb
Merge pull request #26002 from deepeshgarg007/update_staging_v2
...
Update staging v2
2021-06-10 13:29:28 +05:30
Deepesh Garg
bcbb1c68b4
fix: GL Entry ordering
2021-06-10 13:17:55 +05:30
Deepesh Garg
1e898c0f5b
fix: Failing test case
2021-06-10 13:17:55 +05:30
Deepesh Garg
88c0cd6f7a
fix: Add multiple fixes
2021-06-10 13:17:55 +05:30
Deepesh Garg
2924ff830e
fix: Test case
2021-06-10 13:17:55 +05:30
Deepesh Garg
bc490e246e
fix: Debug tests
2021-06-10 13:17:27 +05:30
Deepesh Garg
60de73b904
fix: Debug test
2021-06-10 13:17:27 +05:30
Deepesh Garg
af13348817
refactor: Advance taxes and charges calculation
2021-06-10 13:17:02 +05:30
Deepesh Garg
16b309e66e
fix: Labeling and other fixes
2021-06-10 13:16:52 +05:30
Deepesh Garg
12fb02ed2a
fix: Remove GL Entry from print
2021-06-10 13:16:51 +05:30
Deepesh Garg
223efec26e
fix: Split GL Entry
2021-06-10 13:16:51 +05:30
Deepesh Garg
10e8316240
fix: Debug Test
2021-06-10 13:16:51 +05:30
Deepesh Garg
8106d70e70
fix: Update GL Entry ordering
2021-06-10 13:16:51 +05:30
Deepesh Garg
c368c5b20b
fix: Create new supplier for test case
2021-06-10 13:16:51 +05:30
Deepesh Garg
b45d90153c
fix: Add non group filter for account
2021-06-10 13:16:51 +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
