Prateeksha Singh
39b8765961
[setup][init] setup as document records
2018-12-12 21:29:54 +05:30
Faris Ansari
907e9080c4
fix(product-search): Include variants in product search
2018-12-12 19:26:52 +05:30
Rushabh Mehta
eeab3ee5d3
fix(test): use frappe.db.rollback to revert deletion of fixture data ( #16192 )
...
* debug(test): test_payroll_entry
* debug(test): test_payroll_entry
* debug(test): use frappe.db.rollback to undelete fixture data
2018-12-11 22:37:29 +05:30
Frappe Bot
caed845f3e
bumped to version 11.0.3-beta.29
2018-12-11 09:55:01 +00:00
Pawan Mehta
377511165e
Simple Trial Balance ( #16060 )
2018-12-10 21:55:01 +05:30
Frappe Bot
ee97a46fde
bumped to version 11.0.3-beta.28
2018-12-10 16:05:45 +00:00
Rohan
c1eb94d37f
Revert "fix(delivery): update package total on validate ( #16131 )"
...
This reverts commit f43433b43d
2018-12-10 20:27:14 +05:30
Suraj Shetty
07e5786e1b
Fix user permission checks
2018-12-10 19:10:18 +05:30
Frappe Bot
0509d82701
bumped to version 11.0.3-beta.27
2018-12-10 13:08:33 +00:00
Tyler Matteson
afc55ca821
De-clutter, Regionalize and Domainify Accounts Module Configuration (on staging-fixes) ( #16117 )
2018-12-10 18:03:19 +05:30
Saif
b52bd9c093
AR/AP Report Enhancement ( #16175 )
...
* Modified AR/AP print format
* Filter Sales Person based on either Customer or Voucher's assigned Sales Person
* -Added Sales Person column to Accounts Receivable Summary
-Added all filters in AR/AP Summary Report as in AR/AP Report
-Reordered filters for better grouping
-Fixed a bug that customer_name was not unset after removing Customer from filter
2018-12-10 17:56:42 +05:30
Rohan
f43433b43d
fix(delivery): update package total on validate ( #16131 )
2018-12-10 17:47:31 +05:30
rohitwaghchaure
5472fff027
Added disabled field in the address ( #16114 )
2018-12-10 17:45:39 +05:30
Frappe Bot
65a9991d84
bumped to version 10.1.75
2018-12-10 12:14:33 +00:00
RicardoJohann
bc0ef0beca
Add Serial Number button in Delivery Note and Sales Invoice's Packing List ( #16080 )
2018-12-10 17:43:03 +05:30
rohitwaghchaure
398e47ecad
Merge pull request #16189 from rohitwaghchaure/transferred_qty_issue
...
[Fix] Transferred qty cannot be null
2018-12-10 17:37:02 +05:30
Rohit Waghchaure
57633b75ed
[Fix] Transferred qty cannot be null
2018-12-10 17:36:01 +05:30
Sagar Vora
4c5bd253a2
fix(party dashboard): empty array is truthy, check for length ( #16184 )
2018-12-10 17:19:10 +05:30
Rohan
39b31ece31
fix(pos): Return empty dict if no results found ( #16124 )
2018-12-10 17:16:39 +05:30
Deepesh Garg
0c3c148316
Linking company address to pos profile ( #16142 )
...
* Linking company address to pos profile
* Translation fix
2018-12-10 16:22:38 +05:30
Nabin Hait
3248e0bb3e
Merge pull request #16163 from netchampfaris/hotfix-setupwizard-abbr
...
fix(setup-wizard): Validate abbr length before switching to next slide
2018-12-07 15:20:23 +05:30
Nabin Hait
da9c96e9f5
Merge pull request #16150 from rohitwaghchaure/what_is_the_use_of_this_code
...
Removed unnecessary code
2018-12-07 15:18:11 +05:30
Nabin Hait
1b529d997c
Merge pull request #16146 from rohitwaghchaure/remove_tax_amt_from_the_billed_amt_in_project
...
[Fix] In project, tax amount is added in the total billed amount(sales) field
2018-12-07 15:17:35 +05:30
Nabin Hait
2bd6ab9fba
Merge pull request #16140 from KanchanChauhan/staging-fixes
...
[Minor]Method path fix in Material Request js
2018-12-07 15:08:44 +05:30
Deepesh Garg
6967b44ac8
Merge branch 'hotfix' into list_view
2018-12-07 08:30:20 +05:30
Frappe Bot
4f1c659050
bumped to version 11.0.3-beta.26
2018-12-06 09:50:24 +00:00
Frappe Bot
ee5d7e6d0f
Merge branch 'master' into staging-fixes
2018-12-06 09:26:42 +00:00
Frappe Bot
be0a349a52
bumped to version 10.1.74
2018-12-06 09:14:35 +00:00
Nabin Hait
32c95c3292
Merge pull request #16113 from nabinhait/travis-fix
...
fix(test): Fixed tests for discount with margin and period closing voucher
2018-12-06 11:58:56 +05:30
Faris Ansari
40c15348da
fix(setup-wizard): Validate abbr length before switching to next slide
2018-12-06 07:37:32 +05:30
rohitwaghchaure
f85856d9f8
Merge pull request #16155 from rohitwaghchaure/changed_parent_for_item_attribute_value
...
[Fix] Permissions issue
2018-12-04 18:45:07 +05:30
Rohit Waghchaure
675567419b
[Fix] Permissions issue
2018-12-04 18:43:52 +05:30
Rohit Waghchaure
e61430b471
Removed unnecessary code
2018-12-03 18:54:26 +05:30
Rohit Waghchaure
636d186d08
[Fix] In project, tax amount is added in the total billed amount(sales) field
2018-12-03 16:04:08 +05:30
deepeshgarg007
114cc810a0
List view currency bug fix
2018-12-03 15:13:06 +05:30
Kanchan Chauhan
9dc85153e0
[Minor]Method path fix in Material Request js
2018-12-03 14:39:43 +05:30
Nabin Hait
3ecb995485
Merge pull request #16006 from gbm001/gbm001-item-barcodes-pull
...
fix/feat: Allow extension of barcode types (without validation)
2018-12-03 14:39:14 +05:30
Nabin Hait
94eafb6674
Merge pull request #16005 from ESS-LLP/pr_staging_fixes
...
[Feature][Fix] Healthcare - Patient Appointment
2018-12-03 14:38:32 +05:30
Nabin Hait
046a99acf8
Merge branch 'staging-fixes' into supplier-customer-dashboard-fix
2018-12-03 14:36:38 +05:30
Nabin Hait
02aad03e74
Merge pull request #16022 from ESS-LLP/fix-patch
...
fix: healthcare patch
2018-12-03 14:36:02 +05:30
Nabin Hait
6b93f2fe0a
Merge pull request #16139 from Zlash65/fix-assess
...
[Minor] Assessment Result fix
2018-12-03 14:33:01 +05:30
Nabin Hait
0b4ea25f83
Merge pull request #16138 from rohitwaghchaure/user_permissions_issue_item
...
[Fix] Permissions issue while making item variants
2018-12-03 14:32:40 +05:30
Nabin Hait
dd7b020b01
fix(test): Fixed tests for period closing voucher
2018-12-03 14:24:41 +05:30
Nabin Hait
dce68422a7
Merge pull request #16133 from rohitwaghchaure/fixed_stock_value_diifference_calculation_for_stock_reco
...
[Fix] Stock value difference calculation for stock reconciliation
2018-12-03 14:20:40 +05:30
Zlash65
db43c3af68
display message if details to fetch grade isnt filled up
2018-12-03 12:15:10 +05:30
Rohit Waghchaure
a8003c1af7
[Fix] Permissions issue while making item variants
2018-12-03 11:49:52 +05:30
deepeshgarg007
4c79274054
Fixed patch and deprecated grid reports
2018-11-30 18:01:22 +05:30
deepeshgarg007
ec5bbe351c
Row check fix for purchase analytics
2018-11-30 16:25:16 +05:30
Rohit Waghchaure
16b8ecbe05
[Fix] Stock value difference calculation for stock reconciliation
2018-11-30 16:20:52 +05:30
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
