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

23426 Commits

Author SHA1 Message Date
Nabin Hait
337ee0a4bf test: Test case for GLE in subcontracted PR if FG item rate is zero 2020-08-22 20:02:27 +05:30
Nabin Hait
df175cc8fc fix: GLE for subcontracted PR is fg item rate is zero 2020-08-22 19:17:18 +05:30
Nabin Hait
111183d080
fix: Installation failed due to global variable (#23114) 2020-08-22 12:31:06 +05:30
Deepesh Garg
1b760cb278 Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links 2020-08-21 12:36:21 +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
Rucha Mahabal
4061186429 fix: POS page link not visible on Desk 2020-08-20 18:01:20 +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
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
Raffael Meyer
585f1f67b7
Merge branch 'develop' into navbar_links 2020-08-19 18:55:44 +02:00
Raffael Meyer
2c26144a6b
Update erpnext/patches/v13_0/add_standard_navbar_items.py 2020-08-19 18:55:06 +02:00
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
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
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
Glen Whitney
b2604d1f77 fix(General Ledger): include Accounting Dimension columns in report 
Prior to this commit, custom Accounting Dimensions are not
  (by default) shown or even considered in generating a General
  Ledger report. Moreover, as they are not considered, they are
  not used to distinguish GL Entry lines in the same voucher
  with the same Account when the "Group By" value is
  "Group by Voucher (Consolidated)". This situation leads to
  lines with different values for the accounting dimension
  to be ganged together in the General Ledger view of a Journal
  entry, making the entry difficult for an accountant to read.

  This commit alleviates the problem by adding a checkbox
  to control whether Accounting Dimension columns are considered
  in the General Ledger report. When they are considered, they
  are displayed and also included in the key that distinguishes
  lines in the "Group by Voucher (Consolidated)" mode.

  Resolves #23033.
 2020-08-17 20:43:56 +00:00
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
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
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
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
bhavesh95863
a647bef682
fix: warehouse mandatory even update stock uncheck (#23023) 2020-08-13 17:41:55 +05:30
Anurag Mishra
f096ba4998 patch: Old Shift Assignment 2020-08-13 14:18:48 +05:30
Anurag Mishra
c2710e05ce fix: showing on_going shift on calendar 2020-08-13 14:17:47 +05:30
Anurag Mishra
74f0a1ab7c fix: changes Requested 2020-08-13 14:17:47 +05:30
Anurag Mishra
00a8081aba Fix: button label 2020-08-13 14:17:47 +05:30
Anurag Mishra
dcf598dc2d Fix: requested Changes 2020-08-13 14:17:47 +05:30
Anurag Mishra
d5c921e358 Fix: Requested Changes 2020-08-13 14:17:47 +05:30
Anurag Mishra
b48110caf1 Update erpnext/hr/doctype/shift_assignment/shift_assignment.py 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-13 14:17:47 +05:30
Anurag Mishra
3aa1101d5e fix: requested changes 2020-08-13 14:17:47 +05:30
Anurag Mishra
17e6d0918b feat: Employee level Shift Request Approver 2020-08-13 14:17:47 +05:30
Anurag Mishra
43ba7dd4c8 feat: don't allow to request for default shift 2020-08-13 14:17:47 +05:30
Anurag Mishra
feef4a6c1e test: employee checkin 2020-08-13 14:17:47 +05:30
Anurag Mishra
b3e00de0ae refactor: Shift Request 2020-08-13 14:17:47 +05:30
Anurag Mishra
a6ec7e31d2 test: shift assignment 2020-08-13 14:17:47 +05:30
Anurag Mishra
dd46d19765 feat: map event calendar to show ongoing shift assignment and fixed period assigment 2020-08-13 14:17:47 +05:30
Anurag Mishra
afa98bb39b feat: Assign shift for period or create ongoing assignment 2020-08-13 14:17:47 +05:30
marination
8264fcd0a5 fix: Only validate repayment if term loan 2020-08-13 12:47:34 +05:30
marination
6988fbb82d fix: Validate or Set Loan Amount first 2020-08-13 12:17:13 +05:30
Anupam Kumar
e447c79f9d
fix: Quotation lost reason options fix (#22814) 
* adding patch and lost reason child tables

* fix: conflict resolved
 2020-08-13 09:20:36 +05:30
Saqib
c7614174d0
fix: cannot change customer fields if credit exhausted (#22838) 
* fix: cannot change customer fields if credit exhausted

* fix: order based on company

* fix: sort current limits w.r.t company before compare

* fix: CustomerCreditLimit Object is not subscriptable
 2020-08-13 09:18:59 +05:30
Nabin Hait
e2ee455acc fix: Calculate taxes if tax is based on item quantity 2020-08-12 20:58:03 +05:30
Deepesh Garg
21a220e2a5
fix: Update state code and union territory for Daman and Diu (#22988) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-12 19:19:03 +05:30
Rucha Mahabal
cd5821e00a
Merge pull request #23011 from ruchamahabal/fix-asset-maintenance-status 
fix: don't set asset maintenance log status as Overdue when Completed or Cancelled
 2020-08-12 19:17:33 +05:30
Deepesh Garg
617027c6ca Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links 2020-08-12 18:39:20 +05:30
Rucha Mahabal
517a6d0054 fix: set draft indicators for Asset Maintenance Log listview 2020-08-12 18:01:45 +05:30
Rucha Mahabal
691ec1bd27 fix: don't set maintenance log status as Overdue when Completed or Cancelled 2020-08-12 18:01:07 +05:30
Anupam Kumar
674d1b0803
feat: Material Request and Stock Entry Enhancement (#22671) 
* feat: send to warehouse

* adding warehouse validation

* fix: review changes

* fix: review changes

* stock entry enhancement

* fix: review changes
 2020-08-12 17:55:02 +05:30
Rucha Mahabal
e0cc421e50
fix: TypeError while setting transfer_qty in Stock Entry (#22929) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-12 14:33:30 +05:30
Marica
846771cb29
Merge branch 'develop' into item-image-alt 2020-08-12 13:37:19 +05:30
Deepesh Garg
1d5ab618d2
Merge pull request #23001 from nabinhait/inclusive-tax-based-on-item-quantity 
fix: Calculate taxes if tax is based on item quantity and inclusive on item price
 2020-08-11 22:05:02 +05:30
Deepesh Garg
7d0a625b9c
git commit -m "fix: Add missing semicolon" 2020-08-11 22:02:12 +05:30
Nabin Hait
19ea7218d9 fix: Calculate taxes if tax is based on item quantity and inclusive on item price 2020-08-11 20:34:57 +05:30
Shivam Mishra
1679c7af88
Merge branch 'develop' into support-search 2020-08-11 14:54:10 +00:00
Afshan
ba33900712 Merge remote-tracking branch 'upstream/develop' into fix-duplicate-dropdown-PO 2020-08-11 20:17:05 +05:30
Afshan
b5b2586968 fix: referencing frm 2020-08-11 20:15:57 +05:30
Shivam Mishra
2fe5d76fe4
Merge branch 'develop' into item-image-alt 2020-08-11 14:45:55 +00:00
Shivam Mishra
ccdaf3da66
Merge branch 'develop' into fix-margin-for-filter 2020-08-11 14:41:29 +00:00
Deepesh Garg
ca9038feb7
Merge pull request #22998 from abhishekbalam/rename_source_section_opportunity 
fix(CRM): Change 'Source' section name to 'More Information' in Opportunity
 2020-08-11 18:26:09 +05:30
Anurag Mishra
ed6e9550ca
fix: removed payroll from HR. (#22991) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-11 18:04:42 +05:30
Deepesh Garg
2633e292a5 fix: Is Secured Loan check mapping 2020-08-11 18:03:28 +05:30
Abhishek Balam
d0ae92d4bd fix: moved company field, renamed to 'More Information' 2020-08-11 17:39:17 +05:30
prssanna
5a7618d8ec fix: add company in list fields to fetch for Expense Claim 2020-08-11 16:50:31 +05:30
Abhishek Balam
ee5b9c7691
feat(Accounting): Process Statement Of Accounts (#22901) 
* feat: Process Statement Of Accounts initial commit

* fix: add jinja supported inputs for subject and body in email settings

* feat: utils support in template, tested autoemail, fixed issues
 2020-08-11 16:23:47 +05:30
Abhishek Balam
9f6d114265 fix: Change Source section name to 'Company Information' 2020-08-11 16:16:05 +05:30
Anupam Kumar
79d731dcd8
feat: Naming series for Sales/Purchase Return (#22942) 
* feat: adding return naming series

* Update purchase_invoice.json

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-11 16:11:20 +05:30
Deepesh Garg
145b80b11c
Merge pull request #22987 from frappe/fix-company-field 
fix: Consistent capitalization
 2020-08-11 16:09:27 +05:30
Deepesh Garg
2621016884
fix: Allocated advance amount for multi-currency payment (#22923) 
* fix: Allocated advance amount for multicurrency payment

* fix: Get grand total based on party currency

* fix: Remove unwanted code
 2020-08-11 16:06:13 +05:30
Abhishek Balam
ef3b82dae2
fix(CRM): Move Source section above Follow Up section In Opportunity (#22974) 
* fix: move source section above follow up

* fix: only moving source field to 1st section
 2020-08-11 16:05:02 +05:30
Shivam Mishra
3325be1d87
fix: spacing for slideshow (#22996) 2020-08-11 16:03:46 +05:30
Deepesh Garg
285e059394
Merge pull request #22997 from abhishekbalam/set_opportunity_status_to_converted 
fix(CRM): Change Opportunity to 'Converted' when Sales Order is created
 2020-08-11 16:00:16 +05:30
Abhishek Balam
c992616d35 fix: change opportunity to 'Converted' when items not selected in opportunity itself for making quotation and sales order 2020-08-11 15:22:54 +05:30