Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,621 Commits 3 Branches 0 Tags
Commit Graph

22621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Faris Ansari
44528cb618
Merge pull request #14161 from Zlash65/travis-fix 
[Minor] Department patch fix
 2018-05-21 15:13:55 +05:30
Zlash65
41cb6cc491 patch fix - skip query if no when_then case 2018-05-21 15:10:06 +05:30
Faris Ansari
6d2dfac44e [fix][patch] Shopify (#14159) 2018-05-21 14:41:11 +05:30
Nabin Hait
19ce904030 Report added in Selling module 2018-05-21 11:07:04 +05:30
Nabin Hait
8d1f1765a9 Merge branch 'asbasawaraj-erpnext_issue_13818' into develop 2018-05-21 11:03:22 +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
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
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
rohitwaghchaure
f445298e7a
Merge pull request #14132 from rohitwaghchaure/asset_finance_book_enhance 
Changed condition of finance book in reports
 2018-05-18 09:10:53 +05:30
Rohit Waghchaure
f61e94e162 Changed condition of finance book in reports 2018-05-18 09:10:07 +05:30
rohitwaghchaure
7d6cad2c67
Merge pull request #14130 from rohitwaghchaure/fixed_financial_report 
Added finance book in Asset Depreciation Ledger report, fixed asset issue
 2018-05-17 23:31:17 +05:30
Rohit Waghchaure
f689d01a0c Added finance book in Asset Depreciation Ledger report, fixed asset issue 2018-05-17 23:29:37 +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
rohitwaghchaure
967d04ed0d
Merge pull request #14096 from ESS-LLP/jam_enterprise_emp_benefit 
Employee Benefit
 2018-05-17 14:09:04 +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
rohitwaghchaure
4c82ede9e1
Merge pull request #14112 from vjFaLk/item-uom 
Add UOM to POS Item Template
 2018-05-17 12:51:10 +05:30
Valmik Jangla
b52d5b21a1 Add UOM to Item View with Price 2018-05-17 00:09:21 -07:00
rohitwaghchaure
d2f0d08234
Merge pull request #14105 from Zlash65/fix-dept 
[Minor] Typo in Employee Transfer
 2018-05-17 11:23:52 +05:30
rohitwaghchaure
509847a674
Merge pull request #14109 from rohitwaghchaure/asset_adjustment_fixes 
[Fix] Asset adjustment issues
 2018-05-17 11:23:26 +05:30
Rohit Waghchaure
992fb34c95 [Fix] Asset adjustment issues 2018-05-17 11:22:59 +05:30