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

21221 Commits

Author SHA1 Message Date
Deepesh Garg
d8e57d3d5a
fix: Unable to submit landed cost voucher (#20493) 
* fix: Unable to submit landed cost voucher

* fix: Test case for multiple landed cost voucher against a Purchase receipt

* fix: Test Case
 2020-02-03 18:53:34 +05:30
Anurag Mishra
1f6cc2b6ec
feat: appointment Letter (#20104) 
* feat: appointment Letter

* fix: requested changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-03 17:52:42 +05:30
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view (#20452) 2020-02-03 17:05:26 +05:30
rohitwaghchaure
716a85d81a
Merge pull request #20485 from rohitwaghchaure/source_warehouse_for_the_work_order 
feat: added source warehouse field in the work order
 2020-02-03 16:32:19 +05:30
Himanshu
10b3b79c0f
fix(Report): query report for Quality Action (#20424) 
* fix: query report for QA

* fix: add QM permission

* fix: add QM permission
 2020-02-03 16:16:49 +05:30
Deepesh Garg
9e1fbaf59e
fix: Label and UX fixes while creating payment entry against customer (#20465) 
* fix: Label and UX fixes while creating payment entry against customer

* fix: filter
 2020-02-03 15:58:50 +05:30
Saqib
4fca6cae34
feat: add tax category in pos profile (#20413) 
* feat: add tax category in pos profile

* fix: review fixes
 2020-02-03 15:53:27 +05:30
Deepesh Garg
589f2cd16c
fix: Get only specified company accounts in financial statements (#20486) 2020-02-03 15:49:24 +05:30
Saqib
5e6ce88c78
fix: gst permission for gst settings & hsn code (#20500) 
* fix: gst permission for gst settings & hsn code

* Fix: typo

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-02-03 15:40:35 +05:30
Frappe PR Bot
ba0712a429
feat: Updated translation (#20490) 2020-02-03 14:58:03 +05:30
Frappe PR Bot
1478282920
feat: Updated translation (#20499) 2020-02-03 14:57:43 +05:30
0Pranav
9c4399e1f2 fix: better syntax for checking empty arrays 2020-02-03 14:57:42 +05:30
Deepesh Garg
943de261bb
Merge pull request #20505 from deepeshgarg007/button_shift 
fix: Move E-Way bill button under create
 2020-02-03 14:50:54 +05:30
Deepesh Garg
cce3ac9f79 fix: Move E-Way bill button under create 2020-02-02 21:25:58 +05:30
Deepesh Garg
c3f28db5b7
Merge pull request #20475 from ParthKharwar/dev-work-from-home-application 
feat: request for work from home marked in attendance
 2020-02-01 19:06:40 +05:30
Parth Kharwar
823964f3a6 fix: test added to check work from home application 2020-01-31 14:30:38 +05:30
rohitwaghchaure
ffa74ad5c1
Merge pull request #20478 from deepeshgarg007/finance-book-filter-new 
fix: Do not show any finance book record if no finance book filter is applied
 2020-01-31 13:19:16 +05:30
Rohit Waghchaure
adbe291498 feat: added source warehouse field in the work order 2020-01-31 13:09:06 +05:30
Deepesh Garg
34c33baa82 fix: Cash flow filter fix 2020-01-31 11:16:30 +05:30
0Pranav
b1473c3de0 fix: return empty array 2020-01-31 10:43:00 +05:30
0Pranav
75adb808e5 various fixes from review 
- Rename the report to title case
- Added company filter
- fixed checks in filter and += operator for total
 2020-01-31 10:35:47 +05:30
Deepesh Garg
ba44f28202 fix: Filtering fixes in financial statement 2020-01-31 09:08:29 +05:30
Deepesh Garg
ce04526db8 fix: Do not show any finance book record if no finance book filter is applied 2020-01-30 15:33:51 +05:30
Suraj Shetty
0860865763
Merge branch 'develop' into fix-incorrect-translations 2020-01-30 15:12:33 +05:30
Parth Kharwar
5342c846d2 feat: request for work from home marked in attendance 2020-01-30 13:12:56 +05:30
Faris Ansari
8e131c7cad
fix: Remove translated strings from test 2020-01-30 13:03:05 +05:30
Parth Kharwar
2bccd7f717 fix: rename breadcrumb for Brand DocType from Selling to Stock 2020-01-30 12:12:42 +05:30
Suraj Shetty
082020184a Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-30 10:46:11 +05:30
Deepesh Garg
d89fbc56d9
Merge pull request #20464 from Alchez/dev-wfh 
feat(hr): add work from home option in status
 2020-01-29 20:12:40 +05:30
Diksha
480d52c6f3 feat(attendance): add work from home option in status 2020-01-29 17:46:27 +05:30
Suraj Shetty
da2c69e836 fix(translations): Incorrect syntax 2020-01-29 15:34:06 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Pranav Nachnekar
d64135b2d2
fix: linking party in calendar event of appointment (#20458) 2020-01-29 13:01:25 +05:30
Deepesh Garg
47ba65edc0
Merge pull request #20459 from 0Pranav/fix-supplier-quotation-button 
fix: missing plus button in request for quotaion for supplier quotation
 2020-01-29 10:46:21 +05:30
Deepesh Garg
565a810bf7
Merge pull request #20454 from marination/stock-ledger-qty-column 
fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger
 2020-01-29 09:49:55 +05:30
Deepesh Garg
b61b8d7ced
fix: Remove comma 2020-01-29 09:49:26 +05:30
0Pranav
d4c0184f3f fix: missing plus button in request for quotaion for supplier quotation 2020-01-29 09:32:40 +05:30
Deepesh Garg
217517a61f
Merge pull request #20455 from toxnico/develop 
fix: french translation correction
 2020-01-29 08:39:38 +05:30
Pranav Nachnekar
c1312700e8 feat: create appoitnemnt against customer (#20457) 2020-01-28 17:50:47 +05:30
Nicolas Simonnet
10ffaf4e89 french translation correction 2020-01-28 11:45:57 +01:00
marination
372c5e51d5 fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger 2020-01-28 16:04:49 +05:30
rohitwaghchaure
da9a3936e1 fix: incorrect work order qty for sub assembly items (#20449) 2020-01-28 14:34:27 +05:30
Nabin Hait
2bb3a62b1a
fix: cannot complete task if dependent task are not completed / cancelled (#20437) 2020-01-28 14:08:53 +05:30
Deepesh Garg
cd8d667861 fix: Parent company defaulting on creation of new company (#20422) 
* fix: Parent company defaulting on creation of new company

* fix: Test Cases

* fix: Test Cases

* fix: Test Cases for staffing plan
 2020-01-28 12:54:45 +05:30
Pranav Nachnekar
3fb48ebf61 fix: discounting not applied on sales invoice created by subscriptions (#20431) 2020-01-28 12:52:13 +05:30
Marica
4e7625bd8f fix: Column 'project' in where clause is ambiguous (#20438) 
* fix: Column 'project' in where clause is ambiguous

* fix: Fixed alias in query
 2020-01-28 12:43:38 +05:30
Deepesh Garg
0c31d62edd
Merge pull request #20447 from Alchez/dev-driver-address-fetch 
fix: only fetch driver address if not set (develop)
 2020-01-28 09:20:26 +05:30
Don-Leopardo
f6d5073832
Merge branch 'develop' into fix_sqlinjection_develop 2020-01-27 13:56:01 -03:00
rohitwaghchaure
7fda3a12cc
Merge pull request #20445 from rohitwaghchaure/copy_to_warehouse_to_target_warehouse_in_delivery_note_item 
fix: to warehouse not set in the customer warehouse
 2020-01-27 19:29:19 +05:30
Rohan Bansal
ce17a546b9 fix: only fetch driver address if not set 2020-01-27 18:08:11 +05:30
Rohit Waghchaure
2dff28498f fix: to warehouse not set in the customer warehouse 2020-01-27 17:56:25 +05:30
NahuelOperto
be1895fd08 Fix sql injection 2020-01-27 09:02:02 -03:00
Saqib
e009187e02 refac: filters and columns of fixed asset register report (#20332) 2020-01-27 16:05:55 +05:30
Parth J. Kharwar
011c13b3cc fix: employee checkin doctype time permissions (#20403) 2020-01-27 16:03:24 +05:30
Shivam Mishra
149b4e5985 chore: warn bom naming conflict (#20244) 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-01-27 15:20:30 +05:30
Deepesh Garg
ef41a0eda5 fix: Finance book filtering in financial statements (#20410) 
* fix: Finance book filtering in financial statements

* fix: Use IS NULL instead of ifnull
 2020-01-27 15:18:51 +05:30
Saqib
9cb02bf2e1 fix: incorrect status for fraction of outstanding amount (#20369) 2020-01-27 14:22:43 +05:30
Himanshu Warekar
e169d2964c fix: change fieldtype to Text 2020-01-24 17:40:29 +05:30
Saqib
9291df4d4c fix: wrong outstanding invoices fetched against employee (#20373) 2020-01-24 16:22:49 +05:30
Anurag Mishra
ce00f6cf70 fix: Duplicate Attendance Due Wrong Date format (#20390) 2020-01-24 16:14:50 +05:30
Rucha Mahabal
0a27c98a99 fix(Healthcare): disabled Lab Test Template shown as Enabled in List View (#20378) 
* fix (Healthcare): disabled Lab Test Template shown as enabled in List View

* fix: remove custom disabled button and unhide disabled field
 2020-01-24 16:12:08 +05:30
Marica
40dffab79e fix: Product Page non-stock item status (#20383) 2020-01-24 15:52:27 +05:30
Rucha Mahabal
72c3dd1d11 fix: healthcare settings registration fee NoneType error (#20395) 2020-01-24 15:50:44 +05:30
Frappe PR Bot
84afdfdb4c feat: Updated translation (#20404) 2020-01-24 14:21:53 +05:30
rohitwaghchaure
573de02f60
Merge pull request #20398 from rohitwaghchaure/fixed_serial_no_button_not_working_develop 
fix: add serial no button not working
 2020-01-24 13:49:41 +05:30
Deepesh Garg
60e8d52f32
Merge pull request #20401 from deepeshgarg007/general_ledger_sort 
fix: Order GL entries by creation time in General ledger
 2020-01-24 13:19:39 +05:30
Deepesh Garg
1e77a1374d
Merge pull request #20393 from rohitwaghchaure/unlink_reference_name_from_batch_on_cancel_of_stock_transactions_develop 
fix: unlink references from batch on cancellation of stock transactions
 2020-01-23 22:40:26 +05:30
Rohit Waghchaure
8996b7d8a4 delete the auto created batch 2020-01-23 17:44:19 +05:30
deepeshgarg007
fdba26d476 fix: Order GL entries by creation time in General ledger 2020-01-23 17:42:57 +05:30
Rohit Waghchaure
067e8ad50d fix: add serial no button not working 2020-01-23 15:49:39 +05:30
Deepesh Garg
f2d3bd71c9
Merge pull request #20356 from abhijitkumbharInd/develop 
fix: Gives a 404 error when clicked on the Download Required Material…
 2020-01-23 15:45:42 +05:30
Deepesh Garg
1d279c30bb
Merge pull request #20386 from rohitwaghchaure/fixed_lead_date_comparision_issue_develop 
fix: lead date comparison issue
 2020-01-23 15:22:53 +05:30
Deepesh Garg
b83f5cee6c
Merge pull request #20388 from rohitwaghchaure/lead_showing_two_times_in_the_report_develop 
fix: lead details duplicate entries
 2020-01-23 15:20:47 +05:30
Deepesh Garg
32be74e40d
Merge pull request #20381 from nextchamp-saqib/small-fix-asset 
fix: tuple index out of range error
 2020-01-23 15:03:00 +05:30
Rohit Waghchaure
4f4dbf1996 fix: unlink references from batch on cacnellation of stock transactions 2020-01-23 12:45:45 +05:30
Rohit Waghchaure
0251e33f31 fix: lead details duplicate entries 2020-01-22 16:59:36 +05:30
Rohit Waghchaure
7b8e1e0891 fix: lead date comparison issue 2020-01-22 16:36:14 +05:30
thefalconx33
e7154f155b fix: tuple index out of range error 2020-01-22 12:22:55 +05:30
Rohit Waghchaure
0cc4cf2cf5 fix: Zero division error while making finished good entry against the work order 2020-01-21 19:28:08 +05:30
abhijitkumbharIND
0eb6f06685 fix: Gives a 404 error when clicked on the Download Required Material button while the form is not saved (#20355) 2020-01-21 19:16:32 +05:30
abhijitkumbharIND
b2f08a7a42 fix: Gives a 404 error when clicked on the Download Required Material button while the form is not saved (#20355) 2020-01-21 19:16:32 +05:30
byugandhara
239f0d529e Fix: Spelling correction in throw message of stock entry(#20337) (#20353) 2020-01-21 15:47:27 +05:30
rohitwaghchaure
5056c8bcb4 fix: not able to import chart of account if parent account is missing (#20368) 2020-01-21 15:32:26 +05:30
Saqib
eea0ffcb38 fix: account not added to child company (#20361) 2020-01-21 15:25:51 +05:30
Nabin Hait
50cb49cb00
fix: Don't fetch price list rate on change of qty (#20363) 2020-01-21 13:04:21 +05:30
KanchanChauhan
a7d1985b5f fix: Set Quotation expired if not Ordered or Lost (#20354) 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-01-21 12:35:11 +05:30
Anurag Mishra
85e5ba9698
Merge branch 'develop' into fix-remaining-leave-balance-calculation 2020-01-20 19:41:33 +05:30
Mangesh-Khairnar
2892a3b067 fix: nonetype issue in the total leaves calculation 2020-01-20 18:02:23 +05:30
rohitwaghchaure
6ae61a1693 fix: incorrect number of gl entries issue (#20352) 2020-01-20 17:53:19 +05:30
Marica
7653a8b9fa fix: 'get_additonal_costs' is not defined (#20344) 
* fix: 'get_additonal_costs' is not defined

* fix: Re-added get_items on Work order change.
 2020-01-20 15:46:36 +05:30
Nabin Hait
03b116dd01
fix: deprecated fetching item price based on min_qty (#20347) 2020-01-20 15:45:04 +05:30
Mangesh-Khairnar
2ac8473abf fix: calculate remaining leave balance 2020-01-17 22:46:26 +05:30
Nabin Hait
444156184c
fix: Plaid TypeError in add_bank_accounts (#20335) 2020-01-17 15:57:48 +05:30
Jigar Tarpara
f5374c182e Bug Fix (#20330) 
* Bug Fix

auto_close_after_days field is in Selling Settings

* fix: close_opportunity_after_days field is in selling settings

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-01-17 11:54:25 +05:30
Parth Kharwar
0a581c096b chore: changed employee contact field name 2020-01-17 11:50:35 +05:30
Rohan
ef734ee850 fix: handle default value for batch size in BOM operation (#20328) 2020-01-17 11:45:54 +05:30
Vishal Dhayagude
2ae87876b6 fix: salary structure assignment filter employee based on company (#20318) 
* fix: pick company from employee salary structure

* fix: Salary structure assignment fetch company from enmployee

* Revert "fix: Salary structure assignment fetch company from enmployee"

This reverts commit ab2da691c79646d6d095f347ea3e273f466ee34f.

* fix: Salary structure assignment fetch company from enmployee

* fix: filter on company for salary structure assignment

* fix: minor changes

* fix: minor changes

* fix: added company to salary strucutre assignment
 2020-01-17 11:44:11 +05:30
Himanshu
e3afe8a73c fix: don't hide primary_address_and_contact_detail (#20322) 2020-01-16 13:39:29 +05:30
Saqib
bcb6130bbe fix: hide total amount field from journal entry PF (#20324) 2020-01-16 13:38:43 +05:30