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

3721 Commits

Author SHA1 Message Date
Rucha Mahabal
3564ac7c88 fix: don't create debit/credit note automatically (#19185) 2019-09-30 10:59:28 +05:30
DeeMysterio
5ef26b42a8 feat(delivery note): make the delivery trip plus button fetch data from delivery note (#19046) 2019-09-30 10:57:32 +05:30
Rohan
e19e16fbf1 fix: remove internal fields from print (#19101) 2019-09-30 10:54:01 +05:30
Mangesh-Khairnar
77f22635f2 fix(stock-ageing): filter none values from the fifo queue 2019-09-27 17:50:52 +05:30
Nabin Hait
001edb4464
refactor: Reposting utility of Stock ledger (#19155) 2019-09-26 16:44:35 +05:30
thefalconx33
c15cc8fc28 fix: #18624 2019-09-24 18:49:16 +05:30
Nabin Hait
786d7bd3d4
Merge branch 'develop' into dev-serial-no-statuses 2019-09-24 11:50:33 +05:30
Deepesh Garg
2e7419d78f fix: Do not validate warehouse in case of Repack (#19050) 2019-09-24 10:05:42 +05:30
Himanshu
fdad33309b fix: get correct warehouse for product bundle (#19130) 2019-09-24 10:03:34 +05:30
Mangesh-Khairnar
5dcf2c669f chore: remove unlinked letter head references (#19138) 2019-09-24 09:53:06 +05:30
rohitwaghchaure
8dd4699f10 feat: Allow to make landed cost voucher against the asset item (#19121) 2019-09-23 15:03:52 +05:30
Suraj Shetty
462d9cb331 feat: "Purchase Order items to be Received or Billed" report (#19091) 
* feat: Init "Purchase Order items to be received or billed" report

* fix: Rename report

* fix: Column name
 2019-09-20 18:30:22 +05:30
rohitwaghchaure
6bbc834f8f
Merge pull request #19112 from rohitwaghchaure/fixed_get_bin_details_and_serial_nos_arugument_passing_issue 
fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 g…
 2019-09-19 18:01:03 +05:30
Rohit Waghchaure
6daab3ca89 fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 given) 2019-09-19 17:01:49 +05:30
Suraj Shetty
28d182af15 fix: Permission issue in Total Stock Summary report (#19110) 
Data in "Total Stock Summary" report were not getting filtered
based on applied user permissions because some link fields had
wrong options
 2019-09-19 11:13:22 +05:30
Rohan
b9c1dad2e6
Merge branch 'develop' into dev-serial-no-statuses 2019-09-18 13:24:28 +05:30
kaviya
9e4f674fb9 fix: indentation error in stock ageing 
fixes https://travis-ci.com/frappe/erpnext/jobs/235815591#L1720
 2019-09-17 16:02:11 +05:30
Suraj Shetty
bc001d2d9a feat: Add stock ageing data to stock balance report (#19036) 
* feat: Add stock ageing data to stock balance report

* fix: Use fifo queue warehouse wise

* fix: "Stock Ledger Entry" get query

* fix: Remove unwanted quotes in item details query

* fix: Check if no SLE was passed

* fix: Codacy

* fix: Add logic to include additional UOM columns

* fix: Show stock ageing data optionally
 2019-09-16 19:57:04 +05:30
Marica
bac4b93639 fix: Displaying manufacturer part no along with manufacturer and added Manufacturers validation in Item master (#19066) 
Manufacturer Link field options in Items Table of transactions will also display manufacturer part no.
Manufacturers table in Item master will check for duplicate entries.
 2019-09-16 19:44:28 +05:30
Deepesh Garg
8cc2f83bd5 fix: Fetch scrap items from BOM if purpose is repack (#19056) 2019-09-16 14:49:12 +05:30
Shivam Mishra
a3095c987a fix: optimized query (#19026) 
Co-authored-by: nabinhait
Co-authored-by: sahil28297 <sahilkhan28297@gmail.com>
 2019-09-12 17:28:37 +05:30
Rohan Bansal
bf7e012bde feat: add statuses for Serial No 2019-09-10 15:55:54 +05:30
Mangesh-Khairnar
1853a83453 fix(packing-slip): add a descriptive message (#18981) 2019-09-10 13:21:01 +05:30
rohitwaghchaure
d312d11062 fix: port from hotfix (#18974) 
* fix: '>' not supported between instances of 'int' and 'str'

* fix: not able to save item because price list has disabled
 2019-09-10 10:47:36 +05:30
Mangesh-Khairnar
cbcede79b1
Merge pull request #18964 from nabinhait/max_carry_forwarded_leaves 
feat: Added input field for max carry forwarded leaves
 2019-09-09 14:38:06 +05:30
Faris Ansari
32eccb8fb2 fix: Rename duplicate label Image to Website Image (#18912) 2019-09-09 14:29:01 +05:30
Nabin Hait
fb7c7b53ba feat: Added input field for max carry forwarded leaves 2019-09-09 12:08:58 +05:30
MorezMartin
ffc4f8f2a5 feat: [stock -> packed_items] Enable modification of Description on packed items (#18907) 
* Change packed item

* Remove description field on update_packed_items

* add possibility to modify description on packed items
 2019-09-09 10:16:23 +05:30
Nabin Hait
4ce38059ac feat: Company wise credit limit 2019-09-06 14:33:10 +05:30
Nabin Hait
b847731482 Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit 2019-09-05 16:47:08 +05:30
Anurag Mishra
867ac10ffd fix: handle for product bundle (#18420) 
* fix: handle for product bundle

* fix: Requested changes and some general fixes
 2019-09-05 15:13:21 +05:30
John Clarke
a7d448dcba fix: Error "TypeError: unorderable types: int() > str()" When Trying to Create Packing Slip (#18913) 
User report here https://discuss.erpnext.com/t/error-typeerror-unorderable-types-int-str-when-trying-to-create-packing-slip/52445

This has not been noted to github issues and is just a suggested fix, an expert may need to refactor more here?

User and traceback does not state whether Python 2 or 3 but perhaps 3 since that apparently does not 'guess' when types do not match?

See also https://stackoverflow.com/questions/14886881/unorderable-types-int-str
 2019-09-05 14:55:35 +05:30
Rohan
9d77e9f719 fix: error while trying to get directions (#18827) 2019-09-05 14:51:22 +05:30
rohitwaghchaure
f1fab871b8 fix: mismatch between warehouse tree value and warehouse based stock balance report value (#18879) 2019-09-05 14:47:43 +05:30
Nabin Hait
b03fa8a441
Merge branch 'develop' into feat-customer-credit-limit 2019-09-05 12:34:34 +05:30
rohitwaghchaure
805b8634da fix: incorrect stock value difference when stock move from negative to positive (#18887) 2019-09-05 12:18:33 +05:30
Mangesh-Khairnar
4bcc221ee3 Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit 2019-09-02 23:18:56 +05:30
deepeshgarg007
8666ecc26f fix: Purchase receipt test 2019-09-02 17:41:12 +05:30
deepeshgarg007
402d82b4c5 fix: Remove delete_doc from tests 2019-09-02 14:37:18 +05:30
Suraj Shetty
72bea0dff4 test: Add test to check creation of pick list from multiple sales order 2019-08-31 18:34:25 +05:30
Suraj Shetty
736b5e07cc fix: Maintain the order of Item List 2019-08-31 18:33:23 +05:30
Suraj Shetty
ca58fde552 test: Enable basic tests 2019-08-31 16:58:51 +05:30
Suraj Shetty
bcfec77e2c style: Use single quotes 2019-08-30 19:44:37 +05:30
Suraj Shetty
744b92d233 fix: Commonify item not available alert 
- Reorganise code
- UX fixes
 2019-08-30 19:39:28 +05:30
Suraj Shetty
0eed0a9abe test: Temporarily comment out tests 2019-08-30 19:12:16 +05:30
Suraj Shetty
0df38891a1 fix: Update pick list print format 2019-08-30 15:59:35 +05:30
Suraj Shetty
5e84ce55ae fix: Add is_stock_item filter for item in locations table 2019-08-30 10:01:49 +05:30
Suraj Shetty
effe53d4ae fix: Set default value for qty 2019-08-30 09:52:08 +05:30
Suraj Shetty
9641edc562 fix: Set item locations before save 2019-08-29 22:23:13 +05:30
Suraj Shetty
9b42682575 fix: Check parent warehouse for batch as well 2019-08-29 21:14:26 +05:30
Suraj Shetty
a6ab00162e style: Remove commented code 2019-08-29 20:17:04 +05:30
Mangesh-Khairnar
79525327f0 feat: bypass credit limit check 2019-08-29 19:50:23 +05:30
Suraj Shetty
3e11338ed5 fix: Validate count of serial numbers 2019-08-29 19:46:49 +05:30
Suraj Shetty
acd00df8fb Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-29 17:24:23 +05:30
Suraj Shetty
ed1ec82d2f refactor: Item picking logic 
- Fix serial number selection
- Get limited item location based on required qty
- Store total item count to properly track available locations
- Pass missing serial no.
 2019-08-29 17:23:09 +05:30
Deepesh Garg
dbe8dab3ce
Merge pull request #18794 from deepeshgarg007/supplier_items 
fix: Enhancement in Purchase Order
 2019-08-29 16:29:02 +05:30
Suraj Shetty
1c29c520bd Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-29 13:18:57 +05:30
Suraj Shetty
66f2bc69a6 fix: Item mapping of stock entry with no reference 2019-08-29 09:23:31 +05:30
Suraj Shetty
55a2699f4c fix: Update dashboard of doctypes that are linked with pick list 2019-08-29 09:14:27 +05:30
Suraj Shetty
f455c92d02 fix: Remove Pick List Reference Item use Item locations table instead 2019-08-28 17:44:22 +05:30
Rohit Waghchaure
d03d8204ab fix: incorrect valuation rate calculated because of string replacement issue 2019-08-28 17:22:50 +05:30
Suraj Shetty
1cf7270049 fix: Add picklist dashboard config 2019-08-28 12:40:58 +05:30
Suraj Shetty
be0ae7a430 fix: Doctype changes 
- Check no copy for work order series field
- Add dashboard
- Set naming_series for pick list
 2019-08-28 12:40:26 +05:30
Suraj Shetty
8f32ac0edd fix: Batch selection logic 2019-08-28 10:16:20 +05:30
Suraj Shetty
c5e0838890 fix: Import get_conversion factor method 2019-08-27 12:14:17 +05:30
Suraj Shetty
974ac3e6ad fix: Update item detail for items without reference 2019-08-27 10:17:16 +05:30
Suraj Shetty
dc675b1eb0 fix: Re-order stock qty field 2019-08-27 08:06:22 +05:30
Suraj Shetty
d6be8989e4 fix: Remove "Material Issue" purpose from pick list 
- Because in material issue we already define source warehouse
 2019-08-26 22:11:49 +05:30
Suraj Shetty
8de8a78235 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-26 10:51:12 +05:30
Mangesh-Khairnar
5dd1b50802 fix: update show in website on disabling item (#18831) 2019-08-26 10:27:25 +05:30
Suraj Shetty
00f9930fbf style: Remove leftout print statements 2019-08-26 10:09:07 +05:30
Suraj Shetty
2b9e256002 fix: Rename method name 2019-08-26 10:05:01 +05:30
Suraj Shetty
94d7096c8c fix: Show create button only if target doc does not exists 2019-08-26 08:40:02 +05:30
Suraj Shetty
ecc801d3d8 fix: Add pick list field to delivery note 2019-08-26 08:39:11 +05:30
Suraj Shetty
be9f4ea487 fix: Add button to create pick list from material request 2019-08-26 08:38:37 +05:30
Suraj Shetty
a1dc152695 fix: Move get items location button below items table 2019-08-26 06:57:43 +05:30
Suraj Shetty
9209570937 feat: Add option to create pick list from material request 2019-08-26 06:33:27 +05:30
Deepesh Garg
98b86ecbc2
Merge branch 'develop' into supplier_items 2019-08-23 15:41:30 +05:30
deepeshgarg007
59432418c6 fix: Consider multiple stock entry against a purchase order 2019-08-23 12:45:48 +05:30
Suraj Shetty
8b4d604cfd fix: Use purpose field and remove item_base_on field 2019-08-23 11:57:16 +05:30
Deepesh Garg
f3d78dd29c fix: Duplicate items check in Sales Invoice (#18660) 
* fix: Duplicate items check in sales Invoice

* fix: Commonified function for duplicate items check in selling controller

* fix: Set valuation rate and transaction date in child tabel
 2019-08-23 11:42:35 +05:30
deepeshgarg007
f2798eab50 fix: Conside multiple stock entry against a purchase order 2019-08-23 10:07:52 +05:30
Suraj Shetty
687b1a5b1f fix: Make pick list submittable and add few fields 
- Add material request & item fields
- Add pick_list field to Stock Entry
- Add purpose field to pick list
 2019-08-22 16:41:14 +05:30
Suraj Shetty
8d55f81baa fix: Fix raw matterial selection based on finished item qty 2019-08-22 16:37:44 +05:30
Suraj Shetty
c1f25ff9e3 fix: Add option to select qty of finished goods Item 2019-08-22 09:53:44 +05:30
Suraj Shetty
ec92486377 fix: Add option to create Stock Entry from Pick List 2019-08-21 22:10:27 +05:30
Suraj Shetty
298d38cde3 test: Fix existing tests 2019-08-21 16:37:49 +05:30
Suraj Shetty
da2a623e38 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-21 11:48:27 +05:30
Suraj Shetty
d79a16c9f3 fix: Warehouse selection login 
- Rename item_loactions -> locations, reference_items -> items
- Add customer and work_order field
- fix "Get Items" button UX
- fix get_pending_work_orders query

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-21 09:03:26 +05:30
Sahil Khan
5f2c030ddc Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:22:49 +05:30
deepeshgarg007
cb38cc96c3 fix: Enhancement in Purchase Order 2019-08-20 15:00:48 +05:30
Suraj Shetty
5124b2806d Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-20 12:05:51 +05:30
Suraj Shetty
1a090432d9 fix: Quantity while creating pick list from work order 
- Fix get_mapped_doc config to filter items
- Fix erroneous condition in get_mapped_doc used for creation of pick_list
in sales order

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-20 12:04:07 +05:30
Suraj Shetty
6450be5e58 fix: Get Items button 2019-08-19 10:48:21 +05:30
Suraj Shetty
669cff88d1 fix: Get items button 2019-08-19 10:38:01 +05:30
Mangesh-Khairnar
0df513434e fix: valuation rate in stock ledger (#18744) 
* fix: valuation rate in stock ledger

* test: allow zero valuation rate for items
 2019-08-19 10:04:52 +05:30
Suraj Shetty
ec1fe9e2ca Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-16 08:17:26 +05:30
Suraj Shetty
182f4def00 fix: Delivery note creation from pick list 
- Changes in serial no and batch no seletion
- Changes in warehouse overrwite logic

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-16 08:16:22 +05:30
Mangesh-Khairnar
ca55af836b fix: travis 2019-08-14 16:32:02 +05:30
Mangesh-Khairnar
06ce1f5a40 fix(quality-inspection): fetch all items for inspection type in process (#18716) 
* fix(quality-inspection): fetch all items for inspection type in process

* fix(quality-inspection): add server side validation for in process items
 2019-08-14 14:25:59 +05:30
DeeMysterio
1c728a7cf8 fix(delivery note): change the text invoice to sales invoice on make button (#18658) 2019-08-12 13:04:25 +05:30
DeeMysterio
cfce53103b fix(delivery note): change the text invoice to sales invoice on make button (#18666) 2019-08-12 13:03:55 +05:30
Himanshu
19199baf29 fix: miscellaneous fixes (#18615) 2019-08-12 12:17:28 +05:30
Himanshu
ebf38c5ebd fix: misc fixes (#18616) 2019-08-12 12:17:16 +05:30
Suraj Shetty
e047de854b Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-09 11:14:14 +05:30
Faris Ansari
99c26e068d fix: Set Maintenance Status fields as Read Only (#18634) 
Maintenance Status is set based on warranty_expiry_date and
amc_expiry_date. Even if they are editable they are set programmatically
server side. Better to make them as read only.
 2019-08-08 17:45:49 +05:30
Faris Ansari
cfd19afabf fix: Set Maintenance Status fields as Read Only (#18633) 
Maintenance Status is set based on warranty_expiry_date and
amc_expiry_date. Even if they are editable they are set programmatically
server side. Better to make them as read only.
 2019-08-08 17:45:44 +05:30
Faris Ansari
df7644a96d fix: Show created serial nos as links in message (#18635) 
Fixes #18623
 2019-08-08 15:50:24 +05:30
Faris Ansari
afae8a0c46 fix: Show created serial nos as links in message (#18636) 
Fixes #18623
 2019-08-08 15:50:17 +05:30
rohitwaghchaure
9601b6c601 feat: added checkbox 'Update Consumed Material Cost In Project' in work order to don't update the consumed material cost in the project for the subassembely work orders (#18533) 2019-08-05 10:40:23 +05:30
Suraj Shetty
b559bf6de6
Merge branch 'version-12-hotfix' into stock-ledger-fix 2019-08-02 08:43:54 +05:30
Suraj Shetty
c57328669a feat: Add pick list print format 2019-08-02 08:14:27 +05:30
Suraj Shetty
b35c0410b1 fix: Add option to get items from work order 2019-08-02 08:12:30 +05:30
Suraj Shetty
a7dc3735ae fix: Move folders to right location 2019-08-01 15:49:29 +05:30
Suraj Shetty
bb7a2dbb6a fix: Rename file 2019-08-01 12:38:26 +05:30
Suraj Shetty
0c1dbb116f Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-01 12:06:20 +05:30
Suraj Shetty
fbcc56536b fix: Rename Pick TIcket -> Pick List 2019-08-01 12:05:20 +05:30
Suraj Shetty
fa9111ebe2 fix: Add and rename some fields 
- Add ability to create delivery note from pick ticket
- Minor fix related to create button
 2019-08-01 11:07:14 +05:30
rohitwaghchaure
fdb5e6b2e5
Merge pull request #18531 from rohitwaghchaure/scrap_item_not_adding_v12_hotfix 
fix: scrap item not adding while doing finished good entry
 2019-07-31 00:47:01 +05:30
Rohit Waghchaure
862363521b fix: scrap item not adding while doing finished good entry 2019-07-30 23:57:58 +05:30
deepeshgarg007
f9c0ef3eb3 fix: Check zero valuation rate only for valid doctypes 2019-07-30 19:01:53 +05:30
deepeshgarg007
548293ad08 fix: Check zero valuation rate only for valid doctypes 2019-07-30 18:49:19 +05:30
Suraj Shetty
72d03464dc fix: Show "Get Item Location" only if there are reference items 2019-07-30 11:56:24 +05:30
Suraj Shetty
14fb1600ec fix: Select location based on group warehouse 2019-07-30 11:47:21 +05:30
Suraj Shetty
341f7733d1 fix: Make item read-only in item location table 2019-07-30 10:02:50 +05:30
Suraj Shetty
e260e8239f fix: Batch number selection code 2019-07-30 10:02:10 +05:30
Suraj Shetty
55ab31314c fix: Add code to set batch no 
- And split item based on batch availibility
 2019-07-30 09:02:03 +05:30
Suraj Shetty
9ad10cb425 test: Add basic tests 2019-07-29 16:52:26 +05:30
rohitwaghchaure
a55e4e2c03
Merge pull request #18452 from rohitwaghchaure/scrap_item_not_adding 
fix: scrap item not adding while doing finished good entry
 2019-07-29 15:30:24 +05:30
Suraj Shetty
7e20324776 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-07-29 09:41:08 +05:30
Suraj Shetty
27bdba49d4 test: Add test case statements 2019-07-28 22:04:07 +05:30
Suraj Shetty
d43764c8e5 fix: Use .set method to set serial no. 2019-07-28 22:03:28 +05:30
Saurabh
af19347376
Merge branch 'develop' into scrap_item_not_adding 2019-07-26 15:10:17 +05:30
Deepesh Garg
64968979b2
Merge branch 'version-12-hotfix' into stock-ageing-v12 2019-07-26 14:42:34 +05:30
Suraj Shetty
64f174fcaa feat: Get item location from reference items 
- Add option to get items from multiple sales order
- Add some required fiels to Pick TIcket Reference Item
 2019-07-26 13:22:05 +05:30
Deepesh Garg
941e21092c
Merge branch 'develop' into stock_ageing_fix 2019-07-26 12:47:05 +05:30
deepeshgarg007
06f99cae36 fix: Fixes in stock ageing report 2019-07-26 10:32:08 +05:30
deepeshgarg007
15154d4bd0 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-26 10:30:22 +05:30
deepeshgarg007
7fdab021b6 fix: Use get_serial_no and remove batch 2019-07-26 10:26:13 +05:30
deepeshgarg007
1495c9599a fix: Remove batch 2019-07-26 10:25:54 +05:30
deepeshgarg007
e3a2ab184e fix: Consider serial no and batches in Stock ageing report 2019-07-26 10:25:15 +05:30
deepeshgarg007
f7733be322 fix: Enhancement in stock ageing report 2019-07-26 10:25:04 +05:30
deepeshgarg007
4d53992b35 fix: Changed columns to new dict form 2019-07-26 10:24:40 +05:30
Aditya Hase
f2fb461e40 perf(tests): Remove unnecessary tearDown code 2019-07-26 05:54:04 +05:30
Aditya Hase
f4314a25b6 perf(travis): Use setUpClass instead of setUp 2019-07-26 05:54:04 +05:30
Aditya Hase
bd69f43322 fix(stock): Fix travis builds 2019-07-26 05:54:04 +05:30
Aditya Hase
1e82638ae8 perf(tests): Remove unnecessary tearDown code 2019-07-26 03:52:17 +05:30
Aditya Hase
ff79463e36 perf(travis): Use setUpClass instead of setUp 2019-07-26 03:08:45 +05:30
Aditya Hase
6bc2988623 fix(stock): Fix travis builds 2019-07-26 03:08:45 +05:30
Suraj Shetty
3b31800533 fix: Add logic to set batch no [WIP] 
- Add pick ticket reference item
 2019-07-25 11:22:45 +05:30
Suraj Shetty
0576ad5ef9 fix: Move pick list creation code to picklist.py file 2019-07-24 15:16:03 +05:30
Suraj Shetty
778b4926bf fix: Fetch warehouse location from Bin 2019-07-24 11:27:32 +05:30
Rohit Waghchaure
bcfbc792b4 fix: scrap item not adding while doing finished good entry 2019-07-23 16:05:29 +05:30
Suraj Shetty
ed4f8cf65d Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-07-23 13:29:41 +05:30
deepeshgarg007
a19d1d6926 fix: Fixes in stock ageing report 2019-07-23 08:30:09 +05:30
Nabin Hait
cd1094e1c2 Merge branch 'rohitwaghchaure-stock_reco_for_serialized_items' into develop 2019-07-22 17:01:08 +05:30
Nabin Hait
ca25b925f5 fix: Calcellation logic for reconciliation of serialized items 2019-07-22 17:00:32 +05:30
deepeshgarg007
d9cc84892b fix: Use get_serial_no and remove batch 2019-07-22 15:56:41 +05:30
deepeshgarg007
3877b5407c fix: Remove batch 2019-07-22 15:30:18 +05:30
deepeshgarg007
55ca054cb4 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-22 12:46:30 +05:30
Anurag Mishra
305da799a4 Handling case for Material Request type 'Manufacture' v12 (#18365) 
* fix: status for 'material request type == Manufacture'

* Patch: for setting status

* fix: list view status
 2019-07-22 11:35:16 +05:30
Himanshu
73d446023d fix: file attach via import (#18414) 2019-07-22 11:19:47 +05:30
Deepesh Garg
60a291af8f fix: Sample qty validation fix in purchase receipt (#18419) 
Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
 2019-07-22 11:14:14 +05:30
Himanshu
0a8816e053 feat(Google Maps): Google Maps Refactor [Unified Google API Settings] (#18110) 2019-07-19 14:38:04 +05:30
rohitwaghchaure
3403d1cc44
Merge pull request #18095 from scmmishra/remove-move-stock-summary 
refactor: move and add for serialized and batch items in stock summary
 2019-07-17 18:50:00 +05:30
Suraj Shetty
6824838ab0 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-07-17 15:39:09 +05:30
Deepesh Garg
902e5ab744
Merge branch 'develop' into ac_dim_usability_fixes 2019-07-16 16:17:07 +05:30
deepeshgarg007
4a7f370b15 fix: Consider serial no and batches in Stock ageing report 2019-07-16 16:08:50 +05:30
Shivam Mishra
7339c72208
Update item_dashboard.js 2019-07-16 13:19:13 +05:30
Shivam Mishra
5738c93b8f style: commonified move and add button handler 2019-07-16 12:52:19 +05:30
Shivam Mishra
7ab6010225 Merge branch 'remove-move-stock-summary' of github.com:scmmishra/erpnext into remove-move-stock-summary 2019-07-16 12:33:13 +05:30
Shivam Mishra
fd6ff62bdb style: code styling fixes 2019-07-16 12:32:50 +05:30
deepeshgarg007
6ecbd97fbe Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-16 09:02:48 +05:30
Nabin Hait
6e264701cb Merge branch 'stock_reco_for_serialized_items' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-stock_reco_for_serialized_items 2019-07-15 18:12:49 +05:30
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields (#17788) 
* refact: Refactored over delivery/receipt/billing fields

* fix: test case
 2019-07-15 18:02:58 +05:30
deepeshgarg007
1cc46c06b0 Merge branch develop into ac_dim_usability_fixes 2019-07-15 15:34:40 +05:30
Faris Ansari
280fe396b9 fix: Dont rebuild cache on cache bust (#18319) 
- Results in a lot of stale background jobs
- Cache will be built when needed
 2019-07-15 14:30:21 +05:30
Mangesh-Khairnar
1ac9a8e82e fix(bin): update requested qty in bin (#18297) 2019-07-15 14:08:47 +05:30
deepeshgarg007
a85db66146 fix: Usability fixes in accounting dimensions 2019-07-14 18:15:19 +05:30
deepeshgarg007
581d931031 fix: Enhancement in stock ageing report 2019-07-13 21:58:32 +05:30
deepeshgarg007
d43d19acfd Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-13 11:40:05 +05:30
Shivam Mishra
5594ea5298
Merge branch 'develop' into remove-move-stock-summary 2019-07-12 16:04:12 +05:30
Deepesh Garg
d73426a3bc fix: Add status field at parent level in quality inspection and minor UX fix (#18263) 
* fix: Add status field at parent level and minor UX fix

* fix: Set default status as Accepted
 2019-07-12 14:44:22 +05:30
Deepesh Garg
587bdf09eb
Merge branch 'develop' into feat-manufacturer-is-missing-contacts 2019-07-12 12:30:42 +05:30
Suraj Shetty
ca872381a1 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-07-12 12:13:09 +05:30
Anurag Mishra
53e7df078e fix: set project link in item tables (#18233) 2019-07-12 12:05:39 +05:30
Suraj Shetty
32371c8755 feat: Init Pick Ticket and Pick Ticket Item 2019-07-12 11:56:42 +05:30
Saurabh
acaf76a6de
Merge branch 'develop' into feat-manufacturer-is-missing-contacts 2019-07-12 11:10:12 +05:30
rohitwaghchaure
b390b70ee3 fix: set project in material request when pull items from bom (#18256) 2019-07-11 15:22:03 +05:30
rohitwaghchaure
058787d204 fix: error report for item price (#18212) 2019-07-10 17:03:48 +05:30
deepeshgarg007
1dc124cf75 fix: Changed columns to new dict form 2019-07-10 14:49:25 +05:30
Shivam Mishra
eb7c037bdf Merge branch 'develop' of https://github.com/frappe/erpnext into remove-move-stock-summary 2019-07-10 10:22:20 +05:30
Shivam Mishra
444091b350 refactor: disable quick entry for batched and serialized items 2019-07-10 10:22:08 +05:30
rohitwaghchaure
8a054e4b36
Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry 
feat: provision to make debit / credit note against the stock returned entry
 2019-07-07 00:51:46 +05:30
Bhavishya Sharma
607611ebdc codacy fix 2019-07-06 15:02:57 +05:30
Bhavishya Sharma
db3c5625ae feat: Manufacturer is Missing Contacts 2019-07-06 13:54:30 +05:30
rohitwaghchaure
6ea1f7becf
Merge pull request #18177 from scmmishra/po-patch-1 
refactor: added throw if supplier is not default for any item
 2019-07-05 18:12:56 +05:30
Rohit Waghchaure
5d4d70b75f feat: provision to make debit / credit note against the stock returned entry 2019-07-05 17:06:25 +05:30
Shivam Mishra
6277966105 chore: added check for auto-reorder in stock settings (#18174) 
* chore: added check for auto-reorder in stock settings

* style: removed explicit return
 2019-07-05 15:58:13 +05:30
Suraj Shetty
83f767b5a3
Merge pull request #18173 from karthikeyan5/develop-add-manufacturing-dashboards 
feat(manufacturing): added dashboard for doctypes
 2019-07-05 14:22:13 +05:30
Shivam Mishra
7a7c66e95e refactor: added throw if supplier is not default for any item 2019-07-05 13:06:53 +05:30
Rohit Waghchaure
cdb75b56c5 fix: removed item manaufacturer child table from item master 2019-07-05 12:24:14 +05:30
karthikeyan5
ad33c19510 fix: converting spaces to tabs on a few lines 2019-07-05 11:28:59 +05:30
Shivam Mishra
38b930b638 refactor: Move and Add buttons open new stock entry 2019-07-05 10:38:48 +05:30
karthikeyan5
830f2b642b chore(manufacturing): added dashboard for doctypes 2019-07-05 09:48:38 +05:30
Faris Ansari
23c80658ba fix: Add links in validation message 2019-07-04 18:54:04 +05:30
Shivam Mishra
e528b29eea Merge branch 'develop' of https://github.com/frappe/erpnext into remove-move-stock-summary 2019-07-04 13:46:30 +05:30
rohitwaghchaure
f078031c60 fix: multiple minor issues in delayed order report (#18134) 2019-07-03 11:43:38 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997) 
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
 2019-07-03 10:34:31 +05:30
Shivam Mishra
43cebdff4d fix: translated title (#18119) 2019-07-01 11:01:28 +00:00
Nabin Hait
f5aff98589
fix: Validate changes in batch, serial nos, val method fields (#18064) 2019-06-28 12:47:44 +05:30
Aditya Hase
ce9cdfb056
fix(ui): better message after creating serial numbers (#18093) 
fix(ui): better message after creating serial numbers
 2019-06-27 18:20:13 +05:30
Aditya Hase
7f3ebb1d06
Merge branch 'develop' into stock-ledger-link 2019-06-27 18:19:15 +05:30
Aditya Hase
b9c9ada3f8
Merge pull request #18090 from scmmishra/twelve-fixes 
fix: print message for insufficient stock
 2019-06-27 18:18:24 +05:30
Shivam Mishra
c41403c8a9 fix: remove move and add buttons from stock summary 2019-06-27 16:34:38 +05:30
Shivam Mishra
468d5563c6 fix: set serial numbers as data field 2019-06-27 14:13:54 +05:30
Shivam Mishra
e1aec5519b fix(ui): better message after creating serial numbers 2019-06-27 13:14:41 +05:30
Shivam Mishra
bc777b1732 fix: styling for sort selector 2019-06-27 12:43:39 +05:30
Shivam Mishra
9e07b7d2b8
Merge branch 'develop' into twelve-fixes 2019-06-27 09:44:41 +05:30
Rohit Waghchaure
6de3ed5416 fix: dn test cases 2019-06-26 21:58:42 +05:30
rohitwaghchaure
387ee8f511 fix: returned qty issue while making sales invoice from dn if same item added multiple times (#18076) 2019-06-26 13:40:26 +05:30
Shivam Mishra
9479f7f1ef fix: print message for insufficient stock 2019-06-26 10:37:00 +05:30
Mangesh-Khairnar
558a5c199f fix(price list): change the field name 2019-06-24 17:32:04 +05:30
Rushabh Mehta
5162b7457f
Merge pull request #17918 from Alchez/develop-item-code-gen 
fix(stock): Remove hardcoded validation for Item
 2019-06-20 14:21:57 +05:30
rohitwaghchaure
40c5fcc9cc
Merge pull request #17967 from Alchez/develop-delivery-email 
fix(delivery): Add items to context for dispatch notification email
 2019-06-19 14:37:23 +05:30
Anurag Mishra
3d47a6dbb5 fix: Company filters in Total Stock Summary Report (#17965) 2019-06-17 17:49:04 +05:30
Rohan Bansal
4babfdb987 fix(delivery): Add more context for dispatch notification email + formatting fixes 2019-06-17 16:16:51 +05:30
Rohit Waghchaure
725f56faca feat: delayed order reports 2019-06-17 12:50:44 +05:30
Rohit Waghchaure
059890ecef Test cases for batch no 2019-06-14 17:24:47 +05:30
Anurag Mishra
4c1639305f feat: creating stock entry against purchase receipt 2019-06-14 12:31:08 +05:30
Shivam Mishra
4def9836e0
Merge branch 'develop' into bom-item-fix 2019-06-13 16:17:54 +05:30
Mangesh-Khairnar
b2f266ad10 fix: get bom item when company is not passed 2019-06-13 14:34:40 +05:30
Deepesh Garg
0d7d4879a9
Merge pull request #17920 from Anurag810/stock_balance_report 
fix: fetch item on the base of item group
 2019-06-13 10:49:30 +05:30
Anurag Mishra
bbe2c4fb01 fix: fetch item on the base of item group 2019-06-12 19:09:51 +05:30
Rohan Bansal
ddea50fa22 fix(stock): Remove hardcoded validation for Item 2019-06-12 17:59:23 +05:30
rohitwaghchaure
dde4f93137
Merge pull request #17881 from rohitwaghchaure/cogs_only_for_material_issue_in_ste_develop 
fix: set COGS for material issue only
 2019-06-10 16:57:23 +05:30
Rohit Waghchaure
9a792c2eed stock_entry: set COGS for material issue only 2019-06-07 15:20:36 +05:30
Rohit Waghchaure
3cf24366a9 feat: provision to set multiple manufacturer in the item master 2019-06-06 19:53:32 +05:30
Rohit Waghchaure
87c4b06437 Test cases for serial no 2019-06-02 16:29:07 +05:30
Rohit Waghchaure
66aa37f1e2 provision to add batch number in the stock reconciliation 2019-06-02 16:29:07 +05:30
Rohit Waghchaure
05d3bcb63d stock recon for serial no, batch no 2019-06-02 16:29:06 +05:30
deepeshgarg007
e19abb162a fix: Resolve merge conflicts in purchase_receipt_item 2019-06-01 23:26:09 +05:30
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30
Saurabh
f68bd8f349
Merge pull request #17813 from rohitwaghchaure/allow_import_for_packing_slip_develop 
fix: allow import for packing slip
 2019-05-31 14:24:51 +05:30
Saurabh
731986d8ee
Merge pull request #17811 from nabinhait/pr-expense-account-dev 
fix: Added Expense Account field to push value from PO-PR-PI
 2019-05-31 14:19:47 +05:30
Rohit Waghchaure
e98d1c1147 fix: allow import for packing slip 2019-05-31 14:16:11 +05:30
deepeshgarg007
2580075583 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-30 22:11:27 +05:30
Nabin Hait
0e1e37c921 fix: Added Expense Account field to push value from PO-PR-PI 2019-05-30 18:13:41 +05:30
Saif Ur Rehman
7129231dbb fix(Product Bundle Balance): Update frappe.db.escape for v12 2019-05-30 13:55:32 +05:00
Deepesh Garg
12a9a3ffa3
Merge branch 'develop' into Product-Bundle-Balance 2019-05-29 18:23:21 +05:30