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

5234 Commits

Author SHA1 Message Date
Nabin Hait
81d12cc9c8 Get default income account from Item 2018-06-05 12:49:03 +05:30
Sushant Nadkar
ebf76163ad show uom in list view of material request (#14338) 2018-06-04 14:23:25 +05:30
Zarrar
7e0e85912b item_name not fetched in packing slip (#14310) 2018-06-01 15:10:33 +05:30
Saurabh
0eb622f7da [fix] resolve conflicts 2018-05-31 17:32:17 +05:30
AMS Fauzi
f3a6d95634 Develop: Batch Number Series (#14251) 2018-05-31 09:31:57 +05:30
rohitwaghchaure
31a96d2a3f [Fix] System not fetching default warehoue defined in pos profile for packing materials of product bundle item (#14287) 2018-05-30 18:13:47 +05:30
Shreya Shah
47335e5e60 Stocking out items with expired batches (#14249) 
* Add dropdown in Stock Entry to get expired batch items

* Fetch all the items with expired batches

* Add the fetched item details to stock entry details

* Modify as per the review comments
 2018-05-30 15:44:41 +05:30
rohitwaghchaure
05152dad0b [Enhance] Provision to set overproduction percentage for work order (#14248) 2018-05-30 15:28:09 +05:30
Shreya Shah
ae95a8aa15 Update status in Purchase Receipt (#14257) 
* Update status on submission if per_billed = 100

* Add patch to update existing records
 2018-05-28 18:24:28 +05:30
Zarrar
b9f54ca946 [Enhance] Group same items during printing Delivery Note, Invoices, etc (#14250) 
* add doctypes allowed to group items, average the rate

* add check field to group items during print

* call common before_print in delivery note

* fix precision issue while calculating average
 2018-05-28 17:41:09 +05:30
Saurabh
3c1b153cdb
Merge pull request #14111 from netchampfaris/stock-ledger-report-hotfix 
[fix] Stock Ledger report item filter
 2018-05-28 15:23:21 +05:30
Shreya Shah
e329038aaa Total Quantity in Sales and Purchase DocTypes (#14114) 
* Add  field to all sales and purchase doctypes

* Add patch to update existing records

* Modify taxes_and_totals.py
 2018-05-28 11:49:08 +05:30
Suraj Shetty
084b0b3a67 Treeview permission (#14232) 
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037)

* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace

* Add parent filter

* Add ifnull checks
 2018-05-26 09:12:59 +05:30
Nabin Hait
33df0b4fbf
Test case fixes (#14219) 
* Test case fixes

* fetch_from fixes
 2018-05-26 09:09:02 +05:30
Nabin Hait
f87ec61043 Test case fixes for item defaults 2018-05-24 18:19:21 +05:30
Nabin Hait
b903fc4e71 Item defaults query fixes 2018-05-24 17:07:51 +05:30
Ameya Shenoy
95e60927b4
Merge branch 'master' into develop 2018-05-24 08:45:14 +00:00
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
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
Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop 2018-05-22 09:18:38 +00:00
Manas Solanki
a96421279d
Remove the debugger from the material_request.js 2018-05-21 17:27: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
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
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
Rohit Waghchaure
f61e94e162 Changed condition of finance book in reports 2018-05-18 09:10:07 +05:30
Faris Ansari
9e4889d756 [fix] Stock Ledger report item filter 
- breaks when Item Code contains % symbol
 2018-05-17 12:18:28 +05:30
Rohit Waghchaure
421697250b [Fix] Asset gl entry not creating for non perpetual 2018-05-16 18:20:52 +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
e3910fb2a6 [fixes] fix in the item defaults 2018-05-16 16:16:34 +05:30
Manas Solanki
8e184569a1
Update item.json 2018-05-16 15:11:52 +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
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
Manas Solanki
64614374d8 fix codacy 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
Suraj Shetty
8501010f12 Replace frappe.db.sql to frappe.get_list to apply permissions (#14037) 
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace
 2018-05-16 10:44:38 +05:30
rohitwaghchaure
f9fa588ddc
Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po 
[Enhance] Budget validation on material request, purchase order
 2018-05-15 22:18:17 +05:30
Rohit Waghchaure
4d4fb6dcbc [Enhance] Budget validation on material request, purchase order 2018-05-15 22:12:44 +05:30