schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,244 Commits 322 Branches 1,581 Tags
a23f92900547412736db7eec4797cc7db5880dcb
Commit Graph

30244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
a23f929005 fix: TDS computation summary report 2020-05-27 22:51:36 +05:30
mergify[bot]
c75303b0ab feat: remove website settings from boot (#21801) (#21809) 
(cherry picked from commit e091789332)

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-05-20 18:24:05 +05:30
Anupam Kumar
ee56de3091 enable Allow Rename in sales stage (#21800) 2020-05-20 16:15:16 +05:30
Marica
d53d6cabb4 fix: Validate Payment Gateway only if it exists in Payment Request. (#21806) 2020-05-20 16:13:38 +05:30
rohitwaghchaure
0e63f4ba08 Merge pull request #21794 from deepeshgarg007/general_ledger_against_voucher_v12 
fix: Against voucher in General Ledger
 2020-05-20 10:30:20 +05:30
Deepesh Garg
74b943392b Merge pull request #21786 from anupamvs/sales-order-tax-hotfix 
fix: tax id is not fetched when creating sales order from quotation
 2020-05-19 21:49:34 +05:30
Anupam K
9245133b99 tax id is not fetched in when creating sales order from quoation 2020-05-19 21:37:19 +05:30
Deepesh Garg
05aae4341e fix: Against voucher in General Ledger 2020-05-19 20:59:51 +05:30
Deepesh Garg
dc04d44a20 Merge pull request #21791 from deepeshgarg007/gst_1_instate_v1 
fix: Tax amount in GSTR-1 JSON
 2020-05-19 20:01:18 +05:30
Deepesh Garg
e2e5ba345c fix: Tax amount in GSTR-1 JSON 2020-05-19 19:56:51 +05:30
rohitwaghchaure
07924d3c7c refactor: changed the fieldtype from data to small text (#21783) 2020-05-19 19:05:17 +05:30
Deepesh Garg
bd29244d66 Merge pull request #21787 from deepeshgarg007/gst_1_instate 
fix: Instate Invoice not appearing in GSTR-1 report
 2020-05-19 19:04:11 +05:30
Deepesh Garg
b384ed74cd fix: Instate Invoice not appearing in GSTR-1 report 2020-05-19 18:53:08 +05:30
Shivam Mishra
72892a40d6 refactor: use text editor in issue web form (#21772) 2020-05-19 16:36:25 +05:30
mergify[bot]
113048347c feat: save shipping address and contact to woocommerece customer (bp #21654) (#21771) 2020-05-19 14:36:29 +05:30
Himanshu
8b144a38cc fix: add naming series (#21770) 2020-05-19 14:27:01 +05:30
Deepesh Garg
c4d6cca9f1 Merge pull request #21762 from frappe/mergify/bp/version-12-hotfix/pr-21761 
fix: Validate Filters in Sales Funnel. (bp #21761)
 2020-05-18 16:45:20 +05:30
Marica
795d318fcc fix: Validate Filters in Sales Funnel. (#21761) 
* fix: Validate Filters in Sales Funnel.

* fix: Style fixes

(cherry picked from commit c734db5d45)
 2020-05-18 09:15:45 +00:00
Himanshu
6dbb02d293 fix: show searchfields result (#21760) 2020-05-18 14:26:43 +05:30
rohitwaghchaure
ea4c91f51c fix: bom incorrect price list rate for raw material if price list currency is different from company currency (#21586) 
* fix: bom incorrect price list rate for raw material if price list currency is different from company currency

* fixed test cases

* fixed base_rate calculation and added plc_conversion_rate trigger
 2020-05-18 14:22:42 +05:30
Marica
395da09dae fix: Patch to set status in old serial no data (#21721) 
* fix: Patch to set status in old serial no data

* fix: Avoid get_doc in patch

* fix: fetch all values and check status in one query
 2020-05-18 11:18:56 +05:30
Raffael Meyer
9b08258955 fix: remove guest access (#21692) 2020-05-17 20:57:51 +05:30
rohitwaghchaure
7f2aedb67c fix: incorrect stock valuation for repack entry (#21737) 2020-05-17 20:28:21 +05:30
Anurag Mishra
1045dc49f5 fix: Future date half day validation (#21719) 
* fix: Future date half day validation

* fix: Allow half day attendance only via leave application

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-17 20:17:39 +05:30
Deepesh Garg
a569fed4da Merge pull request #21746 from frappe/mergify/bp/version-12-hotfix/pr-21712 
fix: error log title for failing bank transactions (bp #21712)
 2020-05-16 17:15:05 +05:30
rohitwaghchaure
9af9b438af Merge pull request #21748 from rohitwaghchaure/fix-supplier-schema-save-issue-hotfix 
fix: promotional scheme not able to save
 2020-05-16 11:34:33 +05:30
Rohit Waghchaure
3e321d5c24 fix: promotional scheme not able to savce 2020-05-16 05:01:30 +05:30
Mangesh-Khairnar
e2f53cdc83 fix: error log title for failing bank transactions 
(cherry picked from commit 4a9fd9ef6d)
 2020-05-15 18:16:22 +00:00
Deepesh Garg
f9834504c8 Merge pull request #21745 from deepeshgarg007/coa_ux_v12 
fix: Excel support and UX fixes for chart of accounts importer
 2020-05-15 20:08:54 +05:30
Deepesh Garg
ec19926a97 Move logic for download template to dialog 2020-05-15 19:45:47 +05:30
Deepesh Garg
39790f05e7 fix: Linting fixes 2020-05-15 19:44:45 +05:30
Deepesh Garg
317b53a8b6 fix: Description on template selection 2020-05-15 19:44:36 +05:30
Deepesh Garg
101612e599 fix: Added template types for download 2020-05-15 19:44:27 +05:30
Deepesh Garg
838ed77797 fix: Blank chart preview 2020-05-15 19:44:18 +05:30
Deepesh Garg
8ff718249e fix: Linting Errors 2020-05-15 19:44:07 +05:30
Deepesh Garg
88c2ba54ab fix: Excel support and UX fixes for chart of accounts importer 2020-05-15 19:43:56 +05:30
rohitwaghchaure
a52fe009cc fix: user not able to view product (#21697) 2020-05-15 19:35:35 +05:30
Deepesh Garg
79b691fe18 fix: Better validation message for group accounts (#21726) 2020-05-15 19:23:16 +05:30
Deepesh Garg
29f1a219d1 Merge pull request #21743 from nextchamp-saqib/payment-remark-fix-v12 
fix: update remark on submitting payment entry
 2020-05-15 17:49:11 +05:30
Deepesh Garg
73e3ba2c30 Merge pull request #21744 from frappe/mergify/bp/version-12-hotfix/pr-21729 
fix: Submit perm for other income and removed caching while getting hra and basic from company (bp #21729)
 2020-05-15 17:47:10 +05:30
Nabin Hait
78f69e448b fix: Added submit permission in employee other income 
(cherry picked from commit 200f80c3d3)
 2020-05-15 11:28:08 +00:00
Nabin Hait
52890341d5 fix: Get basic and hra component from db, not from cache 
(cherry picked from commit 10df3d5081)
 2020-05-15 11:28:08 +00:00
Saqib Ansari
725684a0c3 fix: update remark on submitting payment entry 2020-05-15 16:39:45 +05:30
Deepesh Garg
dc59831aa9 Merge pull request #21700 from nextchamp-saqib/pur-inv-status-fix-v12 
fix: purchase inv shows overdue for fraction of outstanding
 2020-05-15 15:45:36 +05:30
Saqib Ansari
2fa841821a fix: add tests for set_status 2020-05-15 14:31:19 +05:30
rohitwaghchaure
3b14810564 Merge pull request #21714 from nextchamp-saqib/off-pos-tax-template-v12 
fix: item tax template fetching in offline pos
 2020-05-15 13:47:01 +05:30
Deepesh Garg
8ed066ba1f fix: Add misssing dimensions in GL entries (#21691) 
* fix: Add misssing dimensions in GL entries

* fix: expnese_taxes_and_charges.json

* fix: Add project filter in trial balance report

* fix: Use current dimensions instead of dimensions from asset
 2020-05-15 12:58:19 +05:30
Rohan
f344369068 format: better error messages for invalid coupon codes (v12) (#21598) 
* format: better error messages for invalid coupon codes

* fix: remove unnecessary docstatus check
 2020-05-15 12:09:16 +05:30
Mangesh-Khairnar
71d9a52a07 fix: duplicate leave expiry creation (#21506) 
* fix: validate existing ledger entries to avoid duplicates

* patch: remove duplicate ledger entries created

* fix: consider only submitted ledger entries

* fix: delete duplicate leaves from the ledger

* fix: check if duplicate ledger entry exists

* chore: formatting changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-15 11:55:36 +05:30
Saqib Ansari
0af125f6fe fix: test 2020-05-15 05:26:41 +05:30