nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,197 Commits 402 Branches 1,700 Tags
b384ed74cd9f8bcee83e441340948c8fef569e24
Commit Graph

30197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
b384ed74cd fix: Instate Invoice not appearing in GSTR-1 report 2020-05-19 18:53:08 +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
Saqib
b432f3358e fix: item price not fetching when customer is unset in item price (#21489) 
* fix: item price not fetching when customer is unset in item price

* fix: item price of selling type has hidden supplier value

* fix: remove test variable

* fix: test

* Update erpnext/stock/get_item_details.py

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* patch: invalid customer/supplier based on item price type

* fix: remove patches from develop branch

* fix: patch

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-15 04:25:10 +05:30
Saqib
441bb760ee Merge branch 'version-12-hotfix' into off-pos-tax-template-v12 2020-05-14 14:28:11 +05:30
Marica
6a317a8e78 fix: Add total rows in Report Purchase Order Items to be Received or Billed (#21711) 2020-05-13 18:58:03 +05:30
Saqib Ansari
cb1cc96210 fix: item tax template fetching in offline pos 2020-05-13 16:30:47 +05:30
mergify[bot]
855373a253 fix: Message for missing valuation rate (#21686) (#21688) 
(cherry picked from commit 97715f2877)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-11 21:26:18 +05:30
mergify[bot]
c8ed6b1e79 fix: Run income-tax-slab patch only if slab already exists in payroll period (#21684) (#21687) 
(cherry picked from commit 85a89812a4)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-11 19:29:18 +05:30
sahil28297
00bbc76605 fix(patch): use translated string while setting notification template (#21678) 2020-05-11 19:28:49 +05:30
rohitwaghchaure
0df4f1738c Merge pull request #21602 from anupamvs/lead-customer-issue-hotfix 
fix: adding Email and Phone in Contact child table
 2020-05-11 13:02:41 +05:30
rohitwaghchaure
12a2da49ee Merge pull request #21662 from marination/barcode-update-fix 
fix: Item Barcode stays the same after updation.
 2020-05-11 11:01:13 +05:30
rohitwaghchaure
65d6efdaee Merge pull request #21666 from anupamvs/assessment-issue-hotfix 
fix: Assessment Plan not getting created
 2020-05-11 07:17:28 +05:30
rohitwaghchaure
f861a3e720 Merge pull request #21603 from rohitwaghchaure/fix-completed-qty-in-work-order-hotfix 
fix: work order operation completed qty
 2020-05-11 07:07:16 +05:30
Deepesh Garg
767d17ce2f Merge pull request #21672 from deepeshgarg007/budget_variance_report_v12 
Budget variance report v12
 2020-05-10 17:31:41 +05:30
Deepesh Garg
0f455060ab fix: Formatting fixes 2020-05-10 17:27:29 +05:30
Kevin Chan
861f2726a2 fix: Simplify get_dimension_account_month_map 
This commit updates get_dimension_account_month_map to no longer show
the actual expense when there is no budget. This also removes the other
functions and queries related to it. Spaces are also converted to tabs.
 2020-05-10 17:27:01 +05:30
Kevin Chan
55640be627 fix: Fix Budget Variance Report 
This commit fixes a bug in Budget Variance Report where it combines the
actual expense amounts across different fiscal years. This was fixed by
updating the function and queries for computing the actual expense
amounts.
 2020-05-10 17:26:29 +05:30
Kevin Chan
d837b6cedc style: Improve formatting 
This commit improves indentations and makes sql queries more readable.
 2020-05-10 17:26:16 +05:30
Anupam K
27b2988938 Assessment Plan not getting created 2020-05-09 16:44:36 +05:30
Anupam K
c739c2d355 Appending Email and Phone in Child Table 2020-05-08 17:38:14 +05:30
marination
231f65ff59 fix: Item Barcode stays the same after updation. 2020-05-08 16:43:02 +05:30
rohitwaghchaure
368afc551d Merge pull request #21640 from MyuddinKhatri/lead-update-fix-hotfix 
fix(crm): fix lead while updating contact details (hotfix)
 2020-05-08 10:37:28 +05:30
rohitwaghchaure
3a328b0413 Merge pull request #21645 from anupamvs/lms-label-hotfix 
fix: renaming LMS to Learning Management System
 2020-05-08 10:29:54 +05:30
rohitwaghchaure
970b21075e Merge pull request #21650 from anupamvs/payment-order-hotfix 
fix: Payment Order not allowing to create Payment Entry
 2020-05-08 10:26:55 +05:30
Deepesh Garg
d769a2036b Merge pull request #21648 from ruchamahabal/remove-old-analytics-v12 
fix: delete old appointment analytics tree grid report
 2020-05-08 10:23:46 +05:30
Anupam K
56a3b9abc4 Payment Order not allowing to create Payment Entry 2020-05-08 02:25:09 +05:30
Rucha Mahabal
6844dd75da fix: delete old appointment analytics tree grid report 2020-05-07 23:40:17 +05:30
Anupam K
0b6ef55e78 renaming LMS to Learning Management System 2020-05-07 19:51:46 +05:30
Myuddin khatri
cd0fcfd84c solved merge conflicts 2020-05-07 16:11:08 +05:30
rohitwaghchaure
43118e3551 Merge pull request #21635 from TurkerTunali/patch-3 
fix: Job Card submitted qty
 2020-05-07 16:08:21 +05:30
Türker Tunalı
9bd6d119c4 fix: Job Card submitted qty 
Update Operation Status function in work order was throwing exception without checking the "Overproduction Percentage For Work Order" setting. To submit Job Card qty for more than the Work Order's "To Manufacture Qty" we need to apply this fix.
 2020-05-07 12:38:37 +03:00
sahil28297
2aa045865f fix(item): patch to rename duplicate item_code values to name (#21619) 2020-05-07 12:11:23 +05:30
rohitwaghchaure
ec3a462acd fix: list index out of range (#21614) 2020-05-07 12:06:05 +05:30
Deepesh Garg
a6066009aa Merge pull request #21520 from nextchamp-saqib/sales-report-total-row-v12 
chore: add total row in sales analytics report
 2020-05-06 10:50:53 +05:30
Deepesh Garg
60b19fe935 Merge branch 'version-12-hotfix' into sales-report-total-row-v12 2020-05-06 10:48:38 +05:30
Deepesh Garg
70b52c37d5 Merge pull request #21606 from frappe/sahil28297-patch-1 
fix(patch): reload Expense Claim doctype
 2020-05-05 20:21:23 +05:30
sahil28297
178ad9b4d6 fix(patch): reload Expense Claim doctype 2020-05-05 20:07:48 +05:30
Rohit Waghchaure
b4311a41c5 fix: work order operation completed qty 2020-05-05 16:36:31 +05:30
Anupam K
c6e0dbb1c4 Appending Email and Phone in Child Table 2020-05-05 16:26:05 +05:30
rohitwaghchaure
d476eb79b4 fix: against voucher no not all records showing in case of Group By Voucher (consolidated) (#21591) 2020-05-05 16:17:03 +05:30
Saqib
10ea82001f chore: fix error message (#21594) 
* chore: fix error message

* chore: add row idx
 2020-05-05 16:14:12 +05:30
Saqib
794bb6ebdd fix: handle make_gl_entry in case of cwip enable after puchasing (#21530) 
* fix: handle make_gl_entry in case of cwip enable after puchasing

* fix: invalid variable assignment

* fix: make gl entries if cwip has been booked even if cwip is disabled
* add tests

* fix: conditions

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-05 16:12:10 +05:30
Saqib Ansari
c3a9513978 fix: test 2020-05-04 20:24:30 +05:30
Deepesh Garg
a4a019f9d9 Merge pull request #21584 from frappe/sahil28297-patch-3 
fix(patch): Reload GSTR 3B report
 2020-05-04 19:26:46 +05:30
sahil28297
67ed21d443 fix(patch): Reload GSTR 3B report 2020-05-04 19:23:26 +05:30
rohitwaghchaure
c89d750e5c fix: heatmap not working for customer and supplier (#21579) 2020-05-04 18:53:26 +05:30