Saqib
f69da75e33
Merge branch 'version-12-hotfix' into pur-inv-status-fix-v12
2020-05-14 14:27:44 +05:30
Saqib Ansari
12739ec464
fix: invalid conditional statement
2020-05-13 22:03:20 +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
Saqib Ansari
b47f5830f4
fix: purchase inv shows overdue for fraction of outstanding
2020-05-12 14:13:16 +05:30
mergify[bot]
855373a253
fix: Message for missing valuation rate ( #21686 ) ( #21688 )
...
(cherry picked from commit 97715f2877maricadsouza221197@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 85a89812a4nabinhait@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
Sahil Khan
626585e9f3
Merge branch 'v12-pre-release' into version-12
2020-05-08 15:42:18 +05:30
Sahil Khan
5afcc9c185
bumped to version 12.8.0
2020-05-08 16:02:18 +05:50
sahil28297
41ff2cb4a7
chore: correct link to documentation
2020-05-08 15:40:03 +05:30
sahil28297
664f536e9b
chore: correct version for release note
2020-05-08 15:24:23 +05:30
Nabin Hait
923fcc7738
chore: Change log
2020-05-08 15:14:39 +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
sahil28297
9fa952d10e
fix(patch): Reload GSTR 3B report
2020-05-07 19:28:33 +05:30
sahil28297
6d4f451d0d
fix(patch): reload Expense Claim doctype
2020-05-07 19:28:17 +05:30
sahil28297
1c03d154ce
fix(item): patch to rename duplicate item_code values to name ( #21619 )
2020-05-07 19:27:30 +05:30
Nabin Hait
2d430ec077
feat: Income tax slab ( #21631 )
...
* feat: Income tax slab (#21406 )
* Feat: Multiple tax as per new taxation rule
* patch:for multiple tax slab, fix: payroll and exemption validation
* Test: Fixture
* feat: income tax slab with other charges and tax exempted deduction components
* fix: added missing init file
* fix: Patch fixed
* fix: Patch fixed
* fix: test fixes
* fix: validate duplicate exemption declaration
* fix: payment entry test case
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com >
* fix: Income tax slab patch (#21448 )
* fix: reload income_tax_slab_other_charges in patch
* fix: reload lower_deduction_certificate in patch
* fix: Consider any kind of exemptions only if tax exemptions are allowed on tax slab (#21475 )
* fix: Tax calcualtion based on slab (#21497 )
* fix: Desk links for Income Tax Slab and Employee Other Income (#21511 )
* fix: patch
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com >
2020-05-07 18:57:01 +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
