Shreya Shah
a2cfd97cd7
fetch party name ( #11985 )
2017-12-14 12:42:01 +05:30
Umair Sayed
4667cb2f62
Update implementation-strategy.md ( #12002 )
2017-12-14 12:21:47 +05:30
Zarrar
6e0acbe4d0
Patch to copy old field data to new field ( #11997 )
...
* patch to copy old fields data to new ones
* fix for patches related to project
* use rename_field function, copy if only field present
2017-12-14 12:21:00 +05:30
rohitwaghchaure
5759258dcf
[fix] Added total closing in general ledger ( #11961 )
2017-12-13 18:57:37 +05:30
rohitwaghchaure
40f5d8edd4
[fix] Pull subcontracted item if subassembly is not defined ( #11996 )
2017-12-13 18:51:05 +05:30
Ameya Shenoy
cc05c0b348
Agri fixes ( #11988 )
...
* minor fixes in agri
* updated desktop.py
* [agri] fixed recreation of dotypes in setup.py
* setup_wizard changes
- converted agriculture from alpha to beta
- rearranged the domains alphabetically
* [agri] linked doctype is collapsible
2017-12-13 18:50:39 +05:30
Shreya Shah
8cad3f12a2
Salary Slip not updating when adding/removing Timesheet links ( #11982 )
...
* timesheet on salary slip
* changes
* cal total wages
* calculate gross_pay and net_pay
* codacy fix
2017-12-13 18:43:01 +05:30
Nabin Hait
aaf378e340
Validate numeric attribute value based on range defined in template ( #11981 )
2017-12-13 18:40:52 +05:30
Zarrar
de8f6120f3
[Fix] Restrict domain specific roles ( #11975 )
...
* restrict roles to its specific domain
* missing hook for Non Profit
2017-12-13 18:36:08 +05:30
rohitwaghchaure
659b46832c
[fix] Patch ( #11976 )
2017-12-13 18:35:22 +05:30
Saurabh
aa66fa17d7
key fix in demo setup completion ( #11980 )
2017-12-13 18:34:43 +05:30
Manas Solanki
56f5b5f75c
Update the desktop.py ( #11974 )
...
Remove the data import desktop icons
2017-12-13 11:28:18 +05:30
Nabin Hait
0f97eda7c9
Merge branch 'master' into develop
2017-12-12 19:17:53 +05:30
Nabin Hait
96d6498226
Merge branch 'hotfix'
2017-12-12 19:17:51 +05:30
Nabin Hait
66456dae34
bumped to version 9.2.22
2017-12-12 19:47:51 +06:00
Zarrar
21ea6cdb91
batch.expiry should be sorted in ascending order too ( #11960 )
2017-12-12 18:54:17 +05:30
Nabin Hait
af9bdfeaa3
Fixed calculation of taxes and totals if tax is entered as Actual, for Deduction or valuation ( #11965 )
2017-12-12 18:50:05 +05:30
Nabin Hait
aab1182c73
Update stock_entry.js
2017-12-12 18:45:39 +05:30
Pawan Mehta
bb7fab52d1
[fix] #11880- Item wise report showing price list and stock available ( #11885 )
...
* [fix] #11880
* review comments
* codacy fixes
2017-12-12 15:05:03 +05:30
KanchanChauhan
34ed1df9ef
[Minor] Update Status based on Asset Maintenance and Asse Repair ( #11886 )
2017-12-12 15:03:21 +05:30
Charles-Henri Decultot
d18423d9c7
Project Margin Calculation Improvement ( #11911 )
...
* Project Margin Calculation Improvement
* Documentation modification
* Change Total Planned Sales to Total Sales Amount
* Change documentation screenshot
2017-12-12 14:59:59 +05:30
Maxwell Morais
d06b7049c7
Allow manufacturing order from SO with Packed Items that contains BOM's ( #11947 )
2017-12-12 14:46:16 +05:30
rohitwaghchaure
4e17fae63b
[enhance] UAE/KSA VAT/Excise implementation ( #11923 )
2017-12-12 14:40:52 +05:30
Shreya Shah
ea723e59c6
POS Profile validation message rephrased ( #11934 )
...
* pos validation message improvised
* removed unused field
2017-12-12 14:24:00 +05:30
Shreya Shah
db499dcaa4
fixed fiscal dates ( #11939 )
2017-12-12 14:19:35 +05:30
tundebabzy
f628184c68
Error in Opening Invoice creation Tool ( #11938 ) ( #11941 )
...
* add qty field
* cast qty to float
* PEP8 compliance
2017-12-12 14:19:07 +05:30
tundebabzy
ff1b875661
Improve Validation Message in the Payroll Entry ( #11937 ) ( #11944 )
...
* change error message from `create_log`
* PEP 8 compliance
2017-12-12 14:18:14 +05:30
rohitwaghchaure
47749f4635
[fix] Cur_frm breaking offline pos ( #11955 )
2017-12-12 14:16:03 +05:30
Manas Solanki
6a415bd32d
set desktop icons ( #11953 )
2017-12-12 13:24:13 +05:30
Nabin Hait
de1e29bf1b
Production Order fixes ( #11951 )
...
* Production Order from Sales Order fixes: Validate SO and set required items on save
* Codacy fixes
2017-12-12 13:22:48 +05:30
Prateeksha Singh
903e9f4b6f
Merge pull request #11943 from pratu16x7/hub-connector-fixes
...
[fix] hub connection, fixes #11357
2017-12-11 23:23:37 +05:30
Prateeksha Singh
1126a43979
[fix] hub connection, fixes #11357
2017-12-11 23:22:30 +05:30
pawan
1892454036
Add Total Row
2017-12-11 17:48:56 +05:30
KanchanChauhan
3ca00c7143
Items should not be used from Sample Retention warehouse ( #11905 )
2017-12-11 14:59:19 +05:30
rohitwaghchaure
d19be49889
[fix] Error opening the POS ( #11929 )
2017-12-11 14:57:43 +05:30
Shreya Shah
1b30642362
cal difference amount when qty 0 ( #11925 )
2017-12-11 14:56:57 +05:30
rohitwaghchaure
efbc0667ec
[fix] On change of payment terms template, not fetch respective schedule data ( #11928 )
2017-12-11 14:54:20 +05:30
rohitwaghchaure
505661b5c0
[fix] Wrong company's default tax fetch ( #11927 )
2017-12-11 14:52:28 +05:30
Manas Solanki
3fe59b4443
remove the unnecessery files ( #11922 )
2017-12-11 13:01:27 +05:30
KanchanChauhan
236ac5eb38
[Fix] Customer and Address blank if does not exist in Delivery Stops ( #11895 )
2017-12-11 12:38:30 +05:30
KanchanChauhan
7f8df06663
[Minor]Removed alert=true from frappe.throw ( #11904 )
2017-12-11 12:24:43 +05:30
Prateeksha Singh
0419e2384d
reinitialize variant attribute table, fixes #11900 ( #11921 )
2017-12-11 12:22:28 +05:30
Nabin Hait
d10014bdeb
minor fix in fetching payment terms template
2017-12-08 16:51:53 +05:30
Asharam Seervi
98d5878aa2
Added Column Break in Item Master ( #11887 )
...
* Fixed: On Item form, added cb.
* Fixed: On Item form, added cb.
2017-12-08 16:18:23 +05:30
Shreya Shah
6b64947f47
Route to Payment Entry instead of Journal Entry in paid Expense Claim ( #11874 )
...
* route fixed
* improvised
2017-12-08 16:14:23 +05:30
Zarrar
17fd6610dc
Fix travis ( #11882 )
...
* fieldname wrong
* bifurcated test into two - error when both were running async
* minor fixes with link and route
* move school domain rename up
* fix async creation of operations test
* edit-in-full-page is button, not link
* set_route issue in production order test
* minor changes
* fix task tree test
* more fixes
* fix server side issue
* improvising ui tests
2017-12-08 14:57:38 +05:30
Zarrar
2ba198ec70
improvise query ( #11878 )
2017-12-08 11:35:53 +05:30
Vishal Dhayagude
6d250f8789
[fix] Missing value Net Weight Added in Calculate Based On select field ( #11883 )
2017-12-08 11:35:18 +05:30
Shreya Shah
88dbc26a98
replace process payroll ( #11873 )
2017-12-07 18:24:42 +05:30
Zarrar
5ee5d43295
ontrash of nestedset wasn't ideal for employee's usecase ( #11876 )
2017-12-07 17:16:59 +05:30
