CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-31 02:40:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
30,400 Commits 436 Branches 1,728 Tags
be104e5dcfe29ca5253bcb8539fa394e4a00d0ee
Commit Graph

30400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sahil Khan
be104e5dcf bumped to version 12.9.4 2020-06-03 15:30:41 +05:50
sahil28297
051ae36bec Merge pull request #22094 from nextchamp-saqib/asset-error-fix-pre 
fix: cannot create existing assets
 2020-06-03 14:50:21 +05:30
Saqib Ansari
fc975cfc3a fix: cannot create existing assets 2020-06-03 14:48:38 +05:30
Sahil Khan
7aa8eab228 Merge branch 'v12-pre-release' into version-12 v12.9.3 2020-05-25 19:02:37 +05:30
Sahil Khan
70439c9cd8 bumped to version 12.9.3 2020-05-25 19:22:37 +05:50
mergify[bot]
8ddf30201f fix: Item Price and Add to Cart not showing on Website (#21905) (#21916) 
* fix: Item Price and Add to Cart not showing on Website

* fix: Use None as default argument

(cherry picked from commit 4e70ecb97d)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-25 18:38:54 +05:30
sahil28297
1f6c5c295f fix(patch): rerun remove_duplicate_leave_ledger_entries (#21874) 2020-05-22 15:52:46 +05:30
Saurabh
34eb306e39 Merge pull request #21873 from frappe/sahil28297-patch-3 
fix(patch): rerun remove_duplicate_leave_ledger_entries
 2020-05-22 13:48:53 +05:30
sahil28297
439af124f9 fix(patch): rerun remove_duplicate_leave_ledger_entries 2020-05-22 13:42:55 +05:30
Sahil Khan
8abcf42e20 Merge branch 'v12-pre-release' into version-12 v12.9.2 2020-05-22 13:37:26 +05:30
Sahil Khan
485f6cd7a2 bumped to version 12.9.2 2020-05-22 13:57:25 +05:50
Nabin Hait
5447decd9e fix: Remove duplicate leave ledger entry (#21870) 
* fix: Remove duplicate leave ledger entry

* fix: Remove duplicate leave ledger entry
 2020-05-22 13:13:09 +05:30
mergify[bot]
d2491e403b fix: convert goals point to flt (#21840) (#21858) 
(cherry picked from commit 4c779300fd)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-05-22 11:43:14 +05:30
sahil28297
7b795734e8 Merge pull request #21855 from frappe/mergify/bp/v12-pre-release/pr-21846 
fix: set customer and supplier details using sql (bp #21846)
 2020-05-22 11:05:40 +05:30
Chinmay Pai
b6bbd0efcf fix: set customer and supplier details using sql (#21846) 
* fix: set customer and supplier details using sql

instead of slowing down the query with get_doc and save()
we can just use sql to update the required values for
customer and supplier

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove extra quote

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>

* fix: update sql query to include tabPrice List

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
(cherry picked from commit baef43977b)
 2020-05-22 05:29:49 +00:00
Marica
5ec0289d98 fix: Added Inactive serial no status (#21850) 2020-05-22 10:49:07 +05:30
sahil28297
c5921c605f fix(set_serial_no_status): auto commit on many writes (#21841) 2020-05-21 18:46:42 +05:30
Sahil Khan
0c303c4f54 Merge branch 'v12-pre-release' into version-12 v12.9.1 2020-05-21 15:26:42 +05:30
Sahil Khan
746e879187 bumped to version 12.9.1 2020-05-21 15:46:42 +05:50
Suraj Shetty
a24362a83f Merge pull request #21836 from frappe/surajshetty3416-patch-1 2020-05-21 15:25:18 +05:30
Suraj Shetty
69a5a7f11e fix(patch): Handle single value in patch 2020-05-21 15:23:06 +05:30
Sahil Khan
d062a4b6b5 Merge branch 'v12-pre-release' into version-12 v12.9.0 2020-05-21 15:00:37 +05:30
Sahil Khan
ab79a9554b bumped to version 12.9.0 2020-05-21 15:20:37 +05:50
rohitwaghchaure
f5d8d6e4e6 Merge pull request #21830 from marination/italian-invoice-import-pre-release 
fix: Supplier Invoice No not fetched in Import Supplier Invoice
 2020-05-21 14:22:36 +05:30
rohitwaghchaure
fae4805d3f Merge pull request #21826 from marination/pick-list-dn-pre-release 
fix: Fetch customer into Delivery Note from Pick List
 2020-05-21 14:20:31 +05:30
marination
cb74ff870d fix: Supplier Invoice No not fetched in Import Supplier Invoice 2020-05-21 14:06:57 +05:30
marination
3c84ef3b5e fix: Fetch customer into Delivery Note from Pick List 2020-05-21 13:18:06 +05:30
Marica
2894640d56 fix: plc conversion rate set infinitely (#21822) 2020-05-21 12:08:15 +05:30
rohitwaghchaure
a45ff8e3ba Merge pull request #21818 from rohitwaghchaure/tax-template-not-applied-if-valid-from-blank 
fix: item tax template not applied if valid from is blank
 2020-05-21 10:22:37 +05:30
Rohit Waghchaure
74dd64501c fix: item tax template not applied if valid from is blank 2020-05-21 10:09:42 +05:30
Deepesh Garg
bd8b94c9dd Merge pull request #21816 from deepeshgarg007/trial_balance_project_filter_pre 
fix: Project filter in Trial Baalance Report
 2020-05-20 22:28:53 +05:30
Deepesh Garg
d1569b9581 fix: Project filter in Trial Baalance Report 2020-05-20 22:20:23 +05:30
Anupam Kumar
938cde30e3 enable Allow Rename in sales stage (#21803) 2020-05-20 16:14:58 +05:30
Marica
0550b3537d fix: Validate Payment Gateway only if it exists in Payment Request. (#21807) 2020-05-20 16:13:34 +05:30
Deepesh Garg
ea6f08cb26 Merge pull request #21798 from deepeshgarg007/general_ledger_against_voucher_v12_pre 
fix: Against voucher in General Ledger
 2020-05-20 11:32:13 +05:30
Deepesh Garg
96a05f65aa fix: Against voucher in General Ledger 2020-05-20 11:26:14 +05:30
rohitwaghchaure
e85c3a50cd refactor: changed the fieldtype from data to small text (#21789) 2020-05-19 20:30:11 +05:30
Himanshu
8209507a8f fix: add naming series (#21775) 2020-05-19 16:02:41 +05:30
Himanshu
ca5384343f Merge pull request #21773 from scmmishra/issue-form-pre-12 
refactor: use text editor in issue web form
 2020-05-19 15:23:46 +05:30
Shivam Mishra
a4e92cf577 refactor: use text editor in issue web form 2020-05-19 15:12:18 +05:30
Nabin Hait
632c65cd59 chore: Added change log 2020-05-18 19:54:52 +05:30
Nabin Hait
70ab59f473 fix: merge conflict 2020-05-18 17:10:36 +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