CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 17:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,767 Commits 396 Branches 1,698 Tags
version-11
Commit Graph

26767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
927d14e021 fix: merge conflict v11.1.78 2021-06-21 15:48:15 +05:30
Nabin Hait
7bb5313190 bumped to version 11.1.69 2021-06-21 16:04:04 +05:50
Ivan Ray Altomera
1d6bb3953d fix: Customer Ledger Summary report not working on python 3 (#23957) 2021-01-04 11:54:19 +05:30
rohitwaghchaure
78d0a11d09 Merge pull request #23327 from iRaySpace/stock-controller-fix 
fix(stock_controller): precision based on `debit_in_account_currency`
 2020-10-12 17:38:00 +05:30
Ivan Ray Altomera
ccf62886e4 fix(stock_controller): precision based on debit_in_account_currency 2020-09-15 15:36:31 +08:00
rohitwaghchaure
40747e1b49 Merge pull request #22459 from britlog/version-11-hotfix 
fix product_info
 2020-06-26 15:55:24 +05:30
britlog
87f8d66b79 fix product_info 2020-06-25 16:18:58 +02:00
Revant Nandgaonkar
d075399ecd ci: github release action for v11 (#22408) 2020-06-24 10:45:18 +05:30
mergify[bot]
c4ff9c72dd fix:status error in purchase invoice (#22390) 
(cherry picked from commit 8a1f2ed65a)

Co-authored-by: Kenneth Sequeira <seq.kenneth@gmail.com>
 2020-06-23 10:35:18 +05:30
Mangesh-Khairnar
97ccb0eec2 fix: update shopify api version (#22311) 2020-06-18 15:50:16 +05:30
mergify[bot]
2382312d41 fix: fetch tax lines within the shipping lines (#22138) (#22140) 
(cherry picked from commit 3031128167)

Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2020-06-07 18:59:14 +05:30
rohitwaghchaure
348d10cad8 Merge pull request #22078 from rohitwaghchaure/show-disabled-items-stock-balance-v11-hotfix 
fix: show disabled items in the stock balance
 2020-06-02 12:41:24 +05:30
Rohit Waghchaure
47f030b1bf fix: show disabled items in the stock balance 2020-06-02 12:39:51 +05:30
Sahil Khan
7e4f8fa04d Merge branch 'v11-pre-release' into version-11 v11.1.77 2020-06-01 15:39:40 +05:30
Sahil Khan
652181600d bumped to version 11.1.77 2020-06-01 15:59:40 +05:50
Sahil Khan
e4f300c903 Merge branch 'version-11-hotfix' of https://github.com/frappe/erpnext into v11-pre-release 2020-06-01 15:38:31 +05:30
Mangesh-Khairnar
d839c46f10 fix: make transaction date of the oldest transaction as the last integration date (#22015) 
* fix: make transaction date of the oldest transaction as the last integration date

* fix: only save end date when transactions are returned
 2020-05-29 10:16:59 +05:30
Suraj Shetty
6d45dfd6e8 Merge pull request #21217 from gavindsouza/freeze-v11 2020-05-26 11:49:41 +05:30
Sahil Khan
5caa40857d Merge branch 'v11-pre-release' into version-11 v11.1.76 2020-05-21 14:55:08 +05:30
Sahil Khan
78b7f69e0c bumped to version 11.1.76 2020-05-21 15:15:08 +05:50
Sahil Khan
8d9b58d801 Merge branch 'version-11-hotfix' of https://github.com/frappe/erpnext into v11-pre-release 2020-05-21 14:52:13 +05:30
sahil28297
a611cc5916 fix(patch): use translated string while setting notification template (#21680) 2020-05-11 19:28:30 +05:30
sahil28297
c6466c7d97 fix(item): patch to rename duplicate item_code values to name (#21621) 2020-05-07 12:11:42 +05:30
Sahil Khan
b35db7e819 Merge branch 'v11-pre-release' into version-11 v11.1.75 2020-04-22 12:20:15 +05:30
Sahil Khan
44875482ac bumped to version 11.1.75 2020-04-22 12:40:15 +05:50
Sahil Khan
f06cc233a8 Merge branch 'version-11-hotfix' of https://github.com/frappe/erpnext into v11-pre-release 2020-04-22 11:55:01 +05:30
Sun Howwrongbum
fdd93cba03 fix: alter 'other_charges_calculation' to Long Text (#21304) 2020-04-16 22:45:12 +05:30
Gavin D'souza
10f53f04d7 chore: pinned python requirements 
dependencies from pip freeze of version-11 production environment
 2020-04-09 12:26:32 +05:30
Sahil Khan
884dc28af6 Merge branch 'v11-pre-release' into version-11 v11.1.74 2020-03-17 12:12:23 +05:30
Sahil Khan
a506930b63 bumped to version 11.1.74 2020-03-17 12:32:23 +05:50
Sahil Khan
f6836c1d89 Merge branch 'version-11-hotfix' of https://github.com/frappe/erpnext into v11-pre-release 2020-03-17 12:06:42 +05:30
Don-Leopardo
3e2fe12c9d Fix: sql injection (#20816) 2020-03-16 22:36:19 +05:30
Saqib
5b2ca9e133 fix: is_pos gets reset on making s_inv from s_ord (#20888) 
* s_inv has is_pos default set as 1
 2020-03-16 17:50:35 +05:30
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
Sahil Khan
4206b52bdc Merge branch 'v11-pre-release' into version-11 v11.1.73 2020-02-20 18:03:05 +05:30
Sahil Khan
9e66c86d6f bumped to version 11.1.73 2020-02-20 18:23:05 +05:50
Sahil Khan
ec46b4d4c6 Merge branch 'version-11-hotfix' of https://github.com/frappe/erpnext into v11-pre-release 2020-02-20 18:00:23 +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