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

17109 Commits

Author SHA1 Message Date
Nabin Hait
4df7679c65 fix: Get outstanding invoices 2019-02-15 13:08:04 +05:30
Sagar Vora
ebdd8a9710
Merge branch 'hotfix' into purchase-fix 2019-02-15 13:04:32 +05:30
Sagar Vora
921f468950
Merge branch 'hotfix' into get-item-details 2019-02-15 13:03:04 +05:30
Nabin Hait
6f7a4d94ce fix: Consider parenttype while updating total qty in transactions 2019-02-14 19:34:43 +05:30
Nabin Hait
f66c6874ca
Merge pull request #16652 from nabinhait/work-order-fix 
fix: Make work order from production plan considering already ordered qty
 2019-02-14 18:50:30 +05:30
Nabin Hait
54f8ed1282
Merge branch 'hotfix' into item-variants 2019-02-14 18:50:11 +05:30
Nabin Hait
c3698e458f
Merge pull request #16666 from nabinhait/deferred-revenue-fix 
fix: errors in deferred revenue booking
 2019-02-14 18:49:01 +05:30
Nabin Hait
1c6a1dd5c0
Merge branch 'hotfix' into general-ledger-fix 2019-02-14 18:37:40 +05:30
Nabin Hait
0d1ccc357f fix: get item details 2019-02-14 18:30:10 +05:30
deepeshgarg007
867ca63750 fix: Purchase order item description fix 2019-02-14 18:10:47 +05:30
Deepesh Garg
20008946a3
Merge branch 'hotfix' into address-rep-fix 2019-02-14 17:37:41 +05:30
Deepesh Garg
4902f7b2a0 fix: Show tasks in timesheet with status as Closed (#16660) 2019-02-14 17:32:52 +05:30
deepeshgarg007
34f4f24e21 fix: Address and contact report 2019-02-14 17:26:49 +05:30
Nabin Hait
29fcb14c42 fix: errors in deferred revenue booking 2019-02-13 17:18:12 +05:30
Deepesh Garg
4d1bc0ca85 fix: Add total row in analytics report (#16648) 2019-02-13 16:58:46 +05:30
Faris Ansari
a748ca69e7 fix: Validate invalid fields in Item Variant Settings 
- Some fields like barcodes cannot be copied in Item Variants
- Wrote a patch that deletes the fields if they exist
- Also, validate in controller
 2019-02-13 13:02:39 +05:30
rohitwaghchaure
a0aaeafae8
Merge pull request #16644 from rohitwaghchaure/fix_work_order_time_log_msg 
fix: validation message for work order
 2019-02-13 09:49:25 +05:30
Faris Ansari
795102125c
Merge branch 'hotfix' into fix-barcode-scanning-ux 2019-02-12 18:31:06 +05:30
Nabin Hait
db527bfb24 fix: Enqueued item variants updation if there are more than 30 variants 2019-02-12 18:30:00 +05:30
Nabin Hait
1a3c27bbea fix: Make work order from production plan considering already ordered qty 2019-02-12 17:38:37 +05:30
Faris Ansari
5631ffca68 fix: Barcode scanning UX 2019-02-12 17:12:48 +05:30
Sagar Vora
551f52fd25 Merge branch 'master' into develop 2019-02-12 16:41:24 +05:30
Nabin Hait
6447069e50 fix: show values in account/party currency based in actual entry, no conversion 2019-02-12 16:41:20 +05:30
Sagar Vora
6837ae3377 bumped to version 11.1.5 2019-02-12 16:54:29 +05:50
karthikeyan5
4324dc6ea8 fix(marketplace): fixing hubmarket server specific error 2019-02-12 15:12:23 +05:30
karthikeyan5
4df6003bd9 feat(marketplace): seller profile page 2019-02-12 15:12:23 +05:30
karthikeyan5
2894f7935a feat(marketplace): featured Items for sellers 2019-02-12 15:12:23 +05:30
karthikeyan5
88baf53cc1 feat(marketplace): navigation link to seller profile from item page 2019-02-12 15:12:23 +05:30
Nabin Hait
fdefbdb23b
Merge pull request #16609 from nabinhait/multipel_fixes 
Multiple fixes
 2019-02-12 13:56:06 +05:30
Prateeksha Singh
426468183f fix(getting_started): main domain specific masters 2019-02-12 13:08:21 +05:30
Nabin Hait
c46d995480
Merge pull request #16628 from Zlash65/fix-noti-patch 
fix: Notification Control delete
 2019-02-12 13:04:45 +05:30
Nabin Hait
e6abee4bd5
Merge pull request #16643 from Zlash65/field-fix 
fix: Fieldtype and Fetch From fixes
 2019-02-12 13:04:00 +05:30
Nabin Hait
ca536efe7b
Merge pull request #16640 from nabinhait/pur_reg_fix 
fix: show project even if PI is directly created
 2019-02-12 13:01:18 +05:30
Deepesh Garg
da7c20e474 fix: Validate task dates in project (#16586) 
* fix: Validate task dates in project

* fix: Test case fix and validation only if date exists

* fix: Added dates in error messages
 2019-02-12 12:55:50 +05:30
Rohit Waghchaure
e0412a177c fix: validation message for work order 2019-02-12 11:47:16 +05:30
Zlash65
fc88029d7d fix: fix item field for clinical procedure template 2019-02-12 11:38:27 +05:30
Zlash65
b614fb1d45 fix: make finance book field as link field and rectify fetch_from 2019-02-12 11:30:58 +05:30
Nabin Hait
afef9c1cc7 fix: Ignore tds account while creating tax withholding category 2019-02-12 11:28:20 +05:30
Zlash65
fd3998cfc9 fix: make branch as link field 2019-02-12 11:27:23 +05:30
Prateeksha Singh
9adad2988d feat(getting_started): Minimum requirements to setup 2019-02-12 08:37:53 +05:30
Prateeksha Singh
08a6de6b41 fix(modules): shorten descriptions 2019-02-12 07:41:52 +05:30
Nabin Hait
ab50211e18 fix: show project even if PI is directly created 2019-02-11 18:25:18 +05:30
sahil28297
1a7e438fb2 fix(pstch): allow duplicate entries (#16632) 2019-02-11 15:53:04 +05:30
Prateeksha Singh
9d4a183074 fix(modules): Merge Settings into one, Setup --> Settings 2019-02-11 15:14:50 +05:30
rohitwaghchaure
d95c8cfac3
Merge pull request #16621 from netchampfaris/fix-warehouse-currency 
fix: Set company_currency for Warehouse Tree
 2019-02-11 14:58:02 +05:30
Prateeksha Singh
01a045a488 feat(modules): Add getting started and help desk 2019-02-11 14:01:04 +05:30
Zlash65
a206f06af9 delete notification control's docctype entry 2019-02-11 12:01:01 +05:30
Nabin Hait
bb6438af5a
Merge pull request #16537 from nabinhait/stock-balance-fix 
fix: Fixed error on stock balance report
 2019-02-11 11:00:01 +05:30
Rushabh Mehta
c8018bdeb1 fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891 2019-02-09 21:10:29 +05:30
Faris Ansari
453964728d fix: Set company_currency for Warehouse Tree 2019-02-09 20:27:42 +05:30
Nabin Hait
17e0513270 fix: message if stock reco is enqueued 2019-02-08 16:56:26 +05:30
Nabin Hait
8d4bb3e327 fix: backflush only if transferred item is present in work order 2019-02-08 16:56:26 +05:30
Nabin Hait
450fe309d6 fix: allow updating title of material request 2019-02-08 16:56:26 +05:30
Nabin Hait
e3b0f4f9f6 fix: removed account type filter on employee advance account 2019-02-08 16:56:26 +05:30
Nabin Hait
27af6b377f fix: defered accounting fixes 2019-02-08 16:56:26 +05:30
Jay Parikh
1906f6da3a Fix - POS >> Item listing after submit pos >> list all the items which are not restricted to that pos profile #16588 2019-02-08 11:13:09 +00:00
Aditya Hase
e53a6a6723
Merge branch 'develop' into fix-py3 2019-02-08 12:51:05 +05:30
Nabin Hait
208ce5dcea fix: removed module type for learn 2019-02-08 12:25:30 +05:30
Aditya Hase
13808b4cc9 fix(py3): Convert to float before comparison 2019-02-08 12:03:25 +05:30
Aditya Hase
2a3c39f38a fix(py3): Convert dict.values() to list for indexing 2019-02-08 12:02:57 +05:30
Aditya Hase
46d7456782 fix(py3): Convert list to filter for indexing 2019-02-08 12:02:14 +05:30
Prateeksha Singh
e31cdb5b85 fix(modules): add ERPNext settings module 2019-02-08 08:06:23 +05:30
Aditya Hase
a86a569787 fix(py3): Convert dict.values() to list for indexing 2019-02-07 22:21:06 +05:30
Aditya Hase
3e954734d0 fix(py3): Convert filter to list for indexing 2019-02-07 22:21:05 +05:30
Aditya Hase
6e1bb60b58 fix(py3): Convert filter to list for indexing 2019-02-07 22:21:05 +05:30
Aditya Hase
e1f867f29f fix(py3): Explicitly convert to float for comparison 2019-02-07 22:21:05 +05:30
Aditya Hase
d9ce732d3e fix(py3): Explicitly convert to float for comparison 2019-02-07 22:21:05 +05:30
Aditya Hase
a9f20d801d
Merge pull request #16599 from adityahase/python3-fix 
fix(py3): Use six.text_type instead of unicode
 2019-02-07 22:20:41 +05:30
Aditya Hase
691c166a56 fix(py3): Use six.text_type instead of unicode 2019-02-07 20:35:52 +05:30
Aditya Hase
0b1dc32fcb
Merge pull request #16597 from adityahase/python3-fix 
fix(py3): Use range instead of xrange
 2019-02-07 18:17:37 +05:30
Aditya Hase
b9dc031e86 fix(py3): Use range instead of xrange 2019-02-07 18:10:30 +05:30
Prateeksha Singh
3423407314 feat(module_links): rearrange links 2019-02-07 09:58:22 +05:30
Prateeksha Singh
9b14d46c1d purge(modules): remove old desktop icon configs 2019-02-07 09:58:22 +05:30
Prateeksha Singh
063af4ed08 config(modules): Rearrange links 2019-02-07 09:58:22 +05:30
Prateeksha Singh
b5eb16faeb feat(config): add some onboarding cues 2019-02-07 09:58:22 +05:30
Prateeksha Singh
ce27cffaad refactor(desk_icon): Remove reference and patches to Desktop Icon 2019-02-07 09:58:21 +05:30
Prateeksha Singh
2c14704398 feat(modules): Add Retail module, update others 2019-02-07 09:57:10 +05:30
Prateeksha Singh
7cd6ebeb6d feat(explore_page): rearrange links 2019-02-07 09:57:10 +05:30
Raffael Meyer
ff878c0c1d fix formatting and names 2019-02-07 03:28:27 +01:00
Faris Ansari
504f317434 fix: BOM Stock Calculated Report (#16585) 
- Cast null values to 0 to avoid mathematic errors
 2019-02-07 07:15:38 +05:30
Faris Ansari
8ae5dbcac8 fix: Set barcode in Item row after scanning barcode (#16591) 2019-02-07 07:09:49 +05:30
Himanshu
088886e082 Remove illegal character after break (#16589) 2019-02-07 07:09:20 +05:30
Sagar Vora
da1dc7fa52 Merge branch 'master' into develop 2019-02-05 18:40:39 +05:30
Sagar Vora
8aa34a0ce0 bumped to version 11.1.4 2019-02-05 19:00:38 +05:50
karthikeyan5
4cb0a250a0 fix(marketplace): bug in filtering menu_items 
> UX improvment for incomplete feature
 2019-02-05 18:07:48 +05:30
Nabin Hait
efff826e15
Merge pull request #16556 from nabinhait/payroll-cost-center 
fix: Don't force fetch cost center from company in payroll entry
 2019-02-05 13:32:16 +05:30
Nabin Hait
8a46df5c4b
Removed duplicate fields 2019-02-05 13:31:32 +05:30
Nabin Hait
38b05a1296 fix: Set default cost center in payroll entry 2019-02-05 10:46:41 +05:30
Nabin Hait
294319e71b fix: Don't force fetch cost center from company in payroll entry 2019-02-05 10:37:41 +05:30
Nabin Hait
ad69e29334
Merge pull request #16548 from nabinhait/stock-balance-item 
fix: Fetch data based on item group filter in item dashboard stock balance report
 2019-02-05 10:36:47 +05:30
Nabin Hait
1c288ca4ab
Merge pull request #16558 from deepeshgarg007/production_plan 
fix: Validation while getting raw materials for production in Production Plan
 2019-02-05 10:35:16 +05:30
Nabin Hait
fe6f1ad244
Update production_plan.py 2019-02-05 10:34:58 +05:30
Nabin Hait
d4e029665c
Merge pull request #16569 from nabinhait/salary-allow-on-submit 
fix: Allow-on-submit enabled for formula and condition in salary structure
 2019-02-05 10:31:24 +05:30
Nabin Hait
b6d2c7eb80
Merge pull request #16570 from saurabh6790/jinja_injection_fix 
fix: access request parameter directly
 2019-02-05 10:31:08 +05:30
Nabin Hait
7b93e738ad
Merge pull request #16576 from nabinhait/pay_reco_fix 
fix: Optimising payment reconciliation queries
 2019-02-05 10:28:03 +05:30
Nabin Hait
025e780f31
Merge pull request #16575 from rohitwaghchaure/fixed_job_card_not_working 
fix: job card not working if transfer against work order
 2019-02-05 10:27:12 +05:30
Nabin Hait
ac18498ca5 fix: Optimising payment reconciliation queries 2019-02-04 21:13:43 +05:30
Rohit Waghchaure
780c6b0d77 fix: job card not working if transfer against work order 2019-02-04 21:04:48 +05:30
Chinmay Pai
125505f2aa
fix(purchase_invoice): fix undefined variable 
fixes issue while creating purchase invoice

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-02-04 16:30:20 +05:30
Saurabh
bbebceb31a fix: access request parameter directly 2019-02-04 15:56:23 +05:30
Nabin Hait
ff05ee50e0 fix: Allow-on-submit enabled for formula and condition in salary structure 2019-02-04 14:42:57 +05:30
Deepesh Garg
d442d06947
Update production_plan.py 2019-02-03 12:45:20 +05:30
dgarg007
f667cff5a6 fix: Validation while getting raw materils for production in Production Plan 2019-02-02 21:57:00 +05:30
Saif Ur Rehman
1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
 2019-02-01 19:17:04 +05:00
Saurabh
aba611e09f
Merge branch 'hotfix' into project_status_email_fix 2019-02-01 15:01:26 +05:30
Nabin Hait
e1c75a9d55 fix: fixed salary structure assignment patch (#16546) 
* fix: fixed salary structure assignment patch

* fix: patch
 2019-02-01 12:25:40 +05:30
Nabin Hait
f3f4ce9b87 fix: Fetch data based on item group filter in item dashboard stock balance report 2019-02-01 12:01:19 +05:30
Rohit Waghchaure
a4645b6d17 fix: check open status projects for project status update 2019-02-01 11:37:22 +05:30
Raffael Meyer
fef07eeae2 Merge remote-tracking branch 'upstream/develop' into develop 2019-01-31 22:16:26 +01:00
Sagar Vora
ec5faaeae6
Merge branch 'hotfix' into stock-balance-fix 2019-01-31 18:46:06 +05:30
Nabin Hait
9ea19b8fe1 fix: Fixed error on stock balance report 2019-01-31 15:53:25 +05:30
Sagar Vora
56cbfe4bb0 Merge branch 'master' into develop 2019-01-31 13:34:32 +05:30
Sagar Vora
fea55fc018 bumped to version 11.1.3 2019-01-31 13:53:07 +05:50
Nabin Hait
a85f008f30
Merge pull request #16528 from adityahase/payment-request-usability 
fix(accounts): fetch subscription details only if required fields are populated
 2019-01-31 10:27:27 +05:30
Sagar Vora
7ea2497b9a
Fix salary patch (#16531) 
fix: salary structure assignment patch, add .vscode to gitignore
 2019-01-31 09:17:29 +05:30
Sagar Vora
76728b87ab
fix: value missing for selling settings - sales_update_frequency (#16530) 2019-01-31 08:19:38 +05:30
Sagar Vora
7a1c40c7c1 Merge branch 'master' into develop 2019-01-30 20:09:45 +05:30
Sagar Vora
664e21acbf bumped to version 11.1.2 2019-01-30 20:29:45 +05:50
Aditya Hase
245b73b94f fix(search): Fix possible reflected XSS attack vector (#16522) 2019-01-30 19:56:04 +05:30
Aditya Hase
66833f109b fix(accounts): fetch subscription details only if required fields are populated 2019-01-30 19:40:40 +05:30
Nabin Hait
78fc158b39
Merge pull request #16527 from nabinhait/bom-fix 
fix: Default value for 'raw materials rate based on' in BOM
 2019-01-30 18:35:49 +05:30
Saurabh
429996752d fix: patch fixes (#16524) 2019-01-30 17:45:48 +05:30
Nabin Hait
16d7b49d73 fix: Default value for 'raw materials rate based on' in BOM 2019-01-30 17:27:08 +05:30
Saurabh
a342138625 Merge branch 'master' into develop 2019-01-30 12:38:58 +05:30
Saurabh
bb2031941e bumped to version 11.1.1 2019-01-30 13:08:00 +06:00
Saurabh
5c12490709 fix: patch to add guardian role if not exists 2019-01-30 11:52:53 +05:30
rohitwaghchaure
25e63e806c fix: modified date (#16520) 2019-01-30 11:46:34 +05:30
Sagar Vora
1c44a6a0ba fix: set version to 11.1.0, remove staging_version 2019-01-29 18:52:50 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Sagar Vora
1a4cd3b66a bumped to version 11.1.0 2019-01-29 18:46:34 +05:50
Sagar Vora
606bd37316 fix: change changelog version to 11.1.0 2019-01-29 17:55:46 +05:30
Sagar Vora
b5dda63ddd fix: change changelog version to 11.1.0 2019-01-29 17:54:47 +05:30
Sagar Vora
51a27b3524 fix: unsaved merge conflict 2019-01-29 17:52:47 +05:30
Sagar Vora
f3cfad7595 Merge branch 'master' into staging-fixes 2019-01-29 17:20:46 +05:30
Sagar Vora
b32d9458b5 bumped to version 10.1.81 2019-01-29 17:30:19 +05:50
Nabin Hait
f8e9734f16
Merge pull request #16514 from sagarvora/changelog 
docs: changelog for v11.0.4
 2019-01-29 16:27:07 +05:30
rohitwaghchaure
a95ed44d3d fix: test case for fiscal year (#16516) 2019-01-29 16:24:53 +05:30
Nabin Hait
9f33c208d7
Update v11_0_4.md 2019-01-29 16:07:07 +05:30
Sagar Vora
7ef69b68f8
Update v11_0_4.md 2019-01-29 15:52:57 +05:30
Nabin Hait
cc41b876fb
Merge pull request #16497 from nabinhait/bom_price 
BOM raw materials price
 2019-01-29 14:58:40 +05:30
Sagar Vora
115a252f55 docs: changelog for v11.0.4 2019-01-29 14:40:10 +05:30
Nabin Hait
4e45663297 fix(stock): get item price based on party 2019-01-29 14:02:08 +05:30
Sagar Vora
8f6509fa9a
Merge branch 'staging-fixes' into fiscal_year_should_always_be_for_12_months 2019-01-29 13:04:20 +05:30
Sagar Vora
9520e345bd
fix: better error messages 2019-01-29 13:03:46 +05:30
Nabin Hait
1df9a23e7b
Merge pull request #16513 from rohitwaghchaure/remove_zero_qty_items_on_click_os_pay 
feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart
 2019-01-29 13:02:56 +05:30
Rohit Waghchaure
07f75a3e54 feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart 2019-01-29 13:00:18 +05:30
Rohit Waghchaure
a8e743e3c4 fix: fiscal year always be for 12 months 2019-01-29 12:55:04 +05:30
Nabin Hait
6f7cc8b186
Merge pull request #16505 from deepeshgarg007/pos_issue 
feat: Enhancement  in POS functionality
 2019-01-29 12:51:00 +05:30
Nabin Hait
25cb13c0f8
Merge pull request #16508 from navdeepghai1/salary-slip-net-pay-fixes 
fix(human resources): gross pay calculation issue
 2019-01-29 12:08:11 +05:30
Nabin Hait
7fc9825954
Merge pull request #16368 from ESS-LLP/pr_staging_fixes_2 
feat: List Active Healthcare Practitioner
 2019-01-29 11:52:55 +05:30