Jamsheer
c1ae88ba02
Employee Benefit Calim - earning component filter updated
2018-05-25 12:42:20 +05:30
Jamsheer
c5629efe0e
Employee Benefit Application - refactor validation
2018-05-25 12:42:20 +05:30
Jamsheer
9d5d328a4f
Salary Structure - validate flexi with max benefit
2018-05-25 12:42:20 +05:30
Jamsheer
65a5e47e68
Payroll Period - validate dates and overlap
2018-05-25 12:37:36 +05:30
Jamsheer
cf414cc499
Payroll Period - fields refactor
2018-05-25 12:37:36 +05:30
Jamsheer
2ee211ad21
Salary Structure - validate max benefits with flexi
2018-05-25 12:37:36 +05:30
Jamsheer
ce7310255e
Salary Structure - filter for earnings
2018-05-25 12:37:36 +05:30
Jamsheer
43e191289c
Employee Benefit Application - earning component filter by salary structure flexi component
2018-05-25 12:37:36 +05:30
Jamsheer
77a91f0d01
Salary Component - account mandatory for separate payment entry
2018-05-25 12:37:36 +05:30
Jamsheer
1248f6a752
Codacy fix
2018-05-25 12:37:36 +05:30
Jamsheer
0493c22f3c
Additional Salary Component - filter updated - salary_component
2018-05-25 12:37:35 +05:30
Jamsheer
f647aa15af
Salary Component - fields - refactor fields behaviour
2018-05-25 12:37:35 +05:30
Jamsheer
334bd189a7
Employee Benefit Application - filter updated - earning component
2018-05-25 12:37:35 +05:30
Jamsheer
da24722beb
Employee Benefit Claim - filter for earning component
2018-05-25 12:37:35 +05:30
Jamsheer
ce88bdf005
Employee Benefit Claim - Validation Updated - Code refactor
2018-05-25 12:37:35 +05:30
Nabin Hait
f87ec61043
Test case fixes for item defaults
2018-05-24 18:19:21 +05:30
Ranjith Kurungadam
27cf190269
healthcare fix - str encode to utf-8 ( #14213 )
2018-05-24 17:15:22 +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
Ameya Shenoy
95e60927b4
Merge branch 'master' into develop
2018-05-24 08:45:14 +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
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
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
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
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
Manas Solanki
a752eca82c
Merge pull request #14163 from manassolanki/fix-20
...
[fix] don't update the modified of item price while updating item
2018-05-21 16:37:01 +05:30
rohitwaghchaure
22619a8e0c
Merge pull request #14164 from rohitwaghchaure/fixed_alias_issue
...
[Fix] Unknown column 'i.stock_uom' in 'field list'
2018-05-21 16:22:23 +05:30
Rohit Waghchaure
abc6cf0aa5
[Fix] Unknown column 'i.stock_uom' in 'field list'
2018-05-21 16:18:37 +05:30
Manas Solanki
b5d9b38dee
don't update the modified of the item price
2018-05-21 15:40:51 +05:30
Rohit Waghchaure
11e2a9ac90
[Fix] Permission issue while saving leave application
2018-05-21 15:39:38 +05:30
Zlash65
41cb6cc491
patch fix - skip query if no when_then case
2018-05-21 15:10:06 +05:30
Shreya
70f9d07df8
Fix patches for Travis
2018-05-21 15:04:13 +05:30
Faris Ansari
6d2dfac44e
[fix][patch] Shopify ( #14159 )
2018-05-21 14:41:11 +05:30
rohitwaghchaure
1275ea5123
Merge pull request #14154 from rohitwaghchaure/set_default_leave_approver
...
Set leave approver in the leave application
2018-05-21 11:58:41 +05:30
Nabin Hait
19ce904030
Report added in Selling module
2018-05-21 11:07:04 +05:30
Nabin Hait
2cfc247d88
customers without any sales transactions
2018-05-21 11:03:02 +05:30
Nabin Hait
1bf2576e0e
Merge branch 'erpnext_issue_13818' of https://github.com/asbasawaraj/erpnext into asbasawaraj-erpnext_issue_13818
2018-05-21 10:47:40 +05:30
Valmik
bfb8a73377
Append company after ( #14119 )
2018-05-21 10:44:35 +05:30
asbasawaraj
5f6b44e142
Formatted chapter member display ( #14128 )
2018-05-21 10:31:45 +05:30
Shridhar Patil
4c790488ea
job opening designation made mandatory ( #14153 )
2018-05-21 10:30:17 +05:30
Valmik
c28378f448
[fix] get barcode string instead of dict ( #14139 )
...
* [fix] get barcode string instead of dict
* Update pos.py
2018-05-21 10:06:05 +05:30
Rohit Waghchaure
812224e56e
Set leave approver in the leave application
2018-05-20 21:21:33 +05:30
Manas Solanki
f87762887a
fetch defualt supplier from the item table ( #14113 )
2018-05-20 10:58:26 +05:30
Zarrar
42231df33a
[Minor] Supplier Group test fix & default supplier in item fix ( #14150 )
...
* fix supplier group test
* item - default_supplier fix
2018-05-20 10:46:10 +05:30
Zarrar
1f3f18534b
[Fix] Leave Application & Expense Claim query fix | Leave Balance Report fix ( #14149 )
...
* move set_query to setup function
* rectify leave balance report according to deparmtent changes
2018-05-20 10:45:14 +05:30
Gaurav Naik
8f17281011
Initialized dynamic link on Warehouse ( #14135 )
...
* Initialized dynamic link for Warehouse
* Codacy Fixes
2018-05-20 10:39:14 +05:30
rohitwaghchaure
d08ac1fe79
Merge pull request #14136 from rohitwaghchaure/multiple_fixes_for_v11
...
Fixes in material request, asset maintenance
2018-05-18 16:39:48 +05:30
Rohit Waghchaure
73a99441ca
Fixed get_query for default data in item
2018-05-18 16:39:08 +05:30
Rohit Waghchaure
6cdaa6e861
Fixes in material request, asset maintenance
2018-05-18 16:30:14 +05:30
Manas Solanki
d976c04b69
Merge pull request #14134 from manassolanki/fix-salary-patch
...
[fix] patch for the salary structure assignment for old employees
2018-05-18 15:47:14 +05:30
Manas Solanki
33c1a38dc8
[fix] patch for the salary structure assignment for old employees
2018-05-18 15:46:35 +05:30
rohitwaghchaure
7d834b946f
Merge pull request #14117 from shreyashah115/fixes
...
Fix patch
2018-05-18 12:45:06 +05:30
Rohit Waghchaure
f61e94e162
Changed condition of finance book in reports
2018-05-18 09:10:07 +05:30
Rohit Waghchaure
f689d01a0c
Added finance book in Asset Depreciation Ledger report, fixed asset issue
2018-05-17 23:29:37 +05:30
Prateeksha Singh
984a7a7e61
[item-query] change order of description terms, name first
2018-05-17 17:29:36 +05:30
Shreya
65dd1f6b4c
Mark attendance only if to_date <= nowdate in Leave Application
2018-05-17 17:13:56 +05:30
Basawaraj
6d334b8135
Added Report : Customers Without Any Sales Transactions
2018-05-17 16:54:03 +05:30
Shreya
362e0a9f6e
Fix patch
2018-05-17 15:43:03 +05:30
Rohit Waghchaure
f2ccde0454
[Fix] Heatmap issue in the project
2018-05-17 15:40:32 +05:30
rohitwaghchaure
8c6b7557db
Merge branch 'develop' into jam_enterprise_emp_benefit
2018-05-17 14:08:06 +05:30
rohitwaghchaure
4444430200
Merge pull request #14108 from ESS-LLP/tax_deduction
...
Variable tax deduction
2018-05-17 13:55:52 +05:30
Valmik Jangla
b52d5b21a1
Add UOM to Item View with Price
2018-05-17 00:09:21 -07:00
Faris Ansari
9e4889d756
[fix] Stock Ledger report item filter
...
- breaks when Item Code contains % symbol
2018-05-17 12:18:28 +05:30
rohitwaghchaure
d2f0d08234
Merge pull request #14105 from Zlash65/fix-dept
...
[Minor] Typo in Employee Transfer
2018-05-17 11:23:52 +05:30
Rohit Waghchaure
992fb34c95
[Fix] Asset adjustment issues
2018-05-17 11:22:59 +05:30
Ranjith
fcfb5a3769
Merge remote-tracking branch 'frappe/develop' into develop
2018-05-17 10:07:23 +05:30
Ranjith
58363e6bbd
get_payroll_period return name, fix hard coded leave period
2018-05-17 10:00:33 +05:30
Zlash65
e3f7e8b101
typo in frappe.throw in employee_transfer
2018-05-17 01:34:35 +05:30
Rohit Waghchaure
585945e65d
Allow to select Asset Received But Not Billed in expense account head
2018-05-17 00:23:27 +05:30
rohitwaghchaure
e8ef69ec33
Merge pull request #14103 from rohitwaghchaure/asset_validation_issue_for_multiple_qty
...
[Fix] Validation issue
2018-05-16 23:58:09 +05:30
Rohit Waghchaure
2868840e6b
[Fix] Validation issue
2018-05-16 23:57:28 +05:30
Rohit Waghchaure
44fda65b1d
[Fix] Company mandatory issue
2018-05-16 23:31:09 +05:30
Ranjith
31eeff00f7
merge frappe/develop
2018-05-16 23:24:34 +05:30
Rohit Waghchaure
a91765707a
[Fix] TDS issue
2018-05-16 23:13:02 +05:30
Ranjith
b485b1ef80
Salary Slip calc tax, except for flexi benefits
2018-05-16 23:01:40 +05:30
Ranjith
c6b2575a9c
fields in salary detail, copy data from salary component on change
2018-05-16 22:59:21 +05:30
rohitwaghchaure
274f890246
Merge pull request #14099 from rohitwaghchaure/fixed_asset_date
...
Multiple fixes in asset
2018-05-16 22:13:15 +05:30
Rohit Waghchaure
e6acd4c57a
Multiple fixes in asset
2018-05-16 22:12:39 +05:30
rohitwaghchaure
64e81b436e
Merge pull request #14098 from rohitwaghchaure/minor_button_not_showing
...
[Fix] Custom buttons not showing
2018-05-16 21:45:12 +05:30
Rohit Waghchaure
976af6b422
[Fix] Cystom buttons not showing
2018-05-16 21:43:16 +05:30
rohitwaghchaure
660ca9b6c0
Merge pull request #14097 from rohitwaghchaure/purchase_invoice_gl_entry_issue
...
[Fix] Gl Enrty issue
2018-05-16 21:34:44 +05:30
Rohit Waghchaure
1a328d02d2
[Fix] Gl Enrty issue
2018-05-16 21:34:06 +05:30
rohitwaghchaure
513cd189f0
Merge pull request #14095 from rohitwaghchaure/leave_application_issue_v11
...
[Fix] onload set default employee, leave approver, company
2018-05-16 19:57:09 +05:30
Rohit Waghchaure
8e4f676c8c
[Fix] onload set default employee, leave approver, company
2018-05-16 19:55:52 +05:30
Jamsheer
8b86d18f73
Remove unused imports
2018-05-16 19:50:30 +05:30
Jamsheer
3434aabc28
Employee Benefit Claim in Salary Slip
2018-05-16 19:50:30 +05:30
Jamsheer
3abae9c1ba
Employee Benefit Application - whitlist method get_max_benefits
2018-05-16 19:50:30 +05:30
Jamsheer
3e64297a3d
Employee Benefit Application - validate maximun benefit
2018-05-16 19:50:30 +05:30
Jamsheer
3cd0ad4c98
Codacy fixes
2018-05-16 19:50:30 +05:30
Jamsheer
c9287b5b88
Manage grouping of salary component for flexible benefit
2018-05-16 19:50:30 +05:30
Jamsheer
6410022cab
minor fixes
2018-05-16 19:49:39 +05:30
Jamsheer
c678d037e7
Salary slip - throw if no default flexi component
2018-05-16 19:49:39 +05:30
Jamsheer
5f6e274505
Salary slip - default flexi component
2018-05-16 19:49:39 +05:30
Jamsheer
43740a6511
Employee Benefit Application - employee benefit in salary slip
2018-05-16 19:49:39 +05:30
Jamsheer
0bc665c0a5
Salary Copmonent - Default flexible componnent
2018-05-16 19:49:39 +05:30
Jamsheer
15613e46ad
Salary Copmonent - Defualt flexible componnent
2018-05-16 19:48:47 +05:30
Jamsheer
d63c39a514
Payroll Period - get payroll period days
2018-05-16 19:47:18 +05:30
Jamsheer
d66fb842c1
Employee Benefit Application - validate max benefit for employee
2018-05-16 19:47:18 +05:30
Jamsheer
2d6901d5dc
Employee Benefit Application - validate max benefit amount for component
2018-05-16 19:47:18 +05:30
Jamsheer
9cb2fc2766
Employee Benefit Application - calcluate benefit amount
2018-05-16 19:47:18 +05:30
Jamsheer
d48998bae1
Employee Benefit Application - Calculate benefit amounts
2018-05-16 19:47:18 +05:30
Jamsheer
779f8ebbb3
Employee Benefit Application - get max benefit
2018-05-16 19:47:18 +05:30
Jamsheer
41616de9cc
Employee Benefit Application - validate duplicate
2018-05-16 19:47:18 +05:30
Jamsheer
9cd292b187
Employee Benefit Application - filter updated
2018-05-16 19:47:18 +05:30
Jamsheer
4d93d339f7
Employee benefit - filters fro earning component
2018-05-16 19:47:18 +05:30
Ranjith
29e0ed3da1
Exemption Declaration - field total_amount
2018-05-16 19:10:35 +05:30
Manas Solanki
df0ffab16c
Merge pull request #14093 from manassolanki/poc-fixes-1
...
[ui] more fields in the list view of assets
2018-05-16 18:25:37 +05:30
Manas Solanki
f3f1ba37b9
[ui] more fields in the list view of assets
2018-05-16 18:24:35 +05:30
rohitwaghchaure
4ea97c84ac
Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual
...
[Fix] Asset gl entry not creating for non perpetual
2018-05-16 18:21:20 +05:30
Rohit Waghchaure
421697250b
[Fix] Asset gl entry not creating for non perpetual
2018-05-16 18:20:52 +05:30
Manas Solanki
5b34c00ba6
Added the travel request on the config page
2018-05-16 18:09:43 +05:30
Manas Solanki
fa57cdd86d
Merge pull request #14090 from manassolanki/poc-fixes
...
create item default on making of invoice
2018-05-16 17:46:53 +05:30
Manas Solanki
5b93562ce3
create default on making of invoice
2018-05-16 17:44:51 +05:30
rohitwaghchaure
19a2260ce7
Merge pull request #14089 from shreyashah115/fixes
...
[Fix] General Ledger report filters error
2018-05-16 17:41:19 +05:30
Shreya
63d14cfac8
Instead of throwing error, just return
2018-05-16 17:30:58 +05:30
Shreya
df9516e906
Add Finance Book to route options
2018-05-16 17:30:35 +05:30
Manas Solanki
e3bb1d0e3b
more fixes for the item defaults
2018-05-16 17:14:59 +05:30
Manas Solanki
38667ab8da
return defaults according to the company
2018-05-16 17:00:05 +05:30
Rohit Waghchaure
b233e9d643
[Fix] Multiple fixes
2018-05-16 16:41:34 +05:30
Manas Solanki
028e2ad246
Merge pull request #14083 from frappe/codingCoffee-patch-3
...
spaces to tabs
2018-05-16 16:25:25 +05:30
rohitwaghchaure
de796266f2
Merge pull request #14084 from shreyashah115/fixes
...
[minor] Fix error
2018-05-16 16:21:14 +05:30
rohitwaghchaure
9c0a87e804
Merge pull request #14082 from manassolanki/item-fixes
...
[fixes] fix in the item defaults
2018-05-16 16:19:39 +05:30
Manas Solanki
e3910fb2a6
[fixes] fix in the item defaults
2018-05-16 16:16:34 +05:30
Shreya
fda15702bc
Fix error
2018-05-16 16:14:34 +05:30
Ameya Shenoy
6e92958578
spaces to tabs
2018-05-16 16:11:20 +05:30
Rohit Waghchaure
23942701f1
[Fix] 'PurchaseInvoiceItem' object has no attribute 'company'
2018-05-16 15:41:00 +05:30
Manas Solanki
8e184569a1
Update item.json
2018-05-16 15:11:52 +05:30
rohitwaghchaure
9122f19e69
Merge pull request #14079 from saurabh6790/TDS_sprint
...
[fix] calculate withholding only on invoice
2018-05-16 15:01:46 +05:30
Saurabh
3c204122cd
[fix] calculate withholding only on invoice
2018-05-16 15:00:19 +05:30
Manas Solanki
b81ece9ddf
Merge pull request #14076 from chdecultot/pricing_rule
...
Missing parentheses in price list rate determination
2018-05-16 14:55:32 +05:30
Manas Solanki
4534df36a9
Merge pull request #14078 from manassolanki/pos-fix
...
[enterprise] minor fixes
2018-05-16 14:53:21 +05:30
Manas Solanki
4256a34220
[enterprise] minor fixes
...
make the employee name mandatory in the employee onboarding
added the retention bonus amount
2018-05-16 14:51:25 +05:30
Manas Solanki
9b53b93e37
Merge pull request #14077 from manassolanki/travel-request
...
[rename] Photo ID -> Identification Document
2018-05-16 14:13:13 +05:30
Manas Solanki
6eb7f346bd
[rename] Photo ID -> Identification Document
2018-05-16 14:12:22 +05:30
Charles-Henri Decultot
2f822476dd
Removal of debugging print
2018-05-16 08:40:16 +00:00
rohitwaghchaure
9ad0ac9557
Merge pull request #14068 from manassolanki/travel-request
...
[feature] added travel request doctype in HR
2018-05-16 14:05:26 +05:30
rohitwaghchaure
eff678d2d6
Merge pull request #13918 from manassolanki/item-level-defualts
...
[enhancement] add the item defaults in the child-table for multi-company
2018-05-16 14:04:47 +05:30
Charles-Henri Decultot
dcfe19d868
Missing parentheses in price list rate determination
2018-05-16 08:34:41 +00:00
Suraj Shetty
fbb6b3da5f
Undo replace of frappe.db.sql with frappe.get_list ( #14074 )
2018-05-16 13:53:31 +05:30
lasalesi
265005d30d
apply sorting for make multiple variant attributes ( #14073 )
2018-05-16 13:10:25 +05:30
Ranjith Kurungadam
cdd4704485
Fixes, fields in Salary Component ( #14071 )
...
* remove duplicate fields
* Salary Component - fields is_tax_applicable, is_payable
* fix intendation
2018-05-16 13:10:08 +05:30
Rushabh Mehta
e07b332514
fix for tests
2018-05-16 13:05:13 +05:30
Manas Solanki
64614374d8
fix codacy
2018-05-16 13:00:56 +05:30
Manas Solanki
bbd8508783
optimize the patch
2018-05-16 13:00:56 +05:30
Manas Solanki
b16a4ec79e
changes for the default cost center
2018-05-16 13:00:56 +05:30
Rushabh Mehta
0b628386de
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
Manas Solanki
087a2259d9
update for default warehouse
2018-05-16 12:44:07 +05:30
Manas Solanki
c760222a6c
add the item defaults in the childtable for multicompany
2018-05-16 12:44:06 +05:30
Rohit Waghchaure
909069fa20
[Fix] 'Supplier' object has no attribute 'on_hold'
2018-05-16 12:25:51 +05:30
Ranjith
4bbf705e58
fix intendation
2018-05-16 12:17:57 +05:30
Ranjith
db120fb0bc
Salary Component - fields is_tax_applicable, is_payable
2018-05-16 12:17:16 +05:30
Rohit Waghchaure
144e9b178a
Added project condition in budget validation
2018-05-16 12:15:57 +05:30
Ranjith
447f0e495a
remove duplicate fields
2018-05-16 12:13:46 +05:30
Rushabh Mehta
b56f3d0689
[fix] syntax errors
2018-05-16 12:03:39 +05:30
Saurabh
d60c0f2292
Refactor shopify ( #13588 )
...
* move shopify settings to ERPNext
* [fix] setup webhook for order and validate webhook request
* validate webhook request
* sync customer and item if not exists while syncing order from shopify
* pull item from shopify and minor fixes
* fix method naming, mechanisim to register and withdraw webhooks, patch
* minor fix
* minor fixes
* [Patch][fix] use remove_from_installed_apps instead of remove app
* log exceptions
* add shopify logging for failed requests
* minor fixes
* fix test case
* codecy fixes
* check shared secret exists
* Test Case fixes
* UX fixes and patch fixes
* Documentation
* fixes
* [fix] dump webhooks request data into doctype
* Provision to resync the order if error occured in sync
* [fix] set default host
2018-05-16 11:33:47 +05:30
tundebabzy
ad08d4ce96
Ability to hold payment for disputed invoices #12048 ( #13298 )
...
* add new fields to Supplier Master:
- on_hold: To signal the Customer is blocked from completing certain transactions
- hold_type: 3 options - All, invoices and payments
* sanitize `on_hold` field input
* show hold status in list view
* add `release_date` field to Supplier Master:
- specifies the date when transaction restraint will be removed
* reset release date if supplier is not on hold
* add validation to stop transactions when Supplier is blocked
* add test cases
* return empty list for outstanding references if supplier is blocked
* block make button:payment if supplier is blocked
* adjust test cases
* PEP 8 clean up
* more tests
* adds new fields to Purchase Invoice:
- release_date: once set, invoice will be on hold until set date
- hold_comment: so user can add comment pertaining to why invoice is on hold
* implement individual purchase invoice on hold logic
* allow user to change release date
* update manual
* final cleanup including more validation and tests
* update supplier manual
* make default for release_date argument todays date
* remove Auto Repeat added by mistake
* add on_hold_field to purchase invoice
* add 'On Hold' or 'Temporarily on Hold' status for purchase invoice in list view
* implement explicit payment hold in purchase invoice
* update manual
* add dialog for saving comment
* bug fix, refactor, clean up
* more test cases
2018-05-16 11:31:41 +05:30
Shreya Shah
4f40b2dca5
[Fix] Sales Person Reports ( #13987 )
...
* Fix Sales Person Reports
- Show quantity and amounts based on the delivered quantities if the Sales Order has been closed and all quantities weren't considered for further transactions.
* Fix codacy
* Modify as per the review comment
2018-05-16 11:22:59 +05:30
Shreya Shah
1906cadd94
[Fix] Currency field in Pricing rule ( #14004 )
...
* some minor changes
* Set query for price list based on currency
* Validate Price list with currency
2018-05-16 11:20:30 +05:30
rohitwaghchaure
557f40465b
Merge pull request #14067 from shreyashah115/fixes
...
[minor] Fix typo
2018-05-16 11:12:11 +05:30
rohitwaghchaure
e48b47fc0c
Production Plan, do not consider the sales orders against which work order has been created ( #13800 )
...
* Production Plan, do not consider the sales orders against which work order has been created
* Added test cases
2018-05-16 11:07:55 +05:30
Shreya
2a1bcf285b
[minor] Fix typo
2018-05-16 11:06:02 +05:30
Manas Solanki
d11b5d398d
[feature] added travel request doctype in HR
2018-05-16 11:02:28 +05:30
rohitwaghchaure
e8358f33a3
Refactor party type ( #13831 )
2018-05-16 11:02:26 +05:30
Doridel Cahanap
e42192bb6c
[WIP] Alternative items ( #13705 )
...
* Alternative Items in BOM
* Alternative Items in Work Order
2018-05-16 10:58:39 +05:30
Jamsheer
0cde6ae3c5
Clinical procedure ( #13540 )
...
* Clinical Procesdure Template and Clinical Procedure Doctype
* Consultation - Create procedure and procedure prescription
* Patient Appointment - Create Procedure and Procedure appointment invoice
* Physician Schedule - Validate slot overlap
* Clinical Procedure Item - batch_no for Clinical Procedure not for Template
* Clinical Procedure - manage item batch_no
* Codacy - fixes
* Yet another Codacy and travic-ci fix
* Codacy - fixes
* Clinical Procedure - Codacy fix
* Permissions updated
* fixed Qty Indicators, Minor fixes
* Patient appointment for procedure prescription
* Doctype Patient Service Unit to Healthcare Service Unit
* Add healthcare service unit tree root
* Healthcare Service Unit - Tree view script
* Healthcare Service Unit - allow appointments check
* Clinical Procedure - remove unused variable
* Clinical Procedure - Get actual quantity from ledger - fix
* Clinical Procedure - apply transilation for message
* Warehouse in Healthcare Service Unit
* Service Unit in Clinical Procedure
* Codacy fix
* Missing semicolon
2018-05-16 10:54:00 +05:30
Rushabh Mehta
bc5c04f438
Update job_offer.js
...
cur_frm is deprecated
2018-05-16 10:51:15 +05:30
