Commit Graph

26974 Commits

Author SHA1 Message Date
marination
c5da51dd7a fix: Report Raw Materials to be Transferred 2021-06-11 12:51:10 +05:30
rohitwaghchaure
387de3f3fa
Merge pull request #26015 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-develop
fix: timeout error in the repost item valuation
2021-06-11 12:18:13 +05:30
rohitwaghchaure
da28db3698
Merge pull request #26016 from rohitwaghchaure/fixed-conversion-factor-issue-develop
fix: custom conversion factor field not mapped from job card to stock entry
2021-06-11 12:17:54 +05:30
rohitwaghchaure
49f3e5bbd5
Merge pull request #26017 from rohitwaghchaure/donot-copy-difference-account-develop
fix: on click of duplicate button system has not copied the difference account
2021-06-11 12:17:36 +05:30
Rohit Waghchaure
17408c6388 fix: on click of duplicate button system copy the difference account from first row 2021-06-11 10:58:00 +05:30
Rohit Waghchaure
9cfd3adad9 fix: custom conversion factor field not mapped from job card to stock entry 2021-06-11 10:56:44 +05:30
Rohit Waghchaure
b103b24ae1 fix: timeout error in the repost item valuation 2021-06-11 10:55:05 +05:30
Rohit Waghchaure
f310501d7d fix: filter type for item query 2021-06-11 10:53:07 +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
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
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
walstanb
646f0c3b53 fix: variable declaration 2021-06-08 17:54:34 +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
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
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
8821d71094 bumped to version 13.4.1 2021-06-02 22:34:19 +05:50
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
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
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
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
Raffael Meyer
6038663bf8
fix: add_deduct_tax in Purchase Taxes setup (#25757) 2021-05-28 16:29:28 +05:30
Deepesh Garg
b084f1d320 fix(India): Show only company addresses for ITC reversal entry 2021-05-28 12:14:56 +05:30
Suraj Shetty
5f4527a6a1 refactor: Use css variables for breakpoint value 2021-05-28 08:55:38 +05:30
Anuja P
753e5894de fix: ageing error in PSOA 2021-05-27 17:33:22 +05:30
Suraj Shetty
8612558433
Merge branch 'develop' into website-theme-fixes 2021-05-27 13:56:28 +05:30
Anupam Kumar
59769c7a86
fix: student invalid password reset link (#25825) 2021-05-26 12:16:04 +05:30
Nabin Hait
e5df60287e Merge branch 'version-13-hotfix' into version-13-pre-release 2021-05-25 20:42:58 +05:30
Deepesh Garg
81376ea44f
feat: Show net values in Party Accounts (#25714) 2021-05-25 20:39:17 +05:30