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

2900 Commits

Author SHA1 Message Date
Vinayak Jethe
46c82c45e0 Revised changes for codacy 2018-01-24 14:24:58 +05:30
Vinayak Jethe
2c8ce5a717 Fixes issue #12512 2018-01-24 13:51:26 +05:30
Saurabh
fb2f97391f resolved merge conflicts 2018-01-24 11:24:10 +05:30
Saurabh
4b9a55b0ef [fix] If buying or selling price list not found, return empty dict 2018-01-24 07:48:56 +05:30
Saurabh
c8399fd093
Merge pull request #12614 from rohitwaghchaure/removed_set_only_once_for_batch_serialno 
Disabled property set only once for has serial no and has batch no field in item doctype
 2018-01-23 18:08:56 +05:30
Rohit Waghchaure
266e66cd1b Disabled property set only once for has serial no and has batch no field in item doctype 2018-01-23 18:06:12 +05:30
Shreya
dfae11bcee disabled warehouse in list view 2018-01-23 16:46:24 +05:30
pawan
9b7093e4d6 validation code improvement 2018-01-23 11:39:53 +05:30
Shreya
e2b31085a7 fetch uom conversion factor in material request 2018-01-23 10:54:23 +05:30
pawan
6a8eba891e Move target warehouse validation to submit 2018-01-23 00:57:44 +05:30
pawan
4ab6ef89a1 code alignment 2018-01-22 17:31:40 +05:30
pawan
67867529c0 [fix] #8540 2018-01-22 17:08:39 +05:30
Saurabh
ef31637549 Merge branch 'master' into develop 2018-01-22 15:29:15 +05:30
Rohit Waghchaure
f83f6aae22 [Fix] Wrong projected qty for warehouse group in the process of reorder item making extra material requests 2018-01-20 15:44:38 +05:30
Nabin Hait
570e29d5e7 Fixed merge conflict 2018-01-17 18:56:02 +05:30
rohitwaghchaure
60febc5465 [Fix] Gross profit validation issue (#12516) 2018-01-17 14:40:59 +05:30
Vishal Dhayagude
052b51ab20 [fix] Fetch UOM conversion and stock_uom from BOM into material request (#12513) 
* [fix]Fetch UOM conversion and stock_uom from BOM into material Request

* Update material_request.js
 2018-01-17 14:39:54 +05:30
umaepoch
832453a757 Added Delay days field to Ordered Items to be Delivered report (#12439) 
* Added Delay Days to Ordered Items to be Delivered Report

* Ordered Items to be Delivered
 2018-01-15 15:43:16 +05:30
Saurabh
35d8ce4fbd resolved merge conflicts 2018-01-12 16:58:32 +05:30
tundebabzy
e1e38a4bb9 Autoname for Batch DocType #12302 (#12461) 
* add new fields:
check: use naming series
data: series prefix

* refactor autoname:
use new function - get_name_from_hash

* add new function - get_name_from_naming_series

* refactor autoname to generate name from naming series

* PEP 8 compliance
 2018-01-12 16:30:02 +05:30
tundebabzy
df023bff7f add posting_date/transaction_date to list_view (#12453) 2018-01-12 16:27:29 +05:30
Sachin Mane
24e2735e19 Add 'Shelf Life' (Item) and Manufacturing date (Batch) (#12381) 
* fix bug in batch number selector. fetch and display batch numbers only for the given item code.

* remove print statement

* Fix error on selecting Chattisgarh in address

Fix error on selecting Chattisgarh in address because of spelling mistake

* Revert "Fix error on selecting Chattisgarh in address"

* Add Shelf Life (Item) and Manufacturing Date (Batch) fields

* remove console.log

* fix ci issues

* Update batch.js
 2018-01-11 12:45:50 +05:30
Charles-Henri Decultot
47ad7fb129 Multiple variant correction (#12424) 2018-01-11 12:29:45 +05:30
rohitwaghchaure
752d21e658 Code cleanup for item price stock report and fix report was not exporting properly in excel (#12427) 2018-01-11 12:28:48 +05:30
tundebabzy
6f75885d86 better validation message 2018-01-10 23:14:13 +01:00
tundebabzy
76dddbf26e
Merge branch 'develop' into multi-barcode 2018-01-10 21:49:27 +01:00
Zarrar
94f9f48d70 set from_warehouse only if purchase_order and purpose found (#12398) 2018-01-10 16:29:40 +05:30
Saurabh
892a7a6980 resolved merge conflicts 2018-01-09 12:05:20 +05:30
rohitwaghchaure
412e044e8f [Fix] Error in stock move from batch dashboard (#12377) 2018-01-09 11:27:35 +05:30
Shreya Shah
44fa9a6d9d Last purchase rate button added back (#12135) 
* last purchase rate button added

* triggers to update rate on button

* updated modified column in buying settings

* moved trigger to get_item_details.py

* hide get_last_rate button depending on buying settings
 2018-01-08 14:58:20 +05:30
Nabin Hait
3a972c4d85 Precision issue in stock reconciliation 2018-01-08 12:35:05 +05:30
Nabin Hait
07e5376043 Fixes and cleanups of reserve qty for subcontracting 2018-01-05 18:19:59 +05:30
Nabin Hait
cab8dfc5fb Fixed merge conflict 2018-01-05 14:15:39 +05:30
Nabin Hait
cb495fb33b Merge branch 'master' into develop 2018-01-05 13:17:00 +05:30
Nabin Hait
28d0230e56 Multiple small fixes 2018-01-05 13:14:25 +05:30
tundebabzy
8f44d1c63d Payment Terms in Delivery Note #12167 (#12293) 
* add Payment Terms Template field to delivery note:
- This helps for users who create invoice from Sales Invoice
- Field is hidden in print
- Field is not coupled to Payment Schedule table.

* do nothing in payment_terms_template trigger if doctype is Delivery Note
 2018-01-05 12:46:50 +05:30
rohitwaghchaure
bc2c83ee3c Companywise default tax template (#12290) 
* Companywise default tax template

* Fix test cases
 2018-01-05 12:42:02 +05:30
Nabin Hait
c33788a91b Show standard rate only in unsaved Item 2017-12-29 15:42:50 +05:30
Shreya Shah
df0dd8be5f Travis fix for client side tests (#12224) 
* salary slip test fix

* attendance tool test fix

* timeout after routing
 2017-12-29 14:04:46 +05:30
rohitwaghchaure
fe22686a8f Update last purchase rate from the purchase invoice (#12189) 2017-12-28 16:11:27 +05:30
Nabin Hait
ca674bec42
Set numeric ranges in Item tamplate if blank (#12199) 2017-12-28 12:35:11 +05:30
Nabin Hait
123759aff7
Fixes for travis (#12161) 
* Fixes for travis

* Testcase fixes for get_item_details

* Testcase fixes for get_item_details

* Travis fixes

* Travis fixes
 2017-12-26 17:50:34 +05:30
Nabin Hait
92615901a7 Fixed merge conflict 2017-12-25 13:41:04 +05:30
rohitwaghchaure
d8c6449f3a [Fix] Bom raw materials not in order in the stock entry (#12149) 2017-12-25 11:26:40 +05:30
rohitwaghchaure
174900506e [HotFix] Validation issue for subcontract stock entry (#12127) 
* [Fix] Validation issue for subcontract stock entry

* Update stock_entry.py
 2017-12-21 11:28:01 +05:30
Nabin Hait
2f9f4f9c01
Multiple fixes related to payment terms (#12115) 2017-12-20 12:24:59 +05:30
rohitwaghchaure
84da00da2f Allow to add items in manufacturing process which are not part of bom items (#12110) 2017-12-20 12:06:09 +05:30
Nabin Hait
2afcff1852 Get outstanding invoices on payment entry 2017-12-15 17:32:03 +05:30
Manas Solanki
53e47e6ba5 frappe call only if item code or serial no is ther (#12036) 2017-12-15 15:47:52 +05:30
rohitwaghchaure
ce8adecbad Incoming rate fixes (#11986) 2017-12-15 12:13:50 +05:30