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

32332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suraj Shetty
ecc7eedd10 fix: Update erpnext logo 2020-08-23 16:35:39 +05:30
Suraj Shetty
6f9f40992c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-23 16:33:50 +05:30
Nabin Hait
111183d080
fix: Installation failed due to global variable (#23114) 2020-08-22 12:31:06 +05:30
Saurabh
66ff5e5e77
Merge pull request #22990 from saurabh6790/erpnext-before-install-flag-1 
fix: check setup complete flag instead setup page
 2020-08-21 11:55:38 +05:30
Nabin Hait
1ba62c9732
fix:Validate Job offer against vacancies (#23109) 2020-08-20 19:39:10 +05:30
Deepesh Garg
cf3e482052
Merge pull request #23105 from deepeshgarg007/rcm_submit_v13 
fix: Unable to submit reverse charge invoice
 2020-08-20 19:35:25 +05:30
Marica
c23797e350
fix: Create Opportunity without Default Company from Email (#23097) 
* fix: Create Opoortunity without Default Company from Email

* fix: Add Prompt to Select Company

* Update communication.js

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-20 19:12:12 +05:30
Deepesh Garg
afd2dd3570 fix: Unable to submit reverse charge invoice 2020-08-20 16:52:52 +05:30
rohitwaghchaure
019d4debb2
fix: incorrect stock value in return case (#23102) 2020-08-20 15:53:58 +05:30
Shivam Mishra
ae9208dc87
Merge pull request #22995 from scmmishra/fix-margin-for-filter 2020-08-20 09:28:15 +00:00
Shivam Mishra
25ba271562
Merge branch 'develop' into fix-margin-for-filter 2020-08-20 08:59:04 +00:00
rohitwaghchaure
5f2463933a
Merge pull request #23061 from DeeMysterio/dev-sort-warehouses-qty 
feat(queries): sort warehouses based on item quantity in descending manner
 2020-08-20 09:36:16 +05:30
Deepesh Garg
cbedb3de3a
Merge pull request #23089 from deepeshgarg007/rcm_deduction_v13 
fix: Do not update total for RCM invoices if net taxes are zero
 2020-08-19 20:19:06 +05:30
Rucha Mahabal
3fb40aa0b2
Merge pull request #23075 from ruchamahabal/fix-pos-print 
fix: Print Language for Customer not set for POS Invoice
 2020-08-19 19:02:02 +05:30
Deepesh Garg
8aed48fe31 fix: Do not update total for RCM invvoices if net taxes are zero 2020-08-19 18:59:27 +05:30
Rucha Mahabal
eed2a6340c
Merge branch 'develop' into fix-pos-print 2020-08-19 18:57:47 +05:30
Diksha Jadhav
182ee5e7c1 feat(queries): sort warehouses based on item quantity 2020-08-19 14:04:34 +05:30
Deepesh Garg
1fb1c08872
Merge pull request #23076 from deepeshgarg007/hsn_wise_outward_v13 
fix: Tax amounts in HSN Wise Outward summary
 2020-08-19 11:43:14 +05:30
Deepesh Garg
b240cfe401 fix: Remove print statements 2020-08-19 11:41:43 +05:30
Deepesh Garg
64ebbf0907 fix: Tax amounts in HSN Wise Outward summary 2020-08-19 11:41:33 +05:30
Rucha Mahabal
434bab8003 fix: Print Language for Customer not set for Print Receipt in POS 2020-08-19 01:00:59 +05:30
Deepesh Garg
1c14606c06
fix: Total calculations for multicurrency RCM invoices (#23072) 2020-08-18 19:32:52 +05:30
Deepesh Garg
9d60e48538
Merge pull request #23067 from rohitwaghchaure/profit-and-loss-report-not-working 
fix: profit and loss report not working
 2020-08-18 17:03:10 +05:30
Rohit Waghchaure
310ade7282 profit and loss report not working 2020-08-18 16:07:24 +05:30
Marica
bfb7bdff85
Merge pull request #22262 from Anurag810/shift_management 
refactor: shift management
 2020-08-18 14:12:25 +05:30
Marica
2d767debf1
Merge branch 'develop' into shift_management 2020-08-18 13:27:15 +05:30
Michelle Alva
849b712770
fix: Change spelling of "Successful" (#23063) 
Before: 
Import Successfull

After:
Import Successful
 2020-08-18 12:06:46 +05:30
Rucha Mahabal
035907a24f
fix: remove Request for Quotation link from Fiscal Year dashboard (#23040) 2020-08-18 10:57:10 +05:30
Deepesh Garg
38cabbd4b8
Merge pull request #23007 from prssanna/expense-claim-list-currency 
fix: add company in list fields to fetch for Expense Claim
 2020-08-17 23:07:51 +05:30
Deepesh Garg
aef5c4cb64
Merge pull request #23044 from frappe/sales-analytics 
fix: Remove dependency of Sales Order in Sales Analytics
 2020-08-17 23:00:49 +05:30
Marica
11a167f8bb
Merge branch 'develop' into shift_management 2020-08-17 16:39:27 +05:30
Anurag Mishra
df7b428331
fix: UI/UX Salary details and salary slip form cleanup (#22536) 
* fix: UI/UX Salary details

* feat: salary slip form cleaup

* fix(test): set working days zero if salary slip is based on timesheet

* fix(revert): set working days zero if salary slip is based on timesheet

* fix: salary slip form cleanup

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-17 14:09:54 +05:30
Marica
39c97bfbe9
Merge branch 'develop' into shift_management 2020-08-17 13:46:51 +05:30
Anurag Mishra
13be09e883
Update update_start_end_date_for_old_shift_assignment.py 2020-08-17 13:43:33 +05:30
Afshan
084de5f0b2
fix: handled condition if staffing isn't created (#22992) 
* fix: handled condition if staffing isn't created

* style: reformated code for redability

* Update erpnext/hr/doctype/job_offer/job_offer.py

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-17 13:14:09 +05:30
Afshan
5b45961b9d
fix: the JSON object must be str, bytes or bytearray, not "list" (#23047) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-17 10:51:53 +05:30
Deepesh Garg
e9b229c246
Merge pull request #23049 from deepeshgarg007/loan_top_up_fixes 
feat: Enhancement in Loan Topups
 2020-08-16 22:52:48 +05:30
Deepesh Garg
e1e847a3f7 feat: Enhancement in Loan Topups 2020-08-16 20:57:39 +05:30
Deepesh Garg
a2249e013d Merge branch 'develop' of https://github.com/frappe/erpnext into loan_top_up_fixes 2020-08-15 18:28:04 +05:30
michellealva
e69b2e0da1 fix: Remove dependency of Sales Order in Sales Analytics 2020-08-15 10:16:26 +05:30
Shivam Mishra
2da23ba051
Merge pull request #22447 from scmmishra/support-search 
feat: added search to support page
 2020-08-14 14:01:17 +00:00
Shivam Mishra
736aee886e
Merge branch 'develop' into support-search 2020-08-14 13:36:59 +00:00
Rucha Mahabal
5fb0e7184e
fix: list index out of range error while setting POS payment mode (#23018) 2020-08-14 17:11:39 +05:30
Suraj Shetty
404afb823f
Merge pull request #22723 from Anurag810/HR-fix 2020-08-14 16:43:28 +05:30
Suraj Shetty
cab5918244
Merge branch 'develop' into HR-fix 2020-08-14 16:12:28 +05:30
Anurag Mishra
759632c025 fix: requested Changes 2020-08-14 12:26:04 +05:30
Anurag Mishra
6f1579da1f
Merge branch 'develop' into shift_management 2020-08-14 12:11:41 +05:30
Deepesh Garg
8ca57eb5dd
Merge pull request #23022 from marination/loan-amount 
fix: Validate or Set Loan Amount first
 2020-08-13 19:53:09 +05:30
Afshan
d7d92c520e
fix: removed code relating to standard working hours (#23009) 2020-08-13 19:40:09 +05:30
Deepesh Garg
1151f888ba fix: Set pledge amount before setting loan amount 2020-08-13 18:52:23 +05:30