CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-25 06:02:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,722 Commits 430 Branches 1,726 Tags
f8dc7b32d59284a68083cf6df9b37463c9fbcf1c
Commit Graph

26722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chinmay Pai
f8dc7b32d5 fix: use ERPNext in welcome email when default company is not set (#20837) 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-03-16 13:50:09 +05:30
RJPvT
0393cb5c43 fix: smaller then instead of bigger then :-( dumb mistake (#20693) 
* fix: smaller then instead of bigger then :-( dumb mistake

* fix: comment on get_all

* Update erpnext/projects/doctype/task/task.py

Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>

* Update erpnext/projects/doctype/task/task.py

Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-02-26 12:49:48 +05:30
Mathieu Brunot
39c71e26b9 chore(ci-coverage): Pin coverage 4.5.4 #20646 (#20649) 
* chore(ci-coverage): Pin coveralls 4.5.4 #20646

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>

* chore: Fix coverage

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
 2020-02-20 12:51:32 +05:30
Deepesh Garg
77285317c0 Merge pull request #20665 from marination/stock-settings-query-v11-hotfix 
fix: Set Query on warehouse fields in Stock Settings
 2020-02-19 18:59:37 +05:30
marination
a95c09bef6 fix: Server side validation for Warehouses 2020-02-19 11:30:47 +05:30
marination
6b901d0c1a fix: Set Query on warehouse fields in Stock Settings 2020-02-18 21:51:00 +05:30
rohitwaghchaure
8a7ccd9874 Merge pull request #20656 from marination/precision-mr-item-v11-hotfix 
fix: Stock Quantity not calculated on client side in Material Request Items.
 2020-02-18 12:34:45 +05:30
marination
2f2e748b7a fix: Stock Quantity not calculated on client side in Material Request Items. 2020-02-18 11:19:37 +05:30
Deepesh Garg
549ab68eb0 Merge pull request #20503 from sunhoww/patch-4 
fix: [v11] negative stock error at landed cost voucher
 2020-02-02 17:35:54 +05:30
Sun Howwrongbum
0b9bf4d0ac fix: negative stock error at landed cost voucher 2020-02-02 16:45:57 +05:30
Nabin Hait
1c5df5dede cannot close task if dependent task are not closed / cancelled (#20433) 2020-01-28 14:08:31 +05:30
Deepesh Garg
41d2357dc4 Merge pull request #20442 from fproldan/fix_sqlinjection_hotfix_v11 
fix: SQL Injection in get_product_list_for_group method
 2020-01-28 09:17:39 +05:30
NahuelOperto
af79714f40 Fix sql injection 2020-01-27 08:55:35 -03:00
Marica
8a5f31da34 fix: Applied query on PO Supplier popup field in Material Request. (#20233) 2020-01-15 19:24:39 +05:30
Marica
d973fb8823 fix: Added description and title to supplier selection popup in Material Request (#20181) 
* fix: Added description and title to supplier selection popup in Material Request

* Update material_request.js

cleanup

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2020-01-07 13:04:56 +05:30
Marica
a649414419 fix: Remove unnecessary Duplicate Entry Error (#20122) 2019-12-27 16:53:00 +05:30
rohitwaghchaure
270f23b966 Merge pull request #20080 from nabinhait/rounding-adjustment 
fix: rounding adjustment while both inclusive tax and discount amount present
 2019-12-27 11:52:24 +05:30
Nabin Hait
4d745a39e0 fix: rounding adjustment while both inclusive tax and discount amount present 2019-12-25 13:59:24 +05:30
Don-Leopardo
5e0b5cb283 perf: Asset Depreciations and Balances report (#18455) 2019-12-24 17:35:57 +05:30
Sun Howwrongbum
69358cfd40 feat: consider expiry_date during Batch queries (#19972) 2019-12-24 12:30:20 +05:30
RJPvT
ad1ba2bb76 fix: sc object not loaded (#19892) 
fix for object not loaded and errors in auto-generate :

Traceback (most recent call last):
  File "/home/frappe/frappe-bench/apps/frappe/frappe/utils/background_jobs.py", line 103, in execute_job
    method(**kwargs)
  File "/home/frappe/frappe-bench/apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py", line 141, in refresh_scorecards
    sc.save()
TypeError: 'NoneType' object is not callable
 2019-12-24 12:20:41 +05:30
DeeMysterio
c44abd2f78 fix(employee onboarding): stop showing irrelevant job offer links for a job applicant (#20055) 2019-12-23 19:02:59 +05:30
Deepesh Garg
0bcada8f3c Merge pull request #20016 from marination/valuation_rate_company_v11_hotfix 
fix: Company None not found in get_valuation_rate
 2019-12-20 11:56:24 +05:30
marination
a6b110a7d3 fix: Company None not found in get_valuation_rate 2019-12-19 14:50:17 +05:30
Deepesh Garg
f9297416f2 fix: Append expense account only if expense account exists (#19882) 2019-12-10 12:14:58 +05:30
Nabin Hait
a8d2916e61 Merge branch 'version-11' into version-11-hotfix 2019-12-09 18:08:05 +05:30
Deepesh Garg
0f70f20ec5 Merge pull request #19866 from nextchamp-saqib/ux-fix 
fix: tax templates from all companies fetching in receipt
v11.1.70 		2019-12-09 17:59:44 +05:30
thefalconx33
73d9d8fec9 fix: tax templates from all companies fetching in receipt 2019-12-09 13:59:50 +05:30
Deepesh Garg
c4756e938f fix: Rounding Adjustment GL entry fix (#19840) 
* fix: Rounding Adjustment GL entry fix

* fix: Spacing in tab

* fix: Comment fix
 2019-12-09 13:03:18 +05:30
Deepesh Garg
faa5d90f1b fix: NoneType' object has no attribute '__getitem__' (#19861) 2019-12-09 11:28:38 +05:30
rohitwaghchaure
3b37a109c5 Merge pull request #19852 from rohitwaghchaure/fixed_timesheet_overlap_issue_v11_hotfix 
fix: timesheet overlap error
 2019-12-07 14:10:35 +05:30
Rohit Waghchaure
ab4aa53f52 fix: timesheet overlap error 2019-12-07 13:28:09 +05:30
Nabin Hait
3483426fe7 optimize: Optimization of Receivable report filtered based on sales person (#19795) 2019-12-04 15:30:48 +05:30
Deepesh Garg
3039094737 fix: Party name field in trial balacne for party report (#19791) 2019-12-03 16:30:16 +05:30
Nabin Hait
e21602d432 Update accounts_receivable_summary.py 2019-12-03 16:22:22 +05:30
Marica
6067ef3c49 fix: Item qty cannot be zero in Purchase Receipt (#19781) 2019-12-03 12:45:28 +05:30
Deepesh Garg
b78128a7fe Merge pull request #19767 from deepeshgarg007/avaiable_stock_for_v11 
fix: Available stock for packing item report
 2019-12-02 11:57:07 +05:30
deepeshgarg007
c8cbb87168 fix: Available stock for packing item report 2019-12-01 22:17:46 +05:30
Deepesh Garg
aed8aeb83a fix: Account type in Handling Difference in Inventory account (#19675) 
* fix: Account type in Handling Difference in Inventory account

* fix: Add Stock Adjustment account

* fix: Rename account to stock adjustment
 2019-11-28 18:29:26 +05:30
Saqib
fa47445e11 fix: due date before posting date for items added to cart yesterday (#19680) 2019-11-28 18:27:55 +05:30
Marica
0220acf100 fix: Changed type of column 'serial_no' in Stock Ledger Entry (#19705) 2019-11-28 18:20:57 +05:30
Marica
0fe8f8e6d9 fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19699) 2019-11-27 15:51:12 +05:30
rohitwaghchaure
f87b766a26 Merge pull request #19688 from deepeshgarg007/sales_invoice_serial_no 
fix: Serial no validation against sales invoice
 2019-11-27 11:59:46 +05:30
deepeshgarg007
2262e5d443 fix: Validation msg 2019-11-26 16:15:05 +05:30
deepeshgarg007
b9cad8d891 fix: Serial no validation against sales invoice 2019-11-26 15:27:54 +05:30
Marica
dafdc6035a fix: Validation Error message on Prepared Report. (#19640) 
Give the user the reason why he has to use filters.
 2019-11-22 14:38:53 +05:30
Marica
c8369c10ff fix: Get Current Stock button in Purhase Receipt not working (#19653) 
- Current Stock visible in grid view within Supplied Items table of Purchase Receipt
 2019-11-22 13:33:11 +05:30
Deepesh Garg
08b8ed5ca6 Merge pull request #19635 from ruchamahabal/fix_cash_entry_v11 
fix(minor): default Cash Entry account not getting fetched in Journal Entry (v11)
 2019-11-20 22:02:48 +05:30
Rucha Mahabal
6cefdb40d1 fix(Journal Entry): default Cash Entry account not getting fetched 2019-11-20 20:13:04 +05:30
Rohit Waghchaure
3ad65ec57d fix: code cleanup v11.1.69 2019-11-20 13:24:53 +05:30