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
Rucha Mahabal
f393934f3f
Merge pull request #25876 from resilient-tech/fix-ssa-selection
...
fix: choose correct Salary Structure Assignment when getting data for formula eval
2021-06-08 13:11:32 +05:30
Sagar Vora
5b1e7a61b8
test: remove unused imports
2021-06-07 19:34:02 +05:30
Sagar Vora
7f5378d98a
fix: tests
2021-06-07 18:40:54 +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
Deepesh Garg
6f2dacc60c
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-06 19:31:50 +05:30
Deepesh Garg
7a20c3b92a
fix: Ignore internal transfer inoices from GST Reports
2021-06-06 19:23:21 +05:30
Deepesh Garg
18be767f75
fix: Remove invalid test
2021-06-06 13:25:34 +05:30
Anupam
bf0528413d
fix: payroll entry employee detail issue
2021-06-06 13:12:13 +05:30
Saqib
d689068d82
Merge pull request #25928 from nextchamp-saqib/pos-fixes-8
...
fix(pos): multiple pos issues
2021-06-06 11:25:29 +05:30
Saqib Ansari
3f32969bee
fix(pos): broken image in item details section
2021-06-06 11:18:20 +05:30
Saqib Ansari
bc46a9772d
fix(pos): cash shortcuts not working
2021-06-06 11:11:07 +05:30
Saqib Ansari
a85c2c16b4
fix(pos): item rate precision in item selector
2021-06-06 11:07:20 +05:30
Deepesh Garg
3646c301ed
fix: Linting issues
2021-06-05 13:21:03 +05:30
Deepesh Garg
e8a78bd43d
fix: Add test cases
2021-06-05 13:16:39 +05:30
Deepesh Garg
8a7e283926
feat: Item Taxes based on net rate
2021-06-04 22:53:26 +05:30
barredterra
572b6df0f2
Merge branch 'version-13-hotfix' into item-tax-templates
2021-06-04 16:55:11 +02:00
gavin
203a363cd6
Merge branch 'develop' into patch-tests
2021-06-04 20:13:15 +05:30
Gavin D'souza
102afe7de1
fix: Manually link_fields from flags before rename_doc
2021-06-04 20:11:34 +05:30
Gavin D'souza
ac99c719bc
Revert "fix(patch): Reload linked doctypes before renaming dt"
...
This reverts commit 4e2e8daca9
because although it fixed it locally, didn't seem to do anything for erpnext CI
2021-06-04 20:10:26 +05:30
Gavin D'souza
4e2e8daca9
fix(patch): Reload linked doctypes before renaming dt
2021-06-04 17:56:28 +05:30
Gavin D'souza
0b7da52ef1
fix(patch): Handle NULL values from fieldtype change
2021-06-04 17:07:45 +05:30
Sagar Vora
bd92b4339c
perf: use frappe.get_value with wildcard instead of another frappe.get_doc call
2021-06-04 16:09:00 +05:30
Sagar Vora
5657fddb7a
fix: improve filter for from_date
; validation for joining and relieving date
2021-06-04 16:09:00 +05:30
Sagar Vora
e80902be8e
fix: choose correct Salary Structure Assignment when getting data for formula eval
2021-06-04 16:09:00 +05:30
Ankush Menat
215516f819
fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' ( #25902 ) ( #25957 )
...
* fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice'
This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing
bench update --patch --reset
* fix(minor): use .get instead of getattr
Co-authored-by: D Tim Cummings <tim@triptera.com.au>
2021-06-04 13:09:14 +05:30
D Tim Cummings
fb3ec7ccb8
fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' ( #25902 )
...
* fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice'
This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing
bench update --patch --reset
* fix(minor): use .get instead of getattr
2021-06-04 11:58:45 +05:30
Gavin D'souza
c68006b607
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-04 11:49:56 +05:30
Gavin D'souza
8697e89441
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-04 11:49:56 +05:30
Gavin D'souza
5bf5775b43
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-04 11:49:56 +05:30
Rucha Mahabal
3f45901f25
fix: invalid 'depends_on' expression in opportunity ( #25955 )
2021-06-04 11:16:38 +05:30
Rucha Mahabal
3e92089200
fix: invalid 'depends_on' expression in opportunity ( #25953 )
2021-06-04 11:15:38 +05:30
Rohit Waghchaure
af4794b2d1
fix: custom conversion factor field not mapped from job card to stock entry
2021-06-04 10:53:44 +05:30
Saqib
c6e016e545
fix: wrong round off gl entry posted in case of purchase invoice ( #25775 )
2021-06-04 10:08:22 +05:30
Saqib Ansari
4a1e270072
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into pos-fixes-8
2021-06-04 10:04:09 +05:30
rohitwaghchaure
25b953ad16
Merge pull request #25854 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation
...
fix: timeout error in the repost item valuation
2021-06-03 22:14:22 +05:30
rohitwaghchaure
cd503ce01d
Merge pull request #25938 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-v13-pre
...
fix: timeout error in the repost item valuation
2021-06-03 22:14:01 +05:30
rohitwaghchaure
c59371ab0c
fix: filter type for item query ( #25942 )
2021-06-03 20:02:58 +05:30
Raffael Meyer
cee0ddea78
Merge pull request #25943 from rohitwaghchaure/fixed-filters-for-item-query-pre
...
fix: filter type for item query
2021-06-03 15:58:20 +02:00
Rohit Waghchaure
8449a47048
fix: filter type for item query
2021-06-03 18:32:28 +05:30
barredterra
c99eaf106e
Merge branch 'version-13-hotfix' into item-tax-templates
2021-06-03 14:17:43 +02:00
Rohit Waghchaure
4e10ce1632
fix: timeout error in the repost item valuation
2021-06-03 16:35:59 +05:30