Prateeksha Singh
a7c6ff8f3e
Merge pull request #13837 from shreyashah115/serial-batch-linking
...
Serial No. and Batch No. linking
2018-05-02 15:11:19 +05:30
Zarrar
284de4c15a
updated modified time - reload issue in patch ( #13881 )
2018-05-02 12:14:59 +05:30
Shreya
0456ced796
remove unused code
2018-05-01 19:00:06 +05:30
Nabin Hait
3652a62b55
minor fixes
2018-04-30 19:32:29 +05:30
Shreya
96e45902fd
codacy
2018-04-30 15:54:34 +05:30
Shreya
14bd43d5eb
minor changes
2018-04-30 15:30:42 +05:30
Faris Ansari
9f739fe87d
Handle item_wise_tax_detail invalid value while item renaming ( #13778 )
2018-04-26 18:48:01 +05:30
rohitwaghchaure
7e8a7ac6ee
Provision to select opening stock in stock reconciliation ( #13802 )
2018-04-26 16:30:35 +05:30
Shreya
a20157af17
on item, warehouse and batch triggers, fetch serial nos based on batch
2018-04-26 14:39:21 +05:30
Shreya
7461d28ae0
add batch when creating serial nos
2018-04-26 14:39:21 +05:30
Shreya
4a2fe605b3
batch no field in serial no doctype
2018-04-26 14:39:21 +05:30
Saurabh
9738d52d5f
Merge branch 'master' into develop
2018-04-24 12:09:40 +05:30
Saurabh
d2065ce3bf
typo fix
2018-04-24 12:07:37 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
tundebabzy
dbdf462e56
fix conflict
2018-04-22 23:49:26 +01:00
Shreya Shah
44e719d64c
[Enhancement] Leave Application and Expense Claim ( #13645 )
...
* child table employee expense approver
* set query in department
* mandatory approver check in hr settings
* triggers on leave and expense approver
* fetch all parent approvers from department hierarchy
* fixes
* patch to move employee approvers from employee to department
* removed hard coding of roles
* modify approvers list query
* commonified functions
* patch
* renamed standard reply occurrences
* removed leave approvers table from Employee master
* email templates for leave application notification
* set default email templates for leave in hr settings
* notify by email template
* approval status in expense claim
* render template in patch
* removed unused code
* Single child table department approver
* read instead of render template
2018-04-19 20:58:52 -08:00
Saurabh
2476a8aab9
a[fix] check content before making in condition
2018-04-17 20:45:06 +05:30
tundebabzy
caae0f4dcc
Merge branch 'develop' into new-subscription
2018-04-17 09:34:04 +01:00
Saurabh
46743d00d6
Merge branch 'master' into develop
2018-04-17 12:00:21 +05:30
Saurabh
9fbb8192e1
[fix] do not escape % while using clause ( #13677 )
2018-04-17 11:56:46 +05:30
Sanjay Kumar
bc83daf0fa
#13478 : Default Accounts in Item from Item Group ( #13635 )
...
* remove external app reference and update get_warehouse_list
* resolve #13478 : Default Accounts in Item from Item Group
2018-04-15 21:36:37 -08:00
Nabin Hait
642d39098a
Fixed merge conflict
2018-04-13 14:38:57 +05:30
rohitwaghchaure
2ea593bdd8
[Fix] POS Profile data not set in the sales invoice ( #13568 )
2018-04-12 13:37:08 +05:30
Nabin Hait
c10e106f8f
Optimization related to large number of items ( #13606 )
2018-04-12 13:25:03 +05:30
Sanjay Kumar
6225b769a6
remove external app reference and update get_warehouse_list ( #13597 )
2018-04-11 02:19:36 -08:00
Doridel Cahanap
ad76f9ad70
[Enhancement] Work Order Material Consumption ( #13384 )
...
* Work Order Material Consumption
* Test cases and other minor fixes
* Test cases fixes
* Travis Fixes
* Work Order Material Consumption Request Changes
* Update work_order.js
2018-04-09 10:31:28 +05:30
Nabin Hait
e9638be032
fixed merge conflict
2018-04-06 15:18:27 +05:30
rohitwaghchaure
c0f149a3be
[Fix] Delivery notification for delivery trip ( #13543 )
2018-04-06 14:26:26 +05:30
rohitwaghchaure
2ae6cfda5f
[Fix] Item variant details report ( #13545 )
2018-04-06 11:49:04 +05:30
rohitwaghchaure
22d9f0a4aa
[Fix] Bin not deleted on delete of an item ( #13539 )
2018-04-06 10:29:07 +05:30
Suraj Shetty
97d84eb509
remove apply user permission ( #13505 )
2018-04-05 12:10:46 +05:30
Nabin Hait
2b682c82e8
Fixed merge conflict
2018-04-04 11:40:16 +05:30
Nabin Hait
5fd79f7f77
Update stock_ledger.py
2018-04-04 11:20:16 +05:30
Rushabh Mehta
d5f9ebd008
[optimize] item queries ( #13480 )
2018-04-02 23:37:33 +05:30
Nabin Hait
edd320e338
Optimisation of warehouse_account_map ( #13454 )
2018-04-02 10:30:17 +05:30
rohitwaghchaure
40a5a3063c
[Fix] Allow zero valuation rate if previous sle has zero valuation rate ( #13432 )
2018-04-02 10:14:49 +05:30
Nabin Hait
ff2e4c898a
Fixed merge conflict
2018-03-29 13:57:39 +05:30
Manas Solanki
a4502c4f6b
Merge pull request #13430 from codingCoffee/child_doc_perm_fix
...
Permisssion fixes for child table
2018-03-29 13:27:08 +05:30
Manas Solanki
1f02c62339
Merge pull request #13431 from manassolanki/fix-22
...
fix the item varint details
2018-03-29 13:26:14 +05:30
Manas Solanki
ef770b593a
fix the item varint details
2018-03-29 13:25:00 +05:30
Ameya Shenoy
c5d222253a
Permisssion fixes for child table
...
Related to commit 595929eb2432140a27dc262d4d78aca4ec5455c3
frappe.client.[get_list, get, get_value] when called on child table
needs parent as an argument or it throws an error by default
2018-03-29 13:16:08 +05:30
Manas Solanki
94769d81a8
Update get_item_details.py
2018-03-29 11:15:05 +05:30
Nabin Hait
4d9e104284
Merge branch 'master' into develop
2018-03-28 15:51:18 +05:30
rohitwaghchaure
a3c3dec5a2
[enhance] Item Alternative ( #13121 )
...
* [enhance] Item Alternative
* Added two way provision in item alternative
* Test Cases
* documentation
2018-03-28 11:51:44 +05:30
Nabin Hait
a6746407e5
Fixed waiting qty in item dashboard data
2018-03-28 11:16:12 +05:30
Nabin Hait
b9c82b9790
Fixed merge conflict
2018-03-27 14:25:27 +05:30
Nabin Hait
9d7fe1f7cd
Indicator fix for stock entry item table
2018-03-27 13:30:11 +05:30
Prateeksha Singh
be368fe94b
Enumerate numeric values in variant dialog
2018-03-27 12:17:15 +05:30
Shreya Shah
ba4f32be5c
set default warehouse instead of product bundle's warehouse for packed_items in delivery note ( #13398 )
2018-03-27 11:32:10 +05:30
rohitwaghchaure
2e560cb25d
[Fix] Same serial no returned two times ( #13378 )
2018-03-27 11:24:50 +05:30
