Rushabh Mehta
92bb786320
[fix] .travis.yml
2018-05-25 14:47:01 +05:30
Nabin Hait
f87ec61043
Test case fixes for item defaults
2018-05-24 18:19:21 +05:30
Nabin Hait
b903fc4e71
Item defaults query fixes
2018-05-24 17:07:51 +05:30
Prateeksha Singh
05283b8af0
[fix] distribution page embed
2018-05-24 16:17:22 +05:30
Zarrar
ea064d4c5c
module import fix in patch ( #14203 )
2018-05-24 15:54:48 +05:30
Achilles Rasquinha
2ec5b5ed8e
bench init with preferred Python EXEC for CI ( #13336 )
...
* bench_init.sh added python executable flag for environment setup
* Added future python build matrix
* udpate build matrix
* Update .travis.yml
* Update .travis.yml
2018-05-24 15:16:12 +05:30
Ameya Shenoy
95e60927b4
Merge branch 'master' into develop
2018-05-24 08:45:14 +00:00
Ameya Shenoy
7ad556cd4c
Merge branch 'hotfix'
2018-05-24 08:45:12 +00:00
Ameya Shenoy
475729cefe
bumped to version 10.1.35
2018-05-24 08:45:12 +00:00
neckos
7663bb91c5
return list(filter()) not filter() ( #14191 )
...
filter constructs an iterator that is iterable only once
2018-05-23 19:45:34 +05:30
neckos
225af4a4cb
unicode error in python3 ( #14192 )
2018-05-23 19:43:53 +05:30
Manas Solanki
f7713ebfa7
[optimize] introduce two filter in the report in order to handle large item master data ( #14193 )
2018-05-23 19:43:04 +05:30
Nabin Hait
5f861756a2
Item Default fixes
2018-05-23 19:37:06 +05:30
Nabin Hait
d5cb4c10a1
Set parent department if missing and not root itself
2018-05-23 18:36:18 +05:30
Rushabh Mehta
315dbd2ed1
[minor] chart_of_accounts.py for python3
2018-05-23 16:14:35 +05:30
Rushabh Mehta
f7414519bb
[fix] set default supplier group in test
2018-05-23 16:14:35 +05:30
Rushabh Mehta
8788688431
[fix] inconsistent indentation
2018-05-23 16:14:35 +05:30
Nabin Hait
46600406b8
Update rename_field_max_days_allowed.py
2018-05-23 13:12:24 +05:30
Achilles Rasquinha
efb731941d
ran 2to3, evaluation ( #13499 )
...
* ran 2to3, evaluation
* Update update_gstin.py
* Update accounts_receivable_summary.py
2018-05-23 11:31:24 +05:30
Zarrar
c141eb00ee
[Enhance] Department added wherever applicable ( #14121 )
...
* set All Department as default parent_department
* add department field in employee_transfer
* copied data from options to fetch_from
* add department field wherever employee's link field present
* empty options field where fetch_from is added
2018-05-23 11:11:36 +05:30
Deepak kumar
e4c2ef03e1
Link Share Transfer to Account ( #14127 )
...
* Link Share Transfer to Account
* minor changes
* minoor changes
2018-05-23 10:50:22 +05:30
OSS Technolab
4fb4ca6b10
Project Budget does not filter per Project ( #14179 )
...
* Project Budget does not filter per Project
Project Budget does not filter per Project and always return actual expense amount of all entries tagged to a project.
* Update budget.py
2018-05-23 10:47:53 +05:30
Prateeksha Singh
2f69254e56
[company][dashboard] implement heatmap with linked doctypes ( #14185 )
...
* [company][dashboard] implement heatmap with linked doctypes
* [company][dashboard] cache transaction history data, schedule query daily
2018-05-23 10:41:26 +05:30
Suraj Shetty
e03937fd6a
Send daily work summary alert to only enabled users ( #14175 )
...
* Send daily work summary alert to only enabled users
* Fix import
2018-05-23 10:32:55 +05:30
Faris Ansari
26eb513274
Rename occurences of max_days_allowed to max_continuous allowed ( #14180 )
2018-05-23 10:31:39 +05:30
Faris Ansari
83149644e3
Merge pull request #14160 from shreyashah115/patches-fixes-travis
...
Fix patches for Travis
2018-05-22 15:26:49 +05:30
Faris Ansari
7a5221bd95
Add rename_field
2018-05-22 15:26:21 +05:30
Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop
2018-05-22 09:18:38 +00:00
Ameya Shenoy
92640cc899
Merge branch 'hotfix'
2018-05-22 09:06:38 +00:00
Ameya Shenoy
826f020862
bumped to version 10.1.34
2018-05-22 09:06:38 +00:00
Prateeksha Singh
b44ea4c8dc
[website] Support Portal ( #14144 )
...
* [init] support portal
* [support-portal] Get started sections and forum activity
* [support-portal] integrate API search for forums, docs, etc
* [support-portal] integrate doctype docs search via global search
* [support-portal] /help page UI
2018-05-22 11:57:21 +05:30
rohitwaghchaure
24a169efb6
Merge pull request #14176 from rohitwaghchaure/inter_company_invoice_reference_issue
...
[Fix] 'SalesInvoice' object has no attribute 'inter_company_invoice_reference'
2018-05-22 11:56:33 +05:30
Rohit Waghchaure
7529bbb7b4
[Fix] 'SalesInvoice' object has no attribute 'inter_company_invoice_reference'
2018-05-22 11:55:48 +05:30
Zarrar
93a186aa11
fetch customer_gstin or billing_address_gstin optionally ( #14075 )
2018-05-22 09:16:42 +05:30
rohitwaghchaure
742d3e5549
[Fix] General ledger default_currency issue for member party type ( #14172 )
2018-05-22 09:10:01 +05:30
mnatalia
5f0e8d6e09
Added possibility to translate ( #14173 )
2018-05-22 09:08:50 +05:30
rohitwaghchaure
b1036e5582
Merge pull request #14171 from rohitwaghchaure/fixed_patch_v11_salary_structure_assignment
...
[Fix] Patch
2018-05-21 18:52:48 +05:30
Rohit Waghchaure
8e12a59d9b
[Fix] Patch
2018-05-21 18:52:07 +05:30
rohitwaghchaure
3ec43966da
Merge pull request #14170 from codingCoffee/sal
...
salary structure patch run if active employee
2018-05-21 18:39:10 +05:30
Ameya Shenoy
a7d402132f
salary structure patch run if active employee
2018-05-21 18:38:18 +05:30
Prateeksha Singh
bcbe32ce7c
Merge pull request #14169 from pratu16x7/hotfix
...
[hotfix][charts] update, without new build system
2018-05-21 18:31:39 +05:30
Prateeksha Singh
b434f2687e
[charts] update, without new build system
2018-05-21 18:04:50 +05:30
Manas Solanki
6488d740c6
Merge pull request #14167 from frappe/manassolanki-patch-7
...
Remove the debugger from the material_request.js
2018-05-21 17:29:03 +05:30
Manas Solanki
a96421279d
Remove the debugger from the material_request.js
2018-05-21 17:27:01 +05:30
rohitwaghchaure
734b874f3e
Merge pull request #14166 from rohitwaghchaure/version_11_patch_budget
...
[Fix] Patch, default cost center, expense account for the item
2018-05-21 17:18:58 +05:30
Faris Ansari
d2b4ec5044
[fix] Set null values to '0' before changing column type
2018-05-21 16:55:31 +05:30
Zlash65
004bf218a0
remove changes for max_days_allowed patch
2018-05-21 16:52:08 +05:30
Rohit Waghchaure
0ca7ba3247
[Fix] Patch, default cost center, expense account for the item
2018-05-21 16:43:50 +05:30
Faris Ansari
e479057148
Merge pull request #14165 from codingCoffee/min
...
relieving_date wasnt of type datetime
2018-05-21 16:42:41 +05:30
Ameya Shenoy
35984daf72
relieving_date wasnt of type datetime
2018-05-21 16:37:27 +05:30