nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 16:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,112 Commits 458 Branches 1,746 Tags
e60d7ac09ecf84f14a082b1dfd82e6a653d12aaa
Commit Graph

32112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
aa6280f5cd Merge branch 'version-12-hotfix' into import-italian-invoice 2020-05-28 12:20:35 +05:30
mergify[bot]
64078da47b fix: change description for field (#21995) (#21996) 
grammatical fixes for description of Default Customer

(cherry picked from commit f7beeff2d8)

Co-authored-by: Michelle Alva <50285544+michellealva@users.noreply.github.com>
 2020-05-28 11:10:32 +05:30
Deepesh Garg
d9013dc7c9 Merge pull request #21987 from deepeshgarg007/tds_computation_summary_v12 
fix: TDS computation summary report
 2020-05-27 22:56:36 +05:30
Deepesh Garg
a23f929005 fix: TDS computation summary report 2020-05-27 22:51:36 +05:30
Marica
4f75a3a29b Merge branch 'version-12-hotfix' into import-italian-invoice 2020-05-27 21:53:18 +05:30
marination
d9e6900e07 fix: Added permission via regional setup and patch 2020-05-27 21:53:01 +05:30
Deepesh Garg
b4a3e5f70b fix: Total for ageing column 121-Above (#21973) 2020-05-27 20:30:41 +05:30
Deepesh Garg
aee9a61e0d fix: Post Dated unallocated amount not considered in Advance Amount in AR/AP summary (#21838) 
* fix: Post Dated unallocateed amount not considered in Advance Amount in AR/AP summary report

* fix: Add future payment filter in AR/AP summary

* fix: Show unallocated future payments only till current creation date

* fix: Remove extra query

* fix: Remove debug

* fix: Condition
 2020-05-27 12:46:18 +05:30
Deepesh Garg
ccb8edd7a3 Merge pull request #21941 from deepeshgarg007/acc_dim_report_filter_v12 
fix: Do not add filters in report on accounting dimension creation if it already exists
 2020-05-26 19:41:06 +05:30
Deepesh Garg
bb2bcc8a30 fix: Remove console statement 2020-05-26 19:31:33 +05:30
Deepesh Garg
9720406086 fix: Do not add filters in report on accounting dimension creation if it already exists 2020-05-26 19:31:21 +05:30
mergify[bot]
3c0e22c98c fix: shopify error message on failure of sales order creation (#21924) (#21937) 
(cherry picked from commit 7402451b96)

Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2020-05-26 18:37:25 +05:30
mergify[bot]
f912d78023 fix: check for warehouse in the woocommerce settings (#21925) (#21936) 
(cherry picked from commit ddc170521f)

Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2020-05-26 18:21:31 +05:30
Rohan
61257d829e fix: throw error if no serial numbers are found in Pick List (#21914) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-26 18:11:39 +05:30
Andrew McLeod
c9014b1ba9 fix: website_list_for_contact, fix changed frappe.db.exist keyword argument (#21827) 2020-05-26 18:09:00 +05:30
Anurag Mishra
9ad46f7487 fix: Added column Expired Leave (#21859) 2020-05-26 18:08:08 +05:30
Deepesh Garg
b094178734 fix(UAE): Incorrect VAT rate display in Sales Invoice (#21883) 2020-05-26 18:02:08 +05:30
Anurag Mishra
a3ec869c58 fix: showing Wrong balance on allocation boundary dates (#21908) 2020-05-26 18:00:27 +05:30
mergify[bot]
7177514b0d fix: adding dashboard in course and assessment plan (#21889) (#21919) 
* Adding dashboards

* adding dashboard in course and assessment plan

(cherry picked from commit 0a147d5c76)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2020-05-26 17:59:24 +05:30
marination
277f5273a4 chore: Add Import Supplier Invoice to Menu 2020-05-25 21:49:33 +05:30
Saqib
8ae7bb2bc4 fix: fetch depreciation amount only if depr entry is made (#21894) 2020-05-25 19:20:54 +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
Anurag Mishra
bbec37f713 fix: Validation for dates (#21887) 2020-05-25 18:39:26 +05:30
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
Marica
4e70ecb97d fix: Item Price and Add to Cart not showing on Website (#21905) 
* fix: Item Price and Add to Cart not showing on Website

* fix: Use None as default argument
 2020-05-25 18:26:42 +05:30
rohitwaghchaure
666dd27d42 Merge pull request #21911 from rohitwaghchaure/fixed-comparison-operator 
fix: comparison operator
 2020-05-25 16:39:37 +05:30
Rohit Waghchaure
410196974e fix: comparison operator 2020-05-25 16:38:22 +05:30
Rohan
b9d5c71405 fix: filter batches based on item and warehouse in Pick List (#21778) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-25 15:25:42 +05:30
Vishal Dhayagude
18b3c4802b fix: pound, gram to Ounce converion factor added (#21710) 
* fix: pound, grams to Ounce converion factor added

* fix: patch date updated for UOM Conversion Factor

* fix: grams move to gram

* fix: duplicate entry of uom converion factor and patch added

* fix: typo fix

* fix: minor changes

* Update patches.txt

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-25 15:13:09 +05:30
rohitwaghchaure
cbe476d455 Merge pull request #21900 from rohitwaghchaure/fixed-stock-and-account-value-comparison-report-hotfix 
fix: local variable 'lft' referenced before assignment
 2020-05-25 12:50:50 +05:30
Rohit Waghchaure
b4b6b694af fix: local variable 'lft' referenced before assignment 2020-05-25 12:49:27 +05:30
rohitwaghchaure
aa299d0faf Merge pull request #21868 from rohitwaghchaure/delivery-date-not-allowed-to-change-after-submit 
fix: allow on submit for the delivery date field not working for sale…
 2020-05-25 11:11:11 +05:30
sahil28297
1f6c5c295f fix(patch): rerun remove_duplicate_leave_ledger_entries (#21874) 2020-05-22 15:52:46 +05:30
sahil28297
5d8dafc2ec fix(patch): rerun remove_duplicate_leave_ledger_entries (#21875) 2020-05-22 14:18:08 +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
Nabin Hait
1287f16acd fix: Remove duplicate leave ledger entry (#21867) 2020-05-22 13:13:04 +05:30
Rohit Waghchaure
589c5335d1 fix: allow on submit for the delivery date field not working for sales order 2020-05-22 12:41:07 +05:30
Deepesh Garg
5f82999397 fix: Item tax template not getting mapped from source to traget doc (#21863) 2020-05-22 12:29:19 +05:30
Nabin Hait
115cedb8e9 fix: Remove duplicate leave ledger entry (#21864) 2020-05-22 12:27:19 +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
mergify[bot]
44d6ce49b5 fix: expense account error message in DN (#21851) (#21856) 
Changed error message if expense account not set for item in Delivery Note.
Earlier: Expense or Difference account is mandatory for Item IT - 6 as it impacts overall stock value
After fix: Expense Account not set for Item IT - 6. Please set an Expense Account for the item in the Items table

(cherry picked from commit 1763d3e706)

Co-authored-by: Michelle Alva <50285544+michellealva@users.noreply.github.com>
 2020-05-22 11:06:19 +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
mergify[bot]
7522e598db fix: set customer and supplier details using sql (#21846) (#21854) 
* 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)

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-05-22 10:59:16 +05:30
Marica
5ec0289d98 fix: Added Inactive serial no status (#21850) 2020-05-22 10:49:07 +05:30