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
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
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
Raffael Meyer
6038663bf8
fix: add_deduct_tax in Purchase Taxes setup ( #25757 )
2021-05-28 16:29:28 +05:30
Suraj Shetty
49c20f4f8d
chore: Update server-site test badge URL
2021-05-28 13:41:14 +05:30
Suraj Shetty
97687839b0
ci: Run mariadb tests after PR merge for coverage badge
2021-05-28 13:39:53 +05:30
Deepesh Garg
b084f1d320
fix(India): Show only company addresses for ITC reversal entry
2021-05-28 12:14:56 +05:30
Gavin D'souza
f93a7a72c1
ci(test): Temporary change to test PY2 compatability removal in Frappe
2021-05-28 11:44:16 +05:30
Gavin D'souza
07ba05630e
fix: Add future in requirements.txt
...
Since future is removed from frappe, adding it as a dependency here
2021-05-28 11:44:16 +05:30
Suraj Shetty
1a5c21c759
Merge pull request #25786 from prssanna/website-theme-fixes
2021-05-28 10:48:30 +05:30
Suraj Shetty
5f4527a6a1
refactor: Use css variables for breakpoint value
2021-05-28 08:55:38 +05:30
Deepesh Garg
5269f1537d
Merge pull request #25857 from Anuja-pawar/fix-ageing-error-pre-release
...
fix: ageing error in PSOA
2021-05-27 17:38:01 +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
Nabin Hait
ba2cbf8ec6
Merge pull request #25714 from deepeshgarg007/net_values_gl_v13
...
feat: Show net values in Party Accounts
2021-05-25 20:41:30 +05:30
Deepesh Garg
c262705143
feat: Show net values in Party Accounts ( #25714 )
2021-05-25 20:39:28 +05:30
Deepesh Garg
81376ea44f
feat: Show net values in Party Accounts ( #25714 )
2021-05-25 20:39:17 +05:30
Ganga Manoj
18cfced032
fix(Material Request): Make status on list and form view the same ( #24856 )
2021-05-25 19:54:07 +05:30
Nabin Hait
db95db892c
fix: merge conflict
2021-05-25 19:33:23 +05:30
Ganga Manoj
99636c6aca
fix: rearrange buttons for company doctype ( #25617 )
2021-05-25 19:17:01 +05:30
Afshan
4d61fa2497
fix: incorrect cr/dr shown in general ledger for multi-currency transactions ( #25654 )
2021-05-25 19:16:02 +05:30
