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

16980 Commits

Author SHA1 Message Date
Rohit Waghchaure
cd34c70670 fix: bom cost update is not working 2019-02-27 18:01:30 +05:30
Rohit Waghchaure
74cfe57716 fix: e-invoicing patch, patch to set country code in the address 2019-02-27 14:38:36 +05:30
Anurag Mishra
a9a1552e32 refactor 2019-02-27 14:10:24 +05:30
Rushabh Mehta
76f36f68d3
Merge pull request #16790 from crossxcell99/master 
fix: call base class onload method
 2019-02-27 08:31:14 +05:30
crossxcell99
f95171e808 fix: call base clase onload method 2019-02-26 18:01:37 +01:00
Sagar Vora
5a14e46a1b bumped to version 11.1.11 2019-02-26 17:28:58 +05:50
Nabin Hait
39c489bfdc
Merge pull request #16781 from deepeshgarg007/summary 
fix: Make company filter mandatory in sales person wise transaction summary
 2019-02-26 16:00:51 +05:30
Nabin Hait
be5124fe10
Merge pull request #16784 from rohitwaghchaure/multiple_fixes_e_invoicing 
fix: multiple e-invoicing issues for italy region
 2019-02-26 15:52:56 +05:30
Rohit Waghchaure
0f98cb8b83 fix: multiple e-invoicing issues for italy region 2019-02-26 15:09:27 +05:30
deepeshgarg007
d2d84e3c9d fix: Company filter fix 2019-02-26 11:52:22 +05:30
Suraj Shetty
5636f924a9 fix: get mode of payment while selecting payment term in payment term template (#16765) 2019-02-25 12:43:34 +05:30
Nabin Hait
9990306399 fix: Consider only active BOMs while updating cost via BOM Update Tool (#16753) 2019-02-25 11:59:05 +05:30
Rushabh Mehta
e2de8e0fa5 fix: expense claim type (#16760) 2019-02-25 11:56:30 +05:30
Suraj Shetty
2dadc1ef98 chore: Remove trailing whitespaces 2019-02-21 20:51:35 +05:30
deepeshgarg007
bf6b36a39b fix: Removed white spaces 2019-02-21 19:30:27 +05:30
deepeshgarg007
56b52d43e6 Merge branch 'hotfix' of https://github.com/frappe/erpnext into bom-item 2019-02-21 18:30:02 +05:30
Saurabh
76cd402ca5 bumped to version 11.1.10 2019-02-21 18:55:28 +06:00
Saurabh
e5ff28a92c
Merge pull request #16754 from deepeshgarg007/state_code 
fix: State code issue fix
 2019-02-21 18:21:24 +05:30
Nabin Hait
367d7c104e
Merge pull request #16724 from rohitwaghchaure/user_progress_issue 
fix: user progress issue
 2019-02-21 18:13:52 +05:30
Saurabh
47738f9792
Merge pull request #16750 from nabinhait/cc-against-bs 
fix: Ignore cost center while fetching outstanding invoices if not allowed from accounts settings
 2019-02-21 18:12:06 +05:30
Nabin Hait
e08cb3a49b
Merge pull request #16745 from nabinhait/manage-returned-qty 
fix: Consider returned qty while making invoice from DN / PR
 2019-02-21 18:11:37 +05:30
Nabin Hait
31f46b313c
Merge pull request #16728 from rohitwaghchaure/maintainance_visit_issue 
fix: not able to cancel maintenance visit
 2019-02-21 18:10:46 +05:30
Nabin Hait
e328869b10
Merge pull request #16738 from deepeshgarg007/unique_tree_options 
fix: Filter out unique values for tree options
 2019-02-21 18:09:42 +05:30
Nabin Hait
e3b1b11bc5
Merge pull request #16740 from nabinhait/leave-calendar 
fix: Calendar events for leaves considering user permissions
 2019-02-21 18:08:19 +05:30
Saurabh
a05ccb76f4
Merge pull request #16748 from nabinhait/multi-company-serial-invoicing 
fix: Validate serial no usage in invoice considering multi company transaction
 2019-02-21 18:07:40 +05:30
Nabin Hait
e797ec7463
Merge pull request #16746 from deepeshgarg007/gross_profit 
fix: Decimal point issue in gross profit print
 2019-02-21 18:07:14 +05:30
deepeshgarg007
1915e15a9e fix: State code issue fix in regional module(Italy) 2019-02-21 17:55:57 +05:30
rohitwaghchaure
a49f59fcec
Merge pull request #16751 from rohitwaghchaure/parent_value_showing_as_zero 
(Profit and Loss Statement, fix): for parent account value was showing as zero
 2019-02-21 17:50:51 +05:30
Rohit Waghchaure
90691dc0d8 (Profit and Loss Statement, fix): for parent account value was showing as zero 2019-02-21 17:18:28 +05:30
Nabin Hait
b24caad789 fix: Ignore cost center while fetching outstanding invocies if not allowed from accounts settings 2019-02-21 17:11:35 +05:30
Rohan Bansal
143973166f fix(payments): Only check for Draft or Submitted paymentswhile cancelling payment requests 2019-02-21 15:57:06 +05:30
Suraj Shetty
463a3cf8cf
Merge pull request #16725 from deepeshgarg007/item_dashboard 
fix: Item name display issue fix in item dashboard
 2019-02-21 14:42:38 +05:30
Nabin Hait
26972c954d fix: Validate serial no usage in invoice considering multi company transaction 2019-02-21 14:32:41 +05:30
deepeshgarg007
14ff6bfc32 fix: Decimal point issue in gross profit print 2019-02-21 12:08:32 +05:30
Nabin Hait
816a4655a0 fix: Consider returned qty while making invoice from DN / PR 2019-02-21 12:02:36 +05:30
Nabin Hait
40c15d2e74 fix: Calendar events for leaves considering user permissions 2019-02-20 18:55:38 +05:30
Saurabh
ada93e5d77 bumped to version 11.1.9 2019-02-20 18:44:17 +06:00
deepeshgarg007
0d64d622e5 fix: filter only unique values for tree options 2019-02-20 17:55:14 +05:30
rohitwaghchaure
485bd93dae
Merge pull request #16737 from saurabh6790/indentation_fixes 
fix: reload report doc and indentation fixes
 2019-02-20 17:40:50 +05:30
rohitwaghchaure
c18e925d61 fix: Moved regional methods from controller to hooks (#16736) 2019-02-20 17:13:15 +05:30
Saurabh
9fcfc63f77 fix: reload report doc and indentation fixes 2019-02-20 17:04:18 +05:30
rohitwaghchaure
ef3f864123 fix: not able to submit purchase order (#16735) 2019-02-20 15:47:06 +05:30
rohitwaghchaure
e141865c43
Merge pull request #16722 from rohitwaghchaure/stop_button_not_working 
fix: stop button not working in material request
 2019-02-20 12:30:26 +05:30
Sagar Vora
d48393541d bumped to version 11.1.8 2019-02-20 12:31:25 +05:50
Gaurav Naik
3bf0acbac6 fix(regional,italy): renamed validate hook for address (#16732) 2019-02-20 12:08:53 +05:30
Rohit Waghchaure
7e02e1c3cd fix: not able to cancel maintenance visit 2019-02-19 22:53:31 +05:30
deepeshgarg007
1b04534095 fix: Removed duplicate fields from BOM Item 2019-02-19 21:36:12 +05:30
deepeshgarg007
942c894f93 fix: fetch item name in item dashboard 2019-02-19 19:51:23 +05:30
Rohit Waghchaure
f4049f9dfd fix: user progress issue 2019-02-19 19:46:14 +05:30
Rohit Waghchaure
389cd6ad63 fix: stop button not working in material request 2019-02-19 19:18:07 +05:30
Sagar Vora
f5c511c193 bumped to version 11.1.7 2019-02-19 18:14:14 +05:50
Nabin Hait
2c23f98b65
Merge pull request #16721 from nabinhait/ar-ap-fix 
fix: AR/AP report based on account type
 2019-02-19 17:45:30 +05:30
Gaurav
3f046136d4 fix(regional,italy): added state code on address, updated patch 
moved state codes to init, rewired patch
added logic to autoset state code on address validate
handled multiple names for Italy
refactored validate_address_italy to validate_address
 2019-02-19 17:28:36 +05:30
Nabin Hait
e4f73929c4 fix: AR/AP report based on account type 2019-02-19 17:11:50 +05:30
Nabin Hait
8e9d947527
Merge branch 'hotfix' into fix-item-variant-settings-barcodes 2019-02-19 15:07:46 +05:30
Nabin Hait
21706894af
Merge pull request #16705 from deepeshgarg007/pos-precision 
fix: Fetch precision form system settings in Sales invoice payment(POS)
 2019-02-19 15:06:56 +05:30
Nabin Hait
818ead4041
Merge branch 'hotfix' into purchase-qty-fix 2019-02-19 15:06:10 +05:30
Nabin Hait
157526c978
Merge pull request #16711 from rohitwaghchaure/multi_uom_not_working_for_rate_pricing_rule 
fix: multi-uom not working for the pricing rule rate
 2019-02-19 15:05:07 +05:30
Nabin Hait
6bd3098824
Merge pull request #16716 from deepeshgarg007/precision-fix 
fix: Removed precision from multiple doctypes
 2019-02-19 15:03:00 +05:30
Gaurav
2670ad7eb2 mod(regional,italy): adjusted calculation logic for charges 
validation for missing code on mode of payment
UOM from settings
Replace str with cstr
 2019-02-19 13:15:25 +05:30
Gaurav
f1e28e0e8d mod(regional,italy): Updates to Italian Localization 
fixes:
removed cleanup_files from italy/utils
removed extract_doc_number from italy/utils
added country filter to italian localization patch
replaced dict assignment with dot operator in prepare_invoice
correcions in e-invoice xml following changes in prepare_invoice
added setup_report in patch
added section for e-invoicing custom fields in company
added Italy in test_company
 2019-02-19 10:39:22 +05:30
Gaurav
a4aa80fe05 feature(regional): Italian Localization 
Added setup.py for italy under regional
Included fiscal regimes, tax exemption reasons and custom fields

Issue #16259
 2019-02-19 10:39:10 +05:30
deepeshgarg007
de0f59b818 fix: Removed precision from multiple doctypes 2019-02-19 08:40:16 +05:30
Rohit Waghchaure
5821b672ad fix: multi-uom not working for the pricing rule rate 2019-02-18 20:07:44 +05:30
Nabin Hait
750fe6eaea fix: get item rate in bom 2019-02-18 18:56:08 +05:30
deepeshgarg007
9a19e06856 fix: Change Received qty to accepted qty and validation for indicators 2019-02-18 18:42:15 +05:30
Rohit Waghchaure
99e7362006 fix: Allow to make material request from draft job card 2019-02-18 18:26:50 +05:30
deepeshgarg007
48a7262fae fix: Precision issue in POS payment 2019-02-18 15:05:36 +05:30
Anurag Mishra
879e5fd8bb remove print and codacy 2019-02-18 14:43:55 +05:30
Anurag Mishra
42a106c7ba Auditors print formats 2019-02-18 14:35:33 +05:30
rohitwaghchaure
1bcbe9069b
Merge pull request #16610 from jay-parikh/hotfix 
fix: (POS) Item listing issue in pos after submit for Multi Company POS Profile
 2019-02-18 12:43:57 +05:30
Anurag Mishra
61f981ae05 Changes Requested 2019-02-18 11:43:32 +05:30
Rushabh Mehta
f3b33f3ab2
Merge pull request #16611 from karthikeyan5/hotfix-marketplace-features 
feat(marketplace): seller profile page
 2019-02-18 11:24:01 +05:30
Suraj Shetty
053d6a2ca1 Move reload doc before get query 2019-02-17 11:24:51 +05:30
Suraj Shetty
3a2f342ac1 Ignore duplicate entry 2019-02-16 21:09:24 +05:30
Suraj Shetty
1399fbe986 Move patch 2019-02-16 21:02:34 +05:30
Suraj Shetty
8cbe824c5b Rerun item_barcode_chidtable_migrate patch 2019-02-16 17:54:15 +05:30
Suraj Shetty
cc0222a28a Remove unwanted barcode field from item 2019-02-16 17:53:23 +05:30
Frappe Bot
acf26c8569 bumped to version 11.1.6 2019-02-15 10:22:32 +00:00
Faris Ansari
8a01342e48
fix: Remove comment 2019-02-15 15:14:38 +05:30
Nabin Hait
09a4df74f0
Merge pull request #16645 from nabinhait/tds-fix 
fix: Ignore tds account while creating tax withholding category
 2019-02-15 14:53:30 +05:30
Nabin Hait
eb0627356b
Merge pull request #16650 from nabinhait/general-ledger-fix 
fix: show values in account/party currency based in actual entry, no conversion
 2019-02-15 14:53:12 +05:30
Nabin Hait
b5c249583a
Merge pull request #16651 from netchampfaris/fix-barcode-scanning-ux 
fix: Barcode scanning UX
 2019-02-15 14:52:42 +05:30
Nabin Hait
b819f104e6
Merge pull request #16653 from nabinhait/item-variants 
fix: Enqueued item variants updation if there are more than 30 variants
 2019-02-15 14:51:14 +05:30
Nabin Hait
c45962e3ef
Merge pull request #16675 from deepeshgarg007/purchase-fix 
fix: Purchase order item description fix
 2019-02-15 14:50:38 +05:30
Nabin Hait
aa80a223d8
Merge pull request #16674 from deepeshgarg007/address-rep-fix 
fix: Address and contact report
 2019-02-15 14:26:16 +05:30
Nabin Hait
8788a5c712
Merge pull request #16676 from nabinhait/get-item-details 
fix: get item details
 2019-02-15 14:24:46 +05:30
Nabin Hait
b1cbe221b7
Merge pull request #16677 from nabinhait/total-qty-patch-fix 
fix: Consider parenttype while updating total qty in transactions
 2019-02-15 14:24:30 +05:30
Nabin Hait
a0c9c7501b
Update update_total_qty_field.py 2019-02-15 14:24:08 +05:30
Sagar Vora
379e6a4635
Merge branch 'hotfix' into address-rep-fix 2019-02-15 13:08:42 +05:30
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
Anurag Mishra
4f0fd38209 refractor 2019-02-13 16:46:05 +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
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
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
Nabin Hait
ab50211e18 fix: show project even if PI is directly created 2019-02-11 18:25:18 +05:30
Anurag Mishra
aaa57026ac Merge branch 'gross-and-net-profit-report' of https://github.com/Anurag810/erpnext into gross-and-net-profit-report 2019-02-11 17:02:59 +05:30
Anurag Mishra
f70d4089bc fix: codacy 2019-02-11 17:02:20 +05:30
Sagar Vora
4e92414850
Merge branch 'hotfix' into gross-and-net-profit-report 2019-02-11 16:00:28 +05:30
sahil28297
1a7e438fb2 fix(pstch): allow duplicate entries (#16632) 2019-02-11 15:53:04 +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
Anurag Mishra
a032f0528e new report gross-and-net-profit-report 2019-02-11 13:12:44 +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
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
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
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