CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-11 22:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,885 Commits 411 Branches 1,717 Tags
1fb3a29cf9bc6594f49ef19f41f952834ded72b6
Commit Graph

30885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rushabh Mehta
122fea8043 Merge pull request #23551 from anupamvs/procurement-tracke-v12 
fix: project value is missing from procurement-tracker
 2020-10-12 15:13:46 +05:30
rohitwaghchaure
660a811483 Merge pull request #23564 from rohitwaghchaure/fixed-batch-wise-stock-reco 
fix: negative stock error while submitting stock reco for batch item
 2020-10-12 15:11:41 +05:30
rohitwaghchaure
c351e2a03c Merge pull request #23522 from rohitwaghchaure/extra-filters-in-batchwise-balance-report 
feat: added new filters in the Batch-wise balance history report
 2020-10-12 15:11:21 +05:30
rohitwaghchaure
0cbe0c0b21 Merge pull request #23520 from rohitwaghchaure/feat-added-balance-serial-no-column 
feat: balance serial nos in stock leder report
 2020-10-12 15:09:42 +05:30
rohitwaghchaure
3ed333831d Merge pull request #23599 from deepeshgarg007/pos_return_amount 
fix: Mode of payment getting overwritten by defautl mode of payment for retruns
 2020-10-12 15:09:16 +05:30
rohitwaghchaure
a0ed196005 Merge pull request #23600 from rohitwaghchaure/fixed-overproduction-issue 
fix: not able to do overproduction
 2020-10-12 14:59:41 +05:30
Saqib
f41fe79528 fix(asset): cannot create asset if cwip disabled and account not set (#23584) 
* fix: asset purchase with purchase invoice

* chore: allow enable cwip accounting only if cwip account is set

* fix: cannot create asset if cwip disabled and account not set
 2020-10-12 14:56:08 +05:30
Marica
72ca041fd2 Merge pull request #23480 from rohitwaghchaure/fixed-incorrect-operation-time-calculation 
fix: incorrect operation time calculation for batch size
 2020-10-12 14:55:01 +05:30
Rohit Waghchaure
1270c53dea fix: not able to do overproduction 2020-10-12 14:54:54 +05:30
Marica
cedbaa5ac9 Merge branch 'version-12-hotfix' into fixed-incorrect-operation-time-calculation 2020-10-12 14:54:44 +05:30
Marica
b3f0488dca Merge branch 'version-12-hotfix' into item-attribute 2020-10-12 14:51:18 +05:30
Deepesh Garg
772ccde33f fix: Mode of payment getting overwritten by defautl mode of payment for returns 2020-10-12 13:32:49 +05:30
Deepesh Garg
3ca57e493a fix: Do not consider opening entries for TDS calculation (#23598) 2020-10-12 13:03:25 +05:30
Anupam
dc68b44596 fix: can't save item price after adding child table 2020-10-12 11:53:19 +05:30
Anupam
a784e13ac3 fix: Payment Schedule not fetching 2020-10-12 11:51:51 +05:30
Anupam
6297778a6a feat: validate if removed item attributes exist in variants 2020-10-12 11:00:28 +05:30
rohitwaghchaure
6825d5442f Merge pull request #23544 from tundebabzy/version-12-hotfix 
fix: pass self.flags.ignore_permissions to the ignore_permissions argument of Address and Contact
 2020-10-10 11:11:28 +05:30
rohitwaghchaure
5bbb793803 Merge pull request #23571 from nextchamp-saqib/si-dashboard-fix-v12 
fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard
 2020-10-10 11:08:55 +05:30
Saqib
5d7c9d2f61 fix: update items after submission ignores precision (#23492) 
* fix: update items after submission ignores precision

* chore: add test
 2020-10-09 21:19:40 +05:30
Saqib Ansari
a7293407bd fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard 2020-10-09 21:01:31 +05:30
Rohit Waghchaure
4968f162bd fix: negative stock error while submitting stock reco for batch item 2020-10-09 18:34:13 +05:30
Marica
a8f9e2ab37 Merge pull request #23565 from marination/v12-fix-financial-statement-print-format 
fix: Show total row in print format of financial statement
 2020-10-09 14:50:29 +05:30
Anupam
15717490fd fix: project value is missing from procurement-tracker 2020-10-09 14:18:42 +05:30
Suraj Shetty
eef5c5dad4 fix: Show total row in print format of financial statement 2020-10-09 13:52:34 +05:30
Tunde Akinyanmi
65a716dd08 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into version-12-hotfix 2020-10-09 07:24:23 +01:00
Deepesh Garg
0e6e7e95ba fix: Taxable value in GSTR 3B report 2020-10-08 15:30:40 +05:30