deepeshgarg007
94a3539015
Row check fix in stock analytics
2018-11-30 16:20:48 +05:30
deepeshgarg007
37b6a2ca0b
row check bug fix
2018-11-30 16:15:43 +05:30
Nabin Hait
eda0a6eb33
fix(test): Fixed tests for period closing voucher
2018-11-30 15:15:17 +05:30
rohitwaghchaure
ca332bdcdb
Revert "[Fix] Accounts receivable summary print is not working"
2018-11-29 18:15:29 +05:30
deepeshgarg007
ee05e358d1
Rewrote query using orm
2018-11-29 16:24:28 +05:30
deepeshgarg007
c981fb389b
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix
2018-11-29 14:57:50 +05:30
deepeshgarg007
3c7c4a61be
Test case fix
2018-11-29 14:28:01 +05:30
deepeshgarg007
3eef6411dd
Removed print statement
2018-11-29 13:10:02 +05:30
deepeshgarg007
9ed13f4a90
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into analytics-fix
2018-11-29 12:52:44 +05:30
deepeshgarg007
1a1c013b2a
Analytics report bug fixes and code cleaning
2018-11-29 08:34:47 +05:30
Ameya Shenoy
5780e865b7
bumped to version 11.0.3-beta.25
2018-11-28 08:28:36 +00:00
Ameya Shenoy
2806d83362
Merge branch 'master' into staging-fixes
2018-11-28 08:12:48 +00:00
Ameya Shenoy
e3136c38e1
bumped to version 10.1.73
2018-11-28 07:57:27 +00:00
deepeshgarg007
ebe1e12a82
Codacy issue fixes
2018-11-28 08:21:54 +05:30
Nabin Hait
305c8b1fba
Merge pull request #16110 from shreyashah115/fix-timer
...
[Timesheet] Element selector in Timer
2018-11-27 17:57:46 +05:30
Nabin Hait
f642f86982
Merge branch 'hotfix' into accounts_receivable_summary_print_issue
2018-11-27 17:56:49 +05:30
Nabin Hait
96598936ad
fix(test): Fixed tests for discount with margin and period closing voucher
2018-11-27 17:48:13 +05:30
deepeshgarg007
c1a3c72b49
final dashboard design
2018-11-27 17:09:12 +05:30
Rohit Waghchaure
10bcd5113c
[Fix] Accounts receivable summary print is not working
2018-11-27 16:25:35 +05:30
deepeshgarg007
f31caffa74
Changes in get_dashboard_info
2018-11-27 15:04:12 +05:30
Nabin Hait
3b16dd7377
Merge branch 'staging-fixes' into pr_staging_fixes
2018-11-27 14:19:49 +05:30
Nabin Hait
dfd79b0349
Merge branch 'staging-fixes' into gbm001-item-barcodes-pull
2018-11-27 14:19:20 +05:30
Nabin Hait
676a2fbc8a
Merge branch 'staging-fixes' into hotfix-child-task-error
2018-11-27 14:17:23 +05:30
deepeshgarg007
6372fbba54
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix
2018-11-27 14:06:58 +05:30
Nabin Hait
3854940e42
Merge branch 'staging-fixes' into fix-patch
2018-11-27 13:26:05 +05:30
Nabin Hait
e4cc062cf1
Merge pull request #16109 from rohitwaghchaure/while_pulling_advanced_entry_system_uses_grand_total
...
[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice
2018-11-27 13:22:50 +05:30
Nabin Hait
b98d08a2cb
Merge pull request #16049 from rohitwaghchaure/incorrect_stock_value_difference_calculation
...
[Fix] Incorrect stock value difference because of negative stock
2018-11-27 13:21:43 +05:30
Nabin Hait
ccb03fb255
Merge pull request #16073 from deepeshgarg007/receivable-summary
...
Accounts receivable summary print fix
2018-11-27 13:11:37 +05:30
shreyashah115@gmail.com
5281fe8e50
fix: Element selector
2018-11-27 13:11:30 +05:30
Nabin Hait
72fc1b57be
Merge pull request #16083 from Anurag810/new-fix-branch
...
[fix] delivery note with quantity equal 0 #14211
2018-11-27 13:10:31 +05:30
Nabin Hait
3c31e4ad4b
Merge pull request #16088 from rohitwaghchaure/fixed_pos_profile_packing_items
...
If is pos is enabled and no pos profile then use the item's default warehouse for packing materials
2018-11-27 13:10:14 +05:30
Nabin Hait
6743219dc2
Merge pull request #16094 from rohitwaghchaure/validate_due_date_for_purchase_invoice
...
[Fix] Due Date cannot be before Posting Date should consider supplier invoice date for purchase invoice
2018-11-27 13:09:16 +05:30
Nabin Hait
5f7b37ee11
Merge pull request #16093 from rohitwaghchaure/manufacturing_settings_permissions_issue
...
[Fix] No permission for Manufacturing Settings
2018-11-27 13:07:44 +05:30
Rohit Waghchaure
6cc2f52fa4
[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice
2018-11-27 12:07:03 +05:30
Nabin Hait
dde952d591
Merge pull request #16092 from deepeshgarg007/salary_slip
...
Salary slip earnings and deductions table bug fix
2018-11-27 11:39:10 +05:30
Nabin Hait
9a06543453
Merge branch 'staging-fixes' into indicators-in-leave-applications
2018-11-27 11:38:29 +05:30
Nabin Hait
f48cf001ed
Merge branch 'staging-fixes' into test-fix
2018-11-27 11:37:22 +05:30
Nabin Hait
be65af5dfe
Merge pull request #16101 from SaiFi0102/patch-1
...
Company rename abbr to consider more DocTypes
2018-11-27 11:36:46 +05:30
Nabin Hait
57fa8759ee
Merge pull request #16102 from deepeshgarg007/fees
...
Paid Amount not showing for fees in web portal fix
2018-11-27 11:36:27 +05:30
Nabin Hait
f806cfecaa
Merge branch 'staging-fixes' into SO-Validate-Set-GrossProfit
2018-11-27 11:18:54 +05:30
Kanchan Chauhan
2d0b788105
[Minor] Indicators in Leave Application
2018-11-27 10:37:23 +05:30
deepeshgarg007
bc513a8828
Removed paid amount form Fees doctype
2018-11-26 20:43:39 +05:30
deepeshgarg007
a9525de0da
paid amount fix in fees
2018-11-26 20:34:32 +05:30
Saif
6a9d9d76ef
Company rename abbr to consider more DocTypes
2018-11-26 19:56:13 +05:00
Nabin Hait
78d9fac0ce
Merge branch 'staging-fixes' into pr_staging_fixes
2018-11-26 20:25:34 +05:30
Nabin Hait
15951e6e93
Merge branch 'staging-fixes' into gbm001-item-barcodes-pull
2018-11-26 20:25:29 +05:30
Nabin Hait
93595fa60a
Merge branch 'staging-fixes' into hotfix-child-task-error
2018-11-26 20:24:47 +05:30
Nabin Hait
91c811f170
Merge branch 'staging-fixes' into new-fix-branch
2018-11-26 20:23:37 +05:30
Nabin Hait
c5064069c7
Merge branch 'staging-fixes' into manufacturing_settings_permissions_issue
2018-11-26 20:23:11 +05:30
Nabin Hait
218fa51dba
Merge branch 'staging-fixes' into validate_due_date_for_purchase_invoice
2018-11-26 20:23:00 +05:30
Nabin Hait
73e3138a5b
Merge branch 'staging-fixes' into on_uncheck_is_return_clear_reference_number
2018-11-26 20:20:22 +05:30
deepeshgarg007
05c2989698
removed total from graph
2018-11-26 20:19:57 +05:30
Nabin Hait
7f02659425
Merge branch 'hotfix' into address_not_set_from_api
2018-11-26 20:16:54 +05:30
Nabin Hait
b32abde2ac
Merge branch 'staging-fixes' into bug-fixes
2018-11-26 20:05:09 +05:30
Saif Ur Rehman
5fdbc68ca3
Set Gross Profit on server-side validation of Sales Order
2018-11-26 19:32:16 +05:00
Rohit Waghchaure
b4a5993ece
On uncheck is return field clear the reference field
2018-11-26 20:02:01 +05:30
Nabin Hait
21983b8432
Merge pull request #16001 from jsukrut/staging-fixes
...
[FIX][#15018 ][PATIENT Relation should be unique]
2018-11-26 20:01:19 +05:30
Nabin Hait
56dc5c1be3
Merge branch 'staging-fixes' into pos-profile-fix
2018-11-26 19:59:07 +05:30
Nabin Hait
212a29ae2c
Merge pull request #16028 from rohitwaghchaure/not_able_to_view_general_ledger
...
[Fix] Not able to view general ledger for purchase invoice
2018-11-26 19:57:24 +05:30
Nabin Hait
25e60f3934
Merge pull request #16044 from ESS-LLP/fix-trial-balance
...
fix: Trial Balance print
2018-11-26 19:56:27 +05:30
Nabin Hait
4191d7eb52
Merge pull request #16045 from SaiFi0102/GrossProfit-Fix-Buying-Amount-Multiple-Invoice
...
Fixed get_buying_amount in Gross Profit report:
2018-11-26 19:55:06 +05:30
Nabin Hait
d0af0887be
Merge pull request #16051 from SaiFi0102/patch-1
...
Remove "Test" Letter Head
2018-11-26 19:47:07 +05:30
Nabin Hait
36f266355d
Merge branch 'staging-fixes' into fixed_holiday_list_not_working
2018-11-26 19:44:11 +05:30
Nabin Hait
736ce9a176
Merge pull request #16095 from SaiFi0102/BugFix-Rate-Calculation
...
Fixed error due to incorrect use of 'this' while calculating rate
2018-11-26 19:31:25 +05:30
Saif Ur Rehman
147fa73d3f
Fixed incorrect use of 'this' causing errors calculating rate
2018-11-26 18:14:06 +05:00
Rohit Waghchaure
d1a85a3637
[Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice
2018-11-26 18:42:29 +05:30
Rohit Waghchaure
15ed7a6351
[Fix] No permission for Manufacturing Settings
2018-11-26 17:31:18 +05:30
Anurag Mishra
5b6dd58b3e
fixed ZeroDivisionError in sales_order.py
2018-11-26 17:22:50 +05:30
deepeshgarg007
bd87903b56
Added condition for default amount
2018-11-26 17:13:59 +05:30
Anurag Mishra
e657fe84b8
making validation generic for sales order,sales invoice,purchase order etc.
2018-11-26 17:13:10 +05:30
Anurag mishra
6ddb15b3df
fix(validate): Qty is mandatory in delivery note
2018-11-26 17:13:10 +05:30
Anurag mishra
7b2c445707
Delivery Note fixes
2018-11-26 17:13:10 +05:30
Nabin Hait
73ca3cfca6
fix(test): removed test print
2018-11-26 16:16:42 +05:30
deepeshgarg007
533066eb87
Salary slip bug fix
2018-11-26 15:04:21 +05:30
Rohit Waghchaure
3893ba302c
If is pos and no pos profile use the item's default warehouse for packing materials
2018-11-26 14:13:24 +05:30
Nabin Hait
2665c37f38
temp(travis): Print statement to fix travis
2018-11-26 11:05:28 +05:30
Nabin Hait
48e0e19b03
fix(test): Fixed salary slip and sales analytics test cases
2018-11-26 11:05:28 +05:30
Nabin Hait
2508d11097
fix(test): Test cases fixed
2018-11-26 11:05:28 +05:30
Nabin Hait
f77cd54a6c
fix(tds): Create tds payable under correct parent
2018-11-26 11:05:28 +05:30
deepeshgarg007
9cdece4ca2
Test case fix and other minor bug fix
2018-11-26 11:05:28 +05:30
deepeshgarg007
5dbb9f5312
Accounts receivable summary print fix
2018-11-23 19:54:08 +05:30
deepeshgarg007
a1cffc3490
minor changes in dashboard
2018-11-23 16:51:35 +05:30
deepeshgarg007
0e8c36473a
Added colspan to indicators
2018-11-23 11:22:24 +05:30
deepeshgarg007
920dc1400f
Customer/Supplier dashboard fix for multi company setup
2018-11-23 10:17:28 +05:30
Rohit Waghchaure
037a151ef5
[Fix] New holiday list form is not working
2018-11-22 12:57:34 +05:30
Saif
2a2f2742eb
Remove "Test" Letter Head
2018-11-21 23:29:09 +05:00
Rohit Waghchaure
6424f47f3b
[Fix] Incorrect stock value difference because of negative stock
2018-11-21 23:18:41 +05:30
Ranjith
1879e91148
fix: Trial Balance
2018-11-21 16:04:05 +05:30
Saif Ur Rehman
23eef11cf5
Fixed get_buying_amount in Gross Profit report:
...
To handle the case where there may be multiple invoices for a single delivery
2018-11-21 15:32:37 +05:00
Suraj Shetty
1eb098caf9
Add additional condition condition to get_pos_profile
...
- If we have any POS Profile related to the user,
that profile should be used
2018-11-21 14:36:58 +05:30
Rohan Bansal
f838597b5f
fix(task): Fix error when trying to convert a task into a group even if no child tasks exist
2018-11-20 13:18:05 +05:30
Rohit Waghchaure
770a13ebc3
[Fix] Not able to view general ledger for purchase invoice
2018-11-20 13:01:52 +05:30
Ranjith
5d2e52c4ef
fix: healthcare patch
2018-11-19 20:03:25 +05:30
Jamsheer
64e42e1e88
fix: Patient Appointment - update list view
2018-11-19 13:00:49 +05:30
Jamsheer
ee6b317ab5
fix: Patient Appointment - Code standards
2018-11-19 13:00:49 +05:30
Jamsheer
45695c9bcb
fix: Realign Patient Appointment fields
2018-11-19 13:00:49 +05:30
Jamsheer
dc3ae114cd
feat: Reschedule - Patient Appointment
2018-11-19 13:00:49 +05:30
Andrew McLeod
f99a68a695
feat: Added unit testing for Item Barcodes in item.py
...
Adds three different barcodes and barcodes types to a test item and
checks that they are added correctly.
Adds a barcode that already exists, and checks a DuplicateEntryError
is raised.
Adds an invalid EAN barcode and checks InvalidBarcode (a subclass of
ValidationError) is raised.
2018-11-16 13:55:55 +00:00
Andrew McLeod
5607762c0f
fix/feat: Allow extension of barcode types (without validation)
...
Currently, it is difficult to add new custom barcode types for two reasons, both of which relate to validate_barcode in item.py:
- There is a bug where barcode types with a space in, such as Code 128, are split in two (so barcode_type is checked against 'Code' and '128' rather than 'Code 128'). This is fixed by splitting the Options field against a newline, instead of spaces.
- All barcodes are validated against the stdnum.ean library. This only handles EAN-8, EAN-13 and UPC-12 barcodes and any other barcode will fail. Barcodes with no type will continue to not be checked. Barcodes with the default barcode_types of EAN, UPC will continue to be checked. The non-default barcode_types of EAN-13 and EAN-8 will also be checked. The barcode_type is cast to upper case before this check is made so ean, upc, ean-13 and ean-8 will also be validated.
This allows people to add their own barcode types, such as Code 128 and QR codes. Users can add custom validation of these barcodes using the usual hooks, but they cannot remove the standard validation.
2018-11-16 11:08:39 +00:00
Jsukrut
b9a95e29b7
[FIX][ #15018 ][PATIENT Relation should be unique]
2018-11-16 11:30:12 +05:30
Ameya Shenoy
27a0c37963
css: build files in v10
2018-11-15 19:21:30 +00:00
Rohit Waghchaure
f4dc71661d
[Fix] Address not set from the API
2018-11-15 17:04:02 +05:30
deepeshgarg007
795686d1cc
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into bug-fixes
2018-11-15 16:30:48 +05:30
Frappe Bot
d9dccaefba
bumped to version 11.0.3-beta.24
2018-11-15 09:42:35 +00:00
Frappe Bot
ef745b0197
bumped to version 11.0.3-beta.23
2018-11-15 09:37:17 +00:00
Nabin Hait
0aca5aad14
Merge pull request #15976 from deepeshgarg007/summary
...
[Fix] Accounts receivable summary print format showing zero values
2018-11-15 14:52:16 +05:30
Nabin Hait
a0a2f58a21
Merge pull request #15985 from adityahase/perf-patch
...
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
2018-11-15 14:50:58 +05:30
Frappe Bot
98b4a1bc81
Merge branch 'master' into staging-fixes
2018-11-15 09:12:04 +00:00
Frappe Bot
2426d00dd6
bumped to version 10.1.72
2018-11-15 09:04:14 +00:00
Rohit Waghchaure
704796b1cb
Code optimization for consolidated financial statement report
2018-11-15 13:46:18 +05:30
rohitwaghchaure
02a7f8f0b2
Merge pull request #15991 from rohitwaghchaure/fixed_consolidated_conversion_issue
...
[Fix] Consolidated financial statement report currency conversion issue
2018-11-15 12:56:11 +05:30
Rohit Waghchaure
9d0f90975b
[Fix] Consolidated financial statement report currency conversion issue
2018-11-15 12:55:20 +05:30
Rohit Waghchaure
43920530a1
[Minor] Patch fixes
2018-11-15 12:20:27 +05:30
deepeshgarg007
4c366eed23
Minor issue fixes
2018-11-15 12:02:07 +05:30
Deepesh Garg
3b8c84fa75
Merge pull request #15975 from nabinhait/staging-fixes
...
fix(test): Fixed item discount amount calculation and test cases related to pricing rule
2018-11-15 12:01:09 +05:30
rohitwaghchaure
e907c0d15c
Merge pull request #15986 from rohitwaghchaure/added_currency_filter_in_consolidated_report
...
Added currency filter in consolidated financial statement report
2018-11-15 10:53:02 +05:30
Rohit Waghchaure
a95697f506
Added currency filter in consolidated financial statement report
2018-11-14 19:55:44 +05:30
Aditya Hase
d168a71cfb
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
...
update_total_qty_field patch was using UPDATE statement with CASE
Now use INSERT INTO with ON DUPLICATE KEY UPDATE clause which
allows this query to use indexes and update multiple rows per query.
2018-11-14 19:09:07 +05:30
Frappe Bot
fac49983a0
bumped to version 11.0.3-beta.22
2018-11-14 11:32:34 +00:00
rohitwaghchaure
ba97b9b2d8
Merge pull request #15980 from rohitwaghchaure/on_save_allow_transfer_for_manufatured_changed
...
[Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually
2018-11-14 15:12:45 +05:30
rohitwaghchaure
5395b164cd
Merge pull request #15983 from rohitwaghchaure/fixed_claimed_amount_issue
...
Claimed amount is not reset on cancel of employee advance
2018-11-14 13:21:11 +05:30
Rohit Waghchaure
047a7123eb
Claimed amount is not reset on cancel
2018-11-14 13:20:00 +05:30
Rohit Waghchaure
917dda1b76
[Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually
2018-11-14 01:18:41 +05:30
Nabin Hait
367a076fa4
fix(discount): Fixed item discount amount calculation
2018-11-13 18:41:58 +05:30
Nabin Hait
d34bfa8c2c
fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes
2018-11-13 18:21:22 +05:30
Frappe Bot
fe62024824
bumped to version 11.0.3-beta.21
2018-11-13 11:41:27 +00:00
Nabin Hait
3409e55d24
Merge pull request #15974 from Alsum/assign-sa
...
assign-sa-to-group-of-employees
2018-11-13 16:55:17 +05:30
deepeshgarg007
7bc6f3843a
Fix for accounts Receivable Summary Showing zero values
2018-11-13 16:54:54 +05:30
Nabin Hait
7fe4124bb8
fix(field property): Made barcode field non-mandatory in item
2018-11-13 16:48:59 +05:30
Frappe Bot
88c88d6e7c
Merge branch 'master' into staging-fixes
2018-11-13 10:59:05 +00:00
Frappe Bot
6b78e520d2
bumped to version 10.1.71
2018-11-13 10:55:31 +00:00
Nabin Hait
688758a56f
fix(test): Fixed item discount amount calculation and test cases related to pricing rule
2018-11-13 16:13:16 +05:30
alsum
e04a753d53
assign-sa-to-group-of-employees
2018-11-13 11:43:58 +02:00
Nabin Hait
ee887f4db7
Merge pull request #15796 from Alsum/set_current_asset_value
...
trigger set_current_asset_value when make asset_value_adjustment from asset form
2018-11-13 12:42:28 +05:30
Nabin Hait
ee190e34c2
Update asset_value_adjustment.js
2018-11-13 12:41:36 +05:30
Saif
60ec88bcc8
Added Default Warehouse field that sets all item's warehouse ( #15462 )
...
* -Added field def_warehouse that sets warehouse of all items
-Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied
* Set def_warehouse in test_sales_order.py
* Changed from def_warehouse to set_warehouse
* Rest of def_warehouse to set_warehouse
2018-11-13 12:37:53 +05:30
Alchez
ce3340903d
Update Delivery Trip status based on visited stops ( #15723 )
...
* feat(delivery_trip_status): Update Delivery Trip status based on visited stops
* feat(delivery_trip_status): Fix tests
* feat(delivery_trip_status): Fix allow on submit for status
* feat(delivery_trip_status): Change status mapping
* feat(delivery_trip_status): Fix patch
* Update update_delivery_trip_status.py
2018-11-13 12:22:17 +05:30
Alchez
9f87c441b0
feat(delivery_trip): Create a Delivery Trip by selecting multiple Delivery Notes in list view ( #15706 )
2018-11-13 12:20:05 +05:30
khushalti
fad08e1bcb
[fix] - GL entry not creating on PR if rejected qty mentoned ( #15815 )
2018-11-13 12:09:32 +05:30
Alchez
6f1fd193eb
fix(production_plan): Allow work orders to be cancelled ( #15955 )
2018-11-13 11:47:23 +05:30
rohitwaghchaure
849169e82b
Merge pull request #15969 from rohitwaghchaure/fix_company_dashbord_sales_count
...
[Fix] Company dashboard sales count condition
2018-11-13 11:37:26 +05:30
Britlog
7d9689cc92
[Fix] Website Conversion factor query ( #15866 )
...
* [Fix] Conversion factor query
* Update product.py
2018-11-13 11:36:41 +05:30
Rohit Waghchaure
14ffe8b935
[Fix] Company dashboard sales count condition
2018-11-13 11:35:38 +05:30
Britlog
9e9e37d39b
[Fix] Conversion factor in offline POS ( #15867 )
2018-11-13 11:34:27 +05:30
Deepesh Garg
b65bb5df2e
Function renaming, code cleaning and minor fixes ( #15938 )
2018-11-13 11:28:58 +05:30
Stavros Anastasiadis
a695dad525
Upgrade BOM Stock Report base with Qty to Produce ( #15939 )
2018-11-13 11:17:41 +05:30
Shreya Shah
89974b221d
[Feature] Create Raw Material Request from Sales Order ( #15452 )
...
* Add new button to Sales Order form - Request for Raw Materials
* Modify get_work_order_items function
* Commonify functions in Production Plan to make it compatible with new feature
* Create and submit Material Request from Sales Order
* Link Sales Order with Material Request
* Minor
* Rename label
* Fix Codacy
* Modify as per review suggestions
- Move dialog to a new function
- Move checkboxes below other fields
* Minor changes
* Check for permissions
* Add common checkboxes for all items
* Fix codacy
* fix: Travis
* fix: Use variable to store query result
* fix: Add comment before fetching exploded items
* refactor: Break into multiple functions
* test: Add test case
2018-11-13 11:15:03 +05:30
Zarrar
6922415d1b
[New Feature]Scan Item Barcode label to quick create/update records in items child table ( #15731 )
...
* Update transaction.js
* setup barcode scan
stock entry controller not inherited from transaction.js, need to call setup barcode scan from transaction.js
* fix bug of item_code change always reset qty to 0
when calling frappe.model.set_value(dt,dn,'item_code',xxx), even qty is set, system always reset qty to 0.
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* clean up barcode logic for transactions
* call scan_barcode method for stock entry
* separate out logic for searching serial, batch or barcode number
* added scan barcode field in transactions doctype
* search barcode-serial-batch sequence, code rectify
* hide all barcode related field if disabled from settings
* remove print statement
* Update stock_entry.py
2018-11-13 11:11:32 +05:30
Ameya Shenoy
42928f978b
fix: work order item sorting ( #15967 )
2018-11-13 11:04:17 +05:30
Ameya Shenoy
e8d3aa9cc9
Merge pull request #15966 from codingCoffee/frankfurter
...
fix: changed currency exchange API to frankfurter
2018-11-12 18:35:36 +05:30
Deepesh Garg
84483ff776
Stock analytics script report ( #15630 )
...
* Stock analytics script report
* Codacy Issue Fixes
* Codacy Issue Fixes
* Removed Trailing Whitespaces
* Code cleaning and optimization
* Minor Changes
* Code cleaning and spacing
* Added link for stock analytics in stock.py
* Refactoring and code cleaning
* Codacy issue fixes
2018-11-12 17:05:31 +05:30
Deepesh Garg
a057f4c2a0
Script report for purchase analytics ( #15612 )
...
* Purchase Analytics Query Report
* Minor Changes
* Codacy Issue Fixes
* Codacy Issues Fixed
* Code cleaning and optimization
* Indentation Issue Fix
* Code cleaning and better function naming
* Added link for purchase analytics in buying.py
* Added link for production analytics in manufacturing.py
* Commonified purchase-analytics using Analytics class
* Codacy issue fix
2018-11-12 17:01:02 +05:30
rohitwaghchaure
ab76ff0836
Added new option group by voucher(consolidated) in the general ledger report ( #15957 )
2018-11-12 16:58:24 +05:30
Nabin Hait
5e85ab3b67
Update setup.py
2018-11-12 16:46:12 +05:30
JodeQ
1b8e9cd3bb
Permission error for new Sales invoice ( #15952 )
...
In version
```
Installed Apps
ERPNext: v11.0.3-beta.20 () (staging)
Frappe Framework: v11.0.3-beta.25 () (staging)
```
When creating a new Sales invoice without healthcare active we have this error
```
Not permitted
Insufficient Permission for Patient
```
Console log
```
Traceback (most recent call last):
File "/home/frappe/auroraone-v11/apps/frappe/frappe/app.py", line 61, in application
response = frappe.handler.handle()
File "/home/frappe/auroraone-v11/apps/frappe/frappe/handler.py", line 21, in handle
data = execute_cmd(cmd)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/handler.py", line 56, in execute_cmd
return frappe.call(method, **frappe.form_dict)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/__init__.py", line 1007, in call
return fn(*args, **newargs)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/desk/search.py", line 53, in search_link
search_widget(doctype, txt, query, searchfield=searchfield, page_length=page_length, filters=filters, ignore_user_permissions=ignore_user_permissions)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/desk/search.py", line 149, in search_widget
as_list=not as_dict)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/__init__.py", line 1235, in get_list
return frappe.model.db_query.DatabaseQuery(doctype).execute(None, *args, **kwargs)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/model/db_query.py", line 40, in execute
raise frappe.PermissionError(self.doctype)
PermissionError: Patient
```
2018-11-12 16:42:05 +05:30
Pawan Mehta
aa0bed16f6
[fix] #14038-Std hours at company level to calculate timesheet hours ( #15819 )
...
* [fix] #14038
* codacy fixes
* add end time calc method
* test case and rename function
* Update timesheet.py
2018-11-12 16:40:07 +05:30
Deepesh Garg
6714214951
Server side script report for sales analytics ( #15589 )
...
* Sales Analytics Report
* Codacy issue fixes and name column addition
* Minor Fixes
* Minor Changes
* Codacy Issue Fixes
* Codacy Issue Fixes
* Bug Fixes
* Code cleaning and optimization
* Deleted Duplicate code
* Indentation Issue Fixes
* Added Supplier Condition
* Cleaned code and better function naming
* Added report link for sales analytics in selling.py
* fix(patch): Patch to delete old analytics reports
* feat(refactor): Created class and refactored code using object oriented paradigm
* Column condition fix
* Minor condition fix
* Minor fix
* parent child map for purchase analytics
* Minor Fixes in get_periodic_data
* Used dots for filters instead of brackets
* Minor Bug fix in get_period_date_ranges
* Test Cases for Analytics Report
2018-11-12 16:15:54 +05:30
Ameya Shenoy
438490fd29
fix: changed currency exchange API to frankfurter
...
- Switched to Frankfurter's public API (frankfurter.app) from
self hosted API (frankfurter.erpnext.org)
2018-11-12 15:15:06 +05:30
Frappe Bot
9159ee83ca
bumped to version 11.0.3-beta.20
2018-11-09 10:19:21 +00:00
Frappe Bot
4df671585b
Merge branch 'master' into staging-fixes
2018-11-09 10:11:27 +00:00
Frappe Bot
f8a5cfe8d8
bumped to version 10.1.70
2018-11-09 10:09:04 +00:00
alsum
852bd76a58
add set_current_asset_value to onload func
2018-11-08 11:12:33 +02:00
rohitwaghchaure
a88eaa6e20
[Fix] User able to change discount if pricing rule has discount value as zero ( #15921 )
2018-11-08 13:05:08 +05:30
Alchez
bf20be53ef
fix(bom): Display item name in new BOM form ( #15783 )
2018-11-08 12:54:20 +05:30
Shreya Shah
9e484fbc12
fix(payment-entry): Take default value None for paid_from ( #15777 )
2018-11-08 12:52:14 +05:30
patilsangram
667f0fbd6d
[fix] Invoice/Delivery note customer po_no overwritten by Sales order null po_no ( #15785 )
2018-11-08 12:51:41 +05:30
Ameya Shenoy
49647bfecc
fix: develop version should be 12 ( #15928 )
2018-11-08 12:48:35 +05:30
Nabin Hait
6ff2f395f5
fix(gle): Post gl entry for booking COGS from Sales Invoice even if grand_total is zero ( #15825 )
2018-11-08 12:30:44 +05:30
Zarrar
5be6d19f4d
[Minor] Display Discount Amount when Tax table is empty ( #15812 )
...
* show discount amount even when tax table is empty
* negate the value for discount while printing
2018-11-08 12:16:26 +05:30
Alchez
068ba191e7
[Feature] Route optimization for Delivery Trip stops ( #15566 )
...
* Minor improvements
* [Feature] Route optimization for Delivery Trip stops
* Process and optimize the entire route, with or without locks
* Form sets of routes for optimization based on applied lock positions
* Re-arrange stops based on the optimized routes and lock positions
* Set delay times between stops - offset estimation times by delays cumulatively
* Fix codacy errors
* Fix travis
* feat(route_optimization): Set estimated route distance from Google Maps
* feat(route_optimization): Add tests for route lists
* feat(route_optimization): Fix tests
2018-11-08 11:57:05 +05:30
Shreya Shah
3f6eb6b393
fix: If party type is Shareholder, set appropriate name field ( #15916 )
2018-11-08 11:51:13 +05:30
Frappe Bot
823e754565
Merge branch 'master' into staging-fixes
2018-11-07 11:26:11 +00:00
Frappe Bot
7f37d26f05
bumped to version 10.1.69
2018-11-07 11:26:10 +00:00
Shreya Shah
c704630d5f
fix: Return default if company not found ( #15915 )
2018-11-06 17:24:45 +05:30
Ameya Shenoy
675636cd03
bumped to version 11.0.3-beta.19
2018-11-06 11:13:36 +00:00
Ameya Shenoy
0c42f99b6f
Merge pull request #15920 from rohitwaghchaure/fix_patch_ascii_code_error
...
[Fix] Patch, ascii codec error
2018-11-06 16:35:21 +05:30
Rohit Waghchaure
56bf39bfea
[Fix] Patch
2018-11-06 16:32:29 +05:30
Ameya Shenoy
65797bca64
Merge branch 'master' into staging-fixes
2018-11-06 11:02:08 +00:00
Ameya Shenoy
a97a520aa8
bumped to version 10.1.68
2018-11-06 11:02:04 +00:00
rohitwaghchaure
9eafe8c23e
Update financial_statements.py
2018-11-06 13:28:18 +05:30
Nabin Hait
614b042ed3
fix(encoding): Fixed encoding issue in financial statements
2018-11-06 11:48:51 +05:30
Faris Ansari
0fb943181e
Merge pull request #15910 from netchampfaris/marketplace-fixes-3
...
Hub fixes
2018-11-05 19:19:23 +05:30
Faris Ansari
d6b664f7ee
fix(hub): Prevent registered actions
2018-11-05 19:18:48 +05:30
rohitwaghchaure
1b2ceadc93
[Fix] Asset date validation ( #15887 )
...
* [Fix] Asset date validation
* Update asset.py
2018-11-05 16:04:04 +05:30
Faris Ansari
0d08da50c6
fix: Refresh PageContainer component based on current route
2018-11-05 15:47:26 +05:30
Nabin Hait
3e6663d47e
fix(serial no): Set supplier info based on pur invoice if serial no is created from Purchase Invoice ( #15820 )
2018-11-05 14:01:59 +05:30
Faris Ansari
a22e16dbe3
Merge pull request #15892 from netchampfaris/marketplace-fixes-1
...
fix: Use frappe.utils.make_event_emitter
2018-11-05 13:48:16 +05:30
Ameya Shenoy
5ed0257ce2
bumped to version 11.0.3-beta.18
2018-11-05 06:50:33 +00:00
Ameya Shenoy
4a75d58d89
Merge branch 'master' into staging-fixes
2018-11-05 06:45:04 +00:00
Ameya Shenoy
59f16bc942
bumped to version 10.1.67
2018-11-05 06:40:25 +00:00
Tyler Matteson
d14e46ef02
Doctypes in domains that are in beta are now restricted to that domain
...
non-profit, agriculture, healthcare, hospitality, education
Please enter the commit message for your changes. Lines starting
2018-11-04 08:39:52 -05:00
Rohit Waghchaure
598d34445f
[Fix] Column ‘claimed_amount’ cannot be null
2018-11-02 16:02:33 +05:30
Faris Ansari
68dbf7f99c
fix: Use frappe.utils.make_event_emitter
2018-11-02 13:30:51 +05:30
rohitwaghchaure
c1d255e7bc
Merge pull request #15882 from Zlash65/fixtds
...
[Minor] TDS not calculated properly fix
2018-11-02 13:18:09 +05:30
Zarrar
16d45c8e2e
safe encode non ascii characters ( #15755 )
2018-11-02 13:17:24 +05:30
Navdeep Ghai
768513f2f9
fixed divided by zero error ( #15885 )
2018-11-02 12:19:05 +05:30
rohitwaghchaure
dcb71a61ad
[Fix] Payment entry not able to submit ( #15859 )
2018-11-02 12:12:42 +05:30
Charles-Henri Decultot
a89bce0b6e
Encoding correction ( #15877 )
2018-11-01 13:18:49 +05:30
Zlash65
ab9852d31a
tds not calculated appropriately
2018-11-01 11:40:15 +05:30
Shreya Shah
9f931780a2
Merge pull request #15868 from ESS-LLP/fix-membership
...
fix: Membership - allow system users to create membership
2018-11-01 10:54:32 +05:30
