Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,265 Commits 3 Branches 0 Tags
Commit Graph

31265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rohitwaghchaure
9de26f6648
fix: list index out of range (#21613) 2020-05-07 12:06:47 +05:30
Shivam Mishra
318affedb8 fix: divide by zero error 2020-05-06 20:26:12 +05:30
Shivam Mishra
20a1d375f3 feat: add fixture for project dashboards 2020-05-06 20:26:00 +05:30
Shivam Mishra
41616d4dd8 feat: add name to fixture 2020-05-06 20:21:05 +05:30
marination
4a73bc672b fix: Old buying config update & bar chart on desk 
- Line chart was inapprpriate as the values were not continuous.
 2020-05-06 18:34:07 +05:30
Deepesh Garg
9513171d3f
Merge pull request #21624 from deepeshgarg007/reversse_gl_fix 
fix(minor): Reverse GL fix
 2020-05-06 18:19:19 +05:30
marination
631260b632 chore: Added fixtures and Onboarding. 2020-05-06 18:12:26 +05:30
Deepesh Garg
b821f22b7c fix(minor): Reverse GL fix 2020-05-06 18:12:23 +05:30
Prssanna Desai
d50502ca40
fix: fix get_employee_details query (#21623) 2020-05-06 17:36:48 +05:30
Anurag Mishra
2596c8bbe7
fix: upload attendance (#21620) 2020-05-06 17:06:53 +05:30
Shivam Mishra
8cdcb965c5 feat: added dashboard fixtures for health care 2020-05-06 15:19:22 +05:30
Shivam Mishra
28436d2bc1 feat: added dashboard fixtures for accounts 2020-05-06 15:19:10 +05:30
Shivam Mishra
b2103f5470 feat: remove old fixtures 2020-05-06 15:18:43 +05:30
Deepesh Garg
88e6f72cad
Merge branch 'develop' into sales-report-total-row 2020-05-06 10:48:21 +05:30