deepeshgarg007
c3772f1ac4
minor fix ( #15503 )
2018-09-26 15:55:43 +05:30
Aditya Hase
e20b7cc47d
fix(python3): super() backwards compatibility fix ( #15498 )
2018-09-26 15:39:02 +05:30
Shreya Shah
352e6494f3
Contact and email fields in Payment Entry ( #15490 )
...
* Add contact_person and contact_email fields to Payment Entry
* Minor fix
* Map contact details while making Payment Entry
* Update payment_entry.py
2018-09-26 15:38:34 +05:30
Ameya Shenoy
a7ae06eadb
Merge branch 'staging-fixes' into staging
2018-09-26 08:52:54 +00:00
Ameya Shenoy
90197dd341
bumped to version 11.0.3-beta.2
2018-09-26 08:52:54 +00:00
Ameya Shenoy
41d1982b90
Merge pull request #15501 from codingCoffee/qwe
...
fix(multiple): syntax and patch
2018-09-26 14:12:01 +05:30
Ameya Shenoy
12ec142a69
fix(multiple): syntax and patch
...
- syntax fix for using super class
- check "All Departments" in department name with translations
2018-09-26 14:05:48 +05:30
Ameya Shenoy
47b82789ae
Merge branch 'staging-fixes' into staging
2018-09-26 07:32:44 +00:00
Ameya Shenoy
b8a5fb7392
bumped to version 11.0.3
2018-09-26 07:32:44 +00:00
Ameya Shenoy
9d3a97fd15
Merge branch 'master' into staging-fixes
2018-09-26 07:28:53 +00:00
Ameya Shenoy
0ff35a852a
Merge branch 'hotfix'
2018-09-26 07:26:49 +00:00
Ameya Shenoy
e04431ea5c
bumped to version 10.1.54
2018-09-26 07:26:49 +00:00
deepeshgarg007
86152eb5c8
Sales person Commission Report and more ( #15431 )
...
* Commission For Sales Person
* Changes Made
* Changes made in sales person dashboard and commission report
* Update sales_person_commission_summary.py
2018-09-25 19:08:16 +05:30
rohitwaghchaure
fafc277666
[Fix] BOM update tool, too many writes in one request. Please send smaller requests ( #15432 )
2018-09-25 18:59:20 +05:30
Aditya Hase
865cb88bdd
fix(vscode-intellisense): Make VS Code Intellisense work with ERPNext ( #15453 )
...
__init__.py in apps/erpnext directory confuses vs code.
Causing all erpnext dotted paths to need an extra `erpnext.` for
suggestion and completion to work properly.
This commit fixes this issue.
2018-09-25 18:51:17 +05:30
rohitwaghchaure
fe1e4a41e6
Validate negative stock serial number ( #15492 )
2018-09-25 18:36:32 +05:30
Faris Ansari
7a8c5b0c2c
fix(setup wizard): Validate FY dates ( #15473 )
2018-09-25 18:34:33 +05:30
Aditya Hase
a38b77cbfd
feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion ( #15457 )
...
* feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion
* Update chart_of_accounts.py
2018-09-25 18:10:50 +05:30
Zarrar
b113349f31
minor fix for auto-opt-in for customer ( #15483 )
2018-09-24 14:30:07 +05:30
Shreya Shah
0a95b31aea
Merge pull request #15454 from frappe/coverage-badge
...
Add coverage badge to README.md
2018-09-24 12:25:06 +05:30
Ameya Shenoy
2b5bce0c53
Merge branch 'staging-fixes' into staging
2018-09-21 11:04:20 +00:00
Ameya Shenoy
cdedb27cf0
bumped to version 11.0.2
2018-09-21 11:04:20 +00:00
Zarrar
e83ff38c10
[Enhance] Deferred Expense ( #15437 )
...
* added section for deferred expense in item master
* added default expense account field in Company master
* added deferred expense section in purchase invoice item
* validation and getter code added
* scheduler event to book expense every month
* codacy, import fix and other minor fixes
* rectify debit credit logic for expense
* commonify js code for deferred expense and revenue
* remove deferred calculation and validation
* common file to calculate deferred revenue and expense
* codacy fixes
* expense account root_type - Asset, specific method naming
2018-09-21 15:45:40 +05:30
Aditya Hase
40880da280
fix(readme): Add coverage badge
2018-09-20 17:48:35 +05:30
Aditya Hase
6886c47251
fix(style): Center align badges as well
2018-09-20 17:46:53 +05:30
Aditya Hase
99c8fb19f7
fix(style): Put markdown for badges on separate lines
2018-09-20 17:43:04 +05:30
Saurabh
4ae3fb7a87
Merge branch 'staging-fixes' into staging
2018-09-20 13:30:46 +05:30
Saurabh
3ef12bb7f2
bumped to version 11.0.1
2018-09-20 14:00:46 +06:00
Saurabh
75d90b9d8f
a[resolved] merge-conflicts
2018-09-20 13:28:23 +05:30
Saurabh
056ecdca6a
Merge branch 'hotfix'
2018-09-20 13:22:36 +05:30
Saurabh
3b281a0a1b
bumped to version 10.1.53
2018-09-20 13:52:36 +06:00
Saif
772dc6e82c
Various permission fixes ( #15448 )
...
* Removed test letter head from Consolidated Financial Statement
* Removed incorrect role permissions
2018-09-20 13:20:17 +05:30
rohitwaghchaure
a60ab1af75
[Fix] Salary slip is not saving ( #15449 )
2018-09-20 13:18:49 +05:30
Nabin Hait
8fb04ff1b2
Merge branch 'develop' into staging-fixes
2018-09-20 12:51:26 +05:30
rohitwaghchaure
550fc695f1
[Fix] Precision issue in the accounts receivable report ( #15440 )
2018-09-19 19:03:40 +05:30
Ameya Shenoy
a2f0b34147
fix(item, item default): changed the modified date ( #15442 )
...
The patch move_item_defaults_to_child_table_for_multicompany used to
fail since the doctypes Item and Item Defaults weren't reloaded properly
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-09-19 19:02:52 +05:30
Ameya Shenoy
28fd02e4a8
fix(desktop_icon): remove land unit icon if exists ( #15430 )
...
* fix(desktop_icon): remove land unit icon if exists
Patch to delete the 'Land Unit' icon form 'Desktop Icon' doctype if
exists, since 'Land Unit' has been merged with 'Location'
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
* Update remove_land_unit_icon.py
2018-09-19 13:15:52 +05:30
Faris Ansari
2ab6e0e39b
fix(translations): Replace translations by keyword with indexed version ( #15426 )
...
* fix(translations): Replace translations by keyword with indexed version
Keywords in the translation also gets translated which
results in an error because python cannot find the key
* Update buying_controller.py
2018-09-19 13:13:59 +05:30
Mangesh-Khairnar
0374cc54ba
[bug fix]:stopped orders in progress report ( #15428 )
2018-09-19 13:10:53 +05:30
Nabin Hait
63a58a6752
Merge branch 'staging' into develop
2018-09-18 11:44:42 +05:30
Shreya Shah
13761dde38
[Report] Lead Conversion Time ( #15237 )
...
* New Report Lead Conversion Time
* Add column for support tickets and a row for Average
2018-09-18 10:55:35 +05:30
Jamsheer
c07e8e5b0d
[Fix] Healthcare minor fixes and field rename ( #15413 )
...
* Healthcare practitoiner in Clinical Procedure
* Insert and Update Patient Medical Record from Healthcare DocTypes
* vital signs remove extra columns
* Rename Healthcare Field test_name
* Healthcare Util - get_drugs_to_invoice - fix
* Rename Healthcare Field test_code
* Rename Healthcare Field test_comment
* Rename Healthcare Field test_created
* Rename Healthcare Field test_template
* Rename Healthcare Field test_rate
* Rename Healthcare Field test_description
* Rename Healthcare Field test_groups
* Rename Healthcare Field test_group
* Rename Healthcare Field test_template_type
* Rename Healthcare Field test_uom
* Rename Healthcare Field test_normal_range
* Rename Healthcare Field test_event
* Rename Healthcare Field test_prescription
* Rename Healthcare Field test_particulars
* Patch - Rename healthcare fields
* Sales Invoice - Filter updated for get drugs to invoice
* Patient Appointment - fix - get_event
2018-09-18 10:54:03 +05:30
RicardoJohann
267e806d7f
added description field and changed to one filter datepicker ( #15425 )
2018-09-18 10:48:20 +05:30
JC
31f2c1c3d3
fix ‘BOMItem’ object has no attribute ‘operation’ error in bench run-tests --doctype ‘BOM’ ( #15423 )
2018-09-18 10:47:27 +05:30
Govind S Menokee
d38160c816
[FIX] Remove deprecated gen_object.next() function ( #15418 )
...
BOM tree view was getting impacted due to use of a deprecated function.
This fix replaces deprecated object.next() function with next(gen_object).
2018-09-18 10:42:21 +05:30
Faris Ansari
aa856c474a
fix(setup wizard): Validate FY dates ( #15419 )
...
- start date should be less than end date
2018-09-18 10:42:04 +05:30
Frappe PR Bot
db8c1f254e
[Translation] Updated Translations ( #15414 )
2018-09-17 16:54:30 +05:30
Charles-Henri Decultot
d6bce7429e
Bank statement import corrections ( #15405 )
...
* Bank statement import corrections
* Bank statement corrections
* Missing semi-columns
2018-09-17 12:34:11 +05:30
Zarrar
013493de7a
lable for discount_amount should be configurable ( #15408 )
2018-09-17 11:06:49 +05:30
theopen-institute
ba1c0c900d
Fix potential crash in payment_entry.py ( #15411 )
...
The new code for cost center checking in payment_entry.py crashes if `voucher_type` is `None`, which is an explicit possibility if party type is Employee. This commit adds a simple check to make sure that voucher_type is not None before running `get_doc`.
2018-09-17 10:59:39 +05:30