Rohit Waghchaure
f310501d7d
fix: filter type for item query
2021-06-11 10:53:07 +05:30
gavin
04df567973
Merge pull request #25967 from anupamvs/payroll-emp-detail
...
fix: payroll entry employee detail issue
2021-06-10 20:37:35 +05:30
gavin
46cc089f8b
Merge branch 'develop' into payroll-emp-detail
2021-06-10 20:15:28 +05:30
Anupam
32ebb1001e
fix: review chnages
2021-06-10 19:32:00 +05:30
Deepesh Garg
48f2839079
fix: Sort account balances by account name
2021-06-10 19:00:50 +05:30
Sagar Vora
ba333927f8
Merge pull request #26005 from resilient-tech/fix-se
...
fix: syntax error in Stock Entry
2021-06-10 16:54:11 +05:30
walstanb
8f5ae0470d
fix: syntax error in stock entry
2021-06-10 16:35:27 +05:30
rohitwaghchaure
64cc60f97a
Merge pull request #25946 from gavindsouza/patch-tests
...
ci: Update Patch tests
2021-06-10 14:11:08 +05:30
gavin
0f5b54c602
Merge pull request #25994 from ChillarAnand/requirement
...
chore: Upgrade PyGithub to 1.55
2021-06-09 19:43:24 +05:30
ChillarAnand
8eab59b062
chore: Upgrade PyGithub to 1.55
...
Frappe has upgraded to PyJWT>2. Upgrading PyGithub to resolve
dependency issues
2021-06-09 18:05:39 +05:30
Jannat Patel
6b8c123fd9
fix: Quiz timer ( #25983 )
...
* fix: quiz timer
* fix: pass time bound parameter
* fix: sider
2021-06-08 18:57:49 +05:30
Sagar Vora
10ec2eed6f
Merge pull request #25985 from resilient-tech/fix-quotation
...
fix: variable declaration
2021-06-08 18:09:34 +05:30
walstanb
646f0c3b53
fix: variable declaration
2021-06-08 17:54:34 +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
Anupam
bf0528413d
fix: payroll entry employee detail issue
2021-06-06 13:12:13 +05:30
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
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
3e92089200
fix: invalid 'depends_on' expression in opportunity ( #25953 )
2021-06-04 11:15:38 +05:30
gavin
3d5e15284b
Merge pull request #25850 from gavindsouza/rm-py2
...
fix: Add future in requirements.txt
2021-06-03 11:34:24 +05:30
Anoop
f899b3a633
fix: update linked Customer on Patient update only if Link Customer to Patient is enabled ( #25921 )
2021-06-03 09:24:31 +05:30
Nabin Hait
811f607c85
Merge branch 'version-13' into develop
2021-06-02 22:14:20 +05:30
Nabin Hait
0385ae2b43
Merge branch 'version-13-pre-release' into version-13
2021-06-02 22:14:20 +05:30
Nabin Hait
8821d71094
bumped to version 13.4.1
2021-06-02 22:34:19 +05:50
Nabin Hait
830e87a4dd
Merge pull request #25917 from rohitwaghchaure/fixed-work-order-no-able-to-select-item-pre
...
fix: not able to select the item code in work order
2021-06-02 18:59:41 +05:30
Rohit Waghchaure
5dd92934ae
fix: not able to select the item code in work order
2021-06-02 14:27:24 +05:30
Sagar Vora
eff8f6fe34
fix(Payroll): no need to set abbr
specially in Salary Slip ( #25877 )
2021-06-01 19:57:17 +05:30
Suraj Shetty
5b17f335d1
ci: Add coveralls_repo_token env variable
2021-06-01 08:18:56 +05:30
rohitwaghchaure
6463cbd15e
Merge pull request #25897 from anupamvs/stock-reconciliation
...
fix: featching serialized items
2021-05-31 20:00:26 +05:30
Anupam
0358b64743
fix: featching serialized items
2021-05-31 15:59:32 +05:30
Nabin Hait
a3d1b6973a
fix: merge conflict
2021-05-31 11:21:33 +05:30
Nabin Hait
d0ba0217e4
Merge branch 'version-13-pre-release' into version-13
2021-05-31 11:14:33 +05:30
Nabin Hait
c63e233bc7
bumped to version 13.4.0
2021-05-31 11:34:33 +05:50
Nabin Hait
4c94ccc8d8
chore: Added change log
2021-05-31 10:51:57 +05:30
Rucha Mahabal
05d5fb24f7
fix(test): tax detail report ( #25884 )
2021-05-29 23:18:36 +05:30
Gavin D'souza
62996ec980
Revert "ci(test): Temporary change to test PY2 compatability removal in Frappe"
...
This reverts commit f93a7a72c1
.
2021-05-28 23:06:15 +05:30
Gavin D'souza
d053081cb7
Merge branch 'develop' of github.com:frappe/erpnext into rm-py2
2021-05-28 21:48:05 +05:30
Ankush Menat
2df7f474fa
fix: use dictionary filter instead of list ( #25875 )
...
Item query doesn't support list filter anymore.
2021-05-28 21:12:10 +05:30
Deepesh Garg
d4dc76c3ee
Merge pull request #25867 from deepeshgarg007/itc_reversal_address_pre
...
fix(India): Show only company addresses for ITC reversal entry
2021-05-28 18:45:59 +05:30