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 |
|
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 |
|
rohitwaghchaure
|
de6ce587d0
|
Merge pull request #14104 from rohitwaghchaure/asset_wrong_account_linking_issue
Allow to select Asset Received But Not Billed in expense account head
|
2018-05-17 00:24:46 +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 |
|
rohitwaghchaure
|
627c0a3acb
|
Merge pull request #14102 from rohitwaghchaure/company_not_found_issue_v11
[Fix] Company mandatory issue
|
2018-05-16 23:32:33 +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 |
|
rohitwaghchaure
|
39223e0341
|
Merge pull request #14100 from rohitwaghchaure/tds_issue
[Fix] TDS issue
|
2018-05-16 23:13:41 +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 |
|