rohitwaghchaure
5abccc1a61
Merge pull request #21601 from rohitwaghchaure/fix-completed-qty-in-work-order
...
fix: work order operation completed qty
2020-05-11 07:07:28 +05:30
rohitwaghchaure
76dd10f48a
Merge pull request #21652 from rohitwaghchaure/fixed-branch-code-and-swift-number
...
fix: wrong fieldname branch_code in add_fetch
2020-05-11 07:06:42 +05:30
Deepesh Garg
e720882410
Merge pull request #21642 from kevingdc/bugfix/fix-budget-variance-report
...
fix(accounting): fix incorrect output in Budget Variance Report
2020-05-10 17:27:46 +05:30
Deepesh Garg
b81bd5f70c
fix: Formatting fixes
2020-05-10 17:24:11 +05:30
Abhishek Balam
500dff63e7
fix: adjusted width of colums to see full column names, also fixes #21556
2020-05-10 14:53:59 +05:30
Abhishek Balam
5ec5584319
In treeview, bold only for root territory, looks cleaner
2020-05-10 00:24:43 +05:30
Abhishek Balam
7cbc902d90
removed validation for root node in territory, codacy recommended changed
2020-05-09 22:35:28 +05:30
Abhishek Balam
b59f2780eb
fix: renamed view types, added default
2020-05-09 22:09:02 +05:30
Abhishek Balam
d543830a59
feat(Selling): Added Territory wise treeview to 'Customer Acquistion and Loyalty' report
2020-05-09 21:56:53 +05:30
Shivam Mishra
8b31b3ba00
Merge pull request #21667 from surajshetty3416/fix-dashboard
...
fix: Add accidentally removed function
2020-05-09 17:53:46 +05:30
Suraj Shetty
65d3ac814d
fix: Add accidentally removed function
2020-05-09 17:39:59 +05:30
Anupam K
aadf264b49
Assessment Plan not getting created
2020-05-09 16:15:51 +05:30
Suraj Shetty
d53822f012
Merge pull request #21618 from scmmishra/sync-dashboards
2020-05-09 14:15:20 +05:30
Kevin Chan
bc05855805
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-09 16:02:11 +08:00
Deepesh Garg
9b70a0ac18
Merge pull request #21663 from deepeshgarg007/gross_net_profit
...
fix: Gross and net profit report fix
2020-05-08 19:56:58 +05:30
Deepesh Garg
3392e6b80c
fix: User filters instead of hardcoded values
2020-05-08 19:53:09 +05:30
Deepesh Garg
8d9f86f781
fix: Gross and net profit report fix
2020-05-08 19:45:57 +05:30
Anupam K
be6eb201b7
Appending Email and Phone in Child Table
2020-05-08 17:33:21 +05:30
marination
65123d2adc
fix: Item Barcode stays the same after updation.
2020-05-08 16:30:46 +05:30
rohitwaghchaure
8b9574d434
Merge pull request #21657 from rohitwaghchaure/fixed-stock-and-account-value-comparison-report
...
fix: local variable 'lft' referenced before assignment
2020-05-08 15:39:24 +05:30
Rohit Waghchaure
074ea2f882
fix: local variable 'lft' referenced before assignment
2020-05-08 15:33:35 +05:30
Kevin Chan
9d81f97fe6
fix: Tax Withholding Category Description default
...
This commit fixes a bug that happens when a Purchase Invoice uses a
Tax Withholding Category without a category_name. The category_name is
used as the tax description which is a required field. The bug was
fixed by using the Tax Withholding Category's name as the description
if the category_name is empty.
2020-05-08 18:01:18 +08:00
Kevin Chan
e29283630b
fix: Zero threshold in Tax Withholding Category
...
This fixes a bug in Tax Withholding Category where if it has a threshold
of 0, it doesn't apply to Purchase Invoices. The bug was fixed by
updating the condition.
2020-05-08 17:45:08 +08:00
Shivam Mishra
a788ab281e
fix: typo in function name
2020-05-08 15:13:48 +05:30
Shivam Mishra
da41724d9d
feat: save shipping address to woocommerce customer
2020-05-08 15:12:08 +05:30
Rohit Waghchaure
7d4ccdf240
fix: wrong fieldname branch_code in add_fetch
2020-05-08 13:27:25 +05:30
sahil28297
5b1a0fe00e
fix: bump erpnext develop to version 13-dev ( #21651 )
2020-05-08 13:06:50 +05:30
rohitwaghchaure
b29926c913
Merge pull request #21632 from SDLyu/patch-1
...
format: Add address template for Taiwan.
2020-05-08 11:12:36 +05:30
rohitwaghchaure
f0385d0671
Merge pull request #21638 from MyuddinKhatri/lead-update-fix-v13
...
fix(crm): fix lead while updating contact details (develop)
2020-05-08 10:37:11 +05:30
rohitwaghchaure
67c33d1f8b
Merge pull request #21643 from sahil28297/fix_lead_name
...
fix(lead): strip lead_name before splitting
2020-05-08 10:35:48 +05:30
rohitwaghchaure
e74f689ffa
Merge pull request #21644 from anupamvs/lms-label
...
fix: renaming LMS to Learning Management System
2020-05-08 10:29:39 +05:30
rohitwaghchaure
6a9c84b5f6
Merge pull request #21641 from frappe/mergify/bp/develop/pr-21635
...
fix: Job Card submitted qty (bp #21635 )
2020-05-08 10:28:19 +05:30
rohitwaghchaure
02af52fffb
Merge pull request #21612 from anupamvs/social-media-auth
...
fix: fixing callback urls
2020-05-08 10:27:43 +05:30
rohitwaghchaure
b310d6f372
Merge pull request #21649 from anupamvs/payment-order-fix
...
fix: Payment Order not allowing to create Payment Entry
2020-05-08 10:26:42 +05:30
Deepesh Garg
e5b088a20d
Merge pull request #21647 from ruchamahabal/remove-old-analytics
...
fix: delete old appointment analytics tree grid report
2020-05-08 10:22:48 +05:30
Anupam K
8b52697723
Payment Order not allowing to create Payment Entry
2020-05-08 02:23:28 +05:30
Rucha Mahabal
383a94d730
fix: delete old appointment analytics tree grid report
2020-05-07 23:32:53 +05:30
Anupam K
ebf3b78b42
renaming LMS to Learning Management System
2020-05-07 19:20:16 +05:30
Marica
c1a890a739
Merge branch 'develop' into quoted-item-report
2020-05-07 17:45:32 +05:30
marination
31a747b98a
fix: Query enhancement, cleanup, added extra filter
...
- Query changes as requested
- Moved chart generation from js to py
- Added Supplier Multiselect filter
2020-05-07 17:38:00 +05:30
Sahil Khan
b1385f676a
fix(lead): strip lead_name before splitting
2020-05-07 16:47:41 +05:30
Türker Tunalı
2ba89ffd48
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.
(cherry picked from commit 9bd6d119c405f2ace6c93d53647af140c6543542)
2020-05-07 10:51:35 +00:00
Kevin Chan
b3ee6314f9
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-07 18:39:47 +08:00
Deepesh Garg
58f02e7c10
Merge pull request #21639 from deepeshgarg007/loan_unpledge_uutility_fix
...
fix: Loan Security Unpledge fixes
2020-05-07 15:45:32 +05:30
Myuddin khatri
fc0e45d79c
solved merge conflicts
2020-05-07 15:38:20 +05:30
Deepesh Garg
dd340c15de
fix: Loan Security Unpledge fixes
2020-05-07 15:35:54 +05:30
Kevin Chan
52189cba86
style: Improve formatting
...
This commit improves indentations and makes sql queries more readable.
2020-05-07 17:49:32 +08:00
SDLyu
b2eb4ee0f9
Change <br> position
...
Change <br> position for better format
2020-05-07 17:09:17 +08:00
SDLyu
e164985903
Create taiwan.html
2020-05-07 16:49:29 +08:00
sahil28297
c759e17900
fix(item): patch to rename duplicate item_code values to name ( #21622 )
...
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
2020-05-07 12:12:13 +05:30