CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-10 13:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,911 Commits 410 Branches 1,715 Tags
2d936fe5ca032fb11af610bc0bcc90445ef1d916
Commit Graph

30911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
2d936fe5ca Merge pull request #23748 from marination/leave-type-filter 
fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050)
 2020-10-28 17:23:45 +05:30
Abhishek Balam
d0541d77b3 Merge branch 'version-12-hotfix' into leave-type-filter 2020-10-28 16:29:06 +05:30
Anurag Mishra
5f148d3d3a fix: set_query in leave application (#22197) 2020-10-28 16:25:57 +05:30
Abhishek Balam
6c894f8f41 fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050) 
* table was showing empty with just headers when no leaves allocated, fixed template code

* added filters on Leave Type based on leave allocation for a particular employee and to/from dates
 2020-10-28 16:12:57 +05:30
Marica
5effbeef49 Merge pull request #23733 from AfshanKhan/prod-order-reference-in-item-v12 
fix: Remove Production Order reference from Item Validation
 2020-10-28 16:09:52 +05:30
Afshan
0c511b31fd fix: Remove Production Order reference from Item Validation 2020-10-26 20:34:48 +05:30
Nabin Hait
439c4e11bf fix: Show accounts in financial statements upto level 20 (#23719) 2020-10-24 22:00:17 +05:30
Aditya Duggal
a76b1c530d fix: None type error if the Pricing Rule applicable_for is None (#23664) 
* fix: None type error if the Pricing Rule applicable_for is None
* fix: sider

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-10-24 11:20:24 +05:30
rohitwaghchaure
aef8010bc1 Merge pull request #23712 from marination/cashier-closing-type-issue-fix 
fix: Cashier Closing, Type Issue
 2020-10-23 16:12:41 +05:30
marination
e9b7b69435 fix: Cashier Closing Type Issue 2020-10-23 14:46:44 +05:30
Saqib
eb6fb6fffa fix: cannot auto unlink payments for credit/debit notes (#23690) 2020-10-22 16:31:55 +05:30
Marica
ab5d596959 fix: Add Taxes if missing via Update Items (#23705) 
* fix: Add Taxes if missing via Update Items

* chore: PO Test for adding tax row via Update Items

* chore: SO Test for adding tax row via Update Items
 2020-10-22 16:28:41 +05:30
Afshan
203fc2b940 fix: removed extra space from label "Rate" (#23685) 2020-10-20 10:56:38 +05:30
Saqib
8e7a755aeb feat: show only available items in point of sale (#23667) 
* feat: show available items in pos

* feat: show selected pos profile on pos screen

* fix: codacy

* fix: codacy
 2020-10-19 11:37:22 +05:30
Sun Howwrongbum
334c282f7b fix: consider rounded_total in returns (#23631) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 11:30:48 +05:30
Saqib
3ae9bbc0a7 fix: fuel expense amount of vehicle log (#23634) 
* fix: fuel expense amount of vehicle log

* fix: undefined var employee_id in test

* fix: test
 2020-10-16 11:54:36 +05:30
rohitwaghchaure
8b8457c5d3 Merge pull request #23647 from rohitwaghchaure/fixed-overproduction-against-work-order 
fix: overproduction, not allowed to transfer extra materials
 2020-10-16 10:31:58 +05:30
rohitwaghchaure
eabe1af280 Merge pull request #23651 from rohitwaghchaure/donot-set-serial-nos-if-manually-set 
fix: manually set serial nos override with current available serial nos
 2020-10-15 22:01:32 +05:30
rohitwaghchaure
7bbdbaa2fa Merge pull request #23655 from rohitwaghchaure/removed-repetative-code 
fix: remove repetative code
 2020-10-15 21:57:33 +05:30
Rohit Waghchaure
28a5169646 fix: remove repetative code 2020-10-15 21:54:53 +05:30
Rohit Waghchaure
c7ec475429 fix: manually set serial nos override with current available serial nos 2020-10-15 19:00:02 +05:30
Rohit Waghchaure
433faa705e fix: overproduction, not allowed to transfer extra materials 2020-10-15 18:53:50 +05:30
rohitwaghchaure
2b4da0d518 Merge pull request #23646 from rohitwaghchaure/set-current-serial-no-in-serial-no-field 
fix: serial no field is blank in stock reconciliation
 2020-10-15 15:45:37 +05:30
Rohit Waghchaure
8d7e26c7dd fix: serial no field is blank in stock reconciliation 2020-10-15 14:29:57 +05:30
rohitwaghchaure
6ff846f9b0 Merge pull request #23645 from rohitwaghchaure/receive-at-warehouse-not-validate-for-extra-transfer-qty 
fix: extra material received against send to warehouse entry
 2020-10-15 13:59:45 +05:30
Rohit Waghchaure
f956a2cf72 fix: extra material received against send to warehouse entry 2020-10-15 12:59:10 +05:30
rohitwaghchaure
1fb3a29cf9 Merge pull request #23637 from anupamvs/item-group-filter-portal-v12 
fix: added filter show in website for filtering product
 2020-10-14 16:28:39 +05:30
Afshan
4b8d4a1cbe fix: setting user precision instead of 2 (#23630) 
* fix: setting user precision instead of default

* fix: removing unused imports
 2020-10-14 15:50:26 +05:30
Anupam
90eb489392 fix: added filter show in website for filtering product 2020-10-14 15:26:34 +05:30
rohitwaghchaure
bd4896b1b2 Merge pull request #23619 from rohitwaghchaure/incorrect-supplied-qty-issue 
fix: incorrect supplied qty error
 2020-10-14 00:24:04 +05:30
rohitwaghchaure
98b7f0a0f0 Merge pull request #23497 from frappe/fix_fiscal_year 
fix: fiscal year can be shorter than 12 months
 2020-10-13 23:26:41 +05:30
Rohit Waghchaure
4def9ed1c6 fix: incorrect supplied qty error 2020-10-13 22:43:18 +05:30
rohitwaghchaure
0ae4527ff8 Merge pull request #23618 from aakvatech/patch-5 
feat: Add company and correct filter in bank statement reconciliation report filters
 2020-10-13 16:59:42 +05:30
Raffael Meyer
e2b7ac2b0e fix: make account number length configurable (#23496) 
* fix: make account number length configurable

* Update datev.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-13 15:09:18 +05:30
Deepesh Garg
63bbce708d Merge pull request #23552 from deepeshgarg007/gst3b_taxable_value 
fix: Taxable value in GSTR 3B report
 2020-10-13 14:03:44 +05:30
aakvatech
8f60d25064 feat: Add company and correct filter in bank statement reconciliation… 
… report filters

If you have multi company scenario and many bank accounts that are no longer active, then it becomes difficult in bank statement reconciliation report to filter the account to reconcile and it also shows disabled accounts so futher confusion is created.

https://github.com/frappe/erpnext/issues/23613
 2020-10-13 10:26:33 +03:00
rohitwaghchaure
39988c9319 fix: subscription test case (#23617) 2020-10-13 12:36:48 +05:30
rohitwaghchaure
0c1aaa440d Merge pull request #23495 from frappe/check_fiscal_year 
fix: check fiscal year
 2020-10-13 12:12:00 +05:30
Marica
890c5b063c Merge pull request #23608 from marination/holiday-list-fix 
fix: Convert dates to datetime.date before comparing in Holiday List
 2020-10-13 02:47:51 +05:30
marination
007069d495 fix: Convert dates to datetime.date before comparing in Holiday List 2020-10-13 02:42:14 +05:30
Deepesh Garg
820c77a375 Merge pull request #23477 from anupamvs/subscription-invoice-v12 
fix: Payment Schedule not fetching
 2020-10-12 20:35:07 +05:30
Anupam Kumar
e6adf20037 Merge branch 'version-12-hotfix' into subscription-invoice-v12 2020-10-12 19:41:49 +05:30
rohitwaghchaure
72dbabf0d2 Merge pull request #23395 from anupamvs/quality-procedure 
fix: quality procedure parent
 2020-10-12 18:50:43 +05:30
Anupam
984fdde692 fix: review fixes 2020-10-12 18:06:58 +05:30
rohitwaghchaure
3cdbe7c586 Merge pull request #23440 from legendleap/version-12-hotfox-itemcode 
fix: include item_code in items result to allow adding product info in custom templates
 2020-10-12 17:30:45 +05:30
Marica
848d78b373 Merge pull request #23591 from anupamvs/item-attribute 
feat: validate if removed item attributes exist in variants
 2020-10-12 17:22:29 +05:30
Marica
e1047af4bf Merge branch 'version-12-hotfix' into item-attribute 2020-10-12 17:22:01 +05:30
Saqib
79d069cbbb fix: last purchase rate in item prices report (#23507) 
* fix: last purchase rate in item prices report

* fix: last purchase rate in item prices report

* fix: last purchase rate in item prices report

* chore: fetch last purchase rate from update stock purchase invoices
 2020-10-12 17:09:29 +05:30
rohitwaghchaure
29c2f399e3 Merge pull request #22328 from pipech/v12-hotfix-get_pricing_rule 
fix(pricing_rules): pricing rule selector is wrong
 2020-10-12 15:33:13 +05:30
rohitwaghchaure
4fa06ad6a6 Merge pull request #23594 from anupamvs/item-price-v12 
fix: can't save item price after adding child table
 2020-10-12 15:17:34 +05:30