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

2271 Commits

Author SHA1 Message Date
Saurabh
b35906efc1 [fix] load dependancies on page load event 2016-07-02 17:13:11 +05:30
Saurabh
feefaaf1ee [fix] Stock Analytics Report page fix 2016-07-01 18:15:17 +05:30
Rohit Waghchaure
4d8f4d76e1 [Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI 2016-07-01 15:33:57 +05:30
Rohit Waghchaure
fc1fa9a774 [RFQ Enhancement] Added button on supplier row to download PDF for particular supplier 2016-07-01 14:53:11 +05:30
Saurabh
1301b3b3d1 [fix] set default value for is_group to 0 2016-06-29 19:48:44 +05:30
Saurabh
b8a57a4b4d [fix] wareehouse nestedset fix if company not associated with warehouse 2016-06-29 19:01:49 +05:30
Saurabh
d7d878b6db [fix] label fix 2016-06-29 18:48:20 +05:30
Saurabh
52c2affc9c [fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts 2016-06-28 14:41:48 +05:30
Neil Trini Lasrado
b7ff027937 Added Safety Stock to Item Master 2016-06-27 17:45:08 +05:30
Rushabh Mehta
d362b734a2 Merge pull request #5529 from saurabh6790/module_flow 
[fix] previous document links
 2016-06-27 17:23:46 +05:30
Saurabh
93d68ac0c2 [fixes] change is group to check box 2016-06-27 17:16:56 +05:30
Saurabh
99892c7ce7 [fix] provision to convert group to ledger and vice versa 2016-06-27 17:16:56 +05:30
Rushabh Mehta
822209cb03 Merge pull request #5538 from rohitwaghchaure/time_sheet_wages 
[Enhancement] Time log wages and multiple active salary structure
 2016-06-27 17:13:48 +05:30
Saurabh
ce22d34fcf [fix] report Stock Projected Qty 2016-06-27 17:05:13 +05:30
Rohit Waghchaure
d6c986da8f [Enhancement] Time log wages and multiple active salary structure 2016-06-27 16:46:39 +05:30
Rushabh Mehta
a2c4dad90e [fix] product search 2016-06-27 14:55:01 +05:30
Saurabh
b6d6b8420d [fix] add filters and child doc name in previous link mapper 2016-06-27 14:48:26 +05:30
Saurabh
2a0b111726 [fix] mark completed docuemts on document flow 2016-06-27 12:28:55 +05:30
Saurabh
8f24ecb173 [fix] set previous doc links for document flow 2016-06-27 12:28:55 +05:30
Saurabh
d9131ec4ff [minor][fix] remove website generator call on after rename 2016-06-27 12:25:05 +05:30
Anand Doshi
d6b734e2e3 [fix] DuplicateEntryError for Warehouse Account Creation 2016-06-26 17:43:14 +05:30
Saurabh
78333c7e07 [fixes] check group condition 2016-06-26 14:27:46 +05:30
Saurabh
7fecb50360 [enhance] rename warehouse account type to stock 2016-06-26 14:27:46 +05:30
Nabin Hait
14f0a6fa89 Merge pull request #5534 from KanchanChauhan/itemprice-update-in-pricelist 
Item Price update in Price List
 2016-06-26 13:07:35 +05:30
Nabin Hait
c65f160776 [fix] Identify account group for warehouse based on account type 2016-06-26 08:25:51 +05:30
Rushabh Mehta
723cd64249 [fix] tree view hooks and patch fix 2016-06-25 18:30:03 +05:30
Kanchan Chauhan
2ff7d2aade Fixed 2016-06-25 17:54:25 +05:30
Nabin Hait
173b328380 Merge pull request #5527 from bcornwellmott/patch-4 
Fix Percent Billed to show Percentage
 2016-06-25 13:53:55 +05:30
Saurabh
dc2fa86222 [fixes] rename ctype to doctype 2016-06-25 11:16:55 +05:30
Saurabh
001d4d74fa [fix] in set_valuation_method check for is group condition 2016-06-25 11:06:15 +05:30
Saurabh
4d02949814 [fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account 2016-06-25 11:06:14 +05:30
Saurabh
ac53357f53 [fixes] renamed _treeview to _tree 2016-06-25 11:06:14 +05:30
Saurabh
9c7b0079c5 [fixes] warehose group wise stock report and test cases for warehouse hierarchy and warehouse group wise reorder level 2016-06-25 11:06:13 +05:30
Saurabh
3d6aecd618 [fixes] set warehouse group wise reorder level, validate ledger (leaf warehouse) on sle and bin 2016-06-25 11:06:13 +05:30
Saurabh
554f6f70aa [fixes] nested set fix for warehouse, tree for accounts and cost center 2016-06-25 11:06:13 +05:30
Saurabh
d647945102 [fixes] 2016-06-25 11:06:13 +05:30
Saurabh
eda1afb4eb [fixes] comnify tree view 2016-06-25 11:06:13 +05:30
Saurabh
091ca75fa3 [enhance] warehouse browser page for warehouse tree 2016-06-25 11:06:12 +05:30
Saurabh
dfbcdeb8a0 [enhancement] warehouse tree structure 2016-06-25 11:06:12 +05:30
Saurabh
a4a3b022ee [fix] return route from make_route of child class 2016-06-25 10:43:02 +05:30
Kanchan Chauhan
5ee8fccb1a Item Price update in Price List 2016-06-24 17:11:15 +05:30
Rushabh Mehta
a334062b03 [redesign] website routing system 2016-06-24 16:18:07 +05:30
Nabin Hait
2effad33d0 Merge branch 'master' into develop 2016-06-24 12:48:24 +05:30
Nabin Hait
6dfc78b12a Item Valuation Rate in case of negative inventory 2016-06-24 12:28:55 +05:30
bcornwellmott
813dddeb10 Fix Percent Billed to show Percentage 
Previously was showing Currency
 2016-06-22 14:49:31 -07:00
Rushabh Mehta
b5f2c78f8f [list] reports for item list 2016-06-15 12:57:22 +05:30
Rushabh Mehta
d1eba515e9 [cleanup] fixes to v7 2016-06-13 17:47:13 +05:30
Rushabh Mehta
538607e6b6 [cleanup] a better message for insufficient stock 2016-06-12 11:03:00 +05:30
Rushabh Mehta
743de9b306 [minor] website field in customer and allow_import for purchase receipt, fixes #5227 2016-06-09 15:11:45 +05:30
Rushabh Mehta
e9d2c3d46e [fix] report requested items to be transferred, fixes #5295 2016-06-08 16:41:09 +05:30
Anand Doshi
16e2442278 [cleanup] document flow 2016-06-07 18:55:23 +05:30
Saurabh
7d0e78d399 [fixes] this.frm instead of cur_frm 2016-06-07 17:19:36 +05:30
Saurabh
9df3d0fb8a [enhance] show module flow on top of document 2016-06-07 17:19:36 +05:30
Rushabh Mehta
aed79e993f [fix] item attribute validation, fixes #5308 2016-06-02 17:49:16 +05:30
Rushabh Mehta
675f9c6e6e [minor] reset barcode if item is changed, fixes #5314 2016-06-02 16:34:00 +05:30
Rushabh Mehta
0dcb861b56 [minor] 2016-05-31 07:22:51 +05:30
Rushabh Mehta
bc92824bc4 [minor] rename item_name if same as item, on rename and removed item selector 2016-05-31 07:22:51 +05:30
Nabin Hait
591a5aba56 Added Project in GL Entry and General Ledger report 2016-05-26 17:51:20 +05:30
Nabin Hait
79ddf67289 Merge pull request #5362 from nabinhait/budget 
Budgeting
 2016-05-23 17:56:42 +05:30
Rohit Waghchaure
bc894428ca Added today as default in transaction. 2016-05-23 15:22:36 +05:30
Nabin Hait
832988e2fd test case fixed 2016-05-23 13:04:26 +05:30
Nabin Hait
3956c94bbb Merge pull request #5340 from rohitwaghchaure/support_week_new 
[Fix] Sales Invoice shows default date while no default mentioned
 2016-05-20 12:06:22 +05:30
Rushabh Mehta
532eedf411 [enhance] more editable grids 2016-05-19 18:22:49 +05:30
Rushabh Mehta
35047ac283 [ux] direct editing in material request 2016-05-18 18:17:38 +05:30
Rohit Waghchaure
5d97d89a03 [Fix] Sales Invoice shows default date while no default mentioned 2016-05-17 15:13:17 +05:30
Rushabh Mehta
3a87c479c7 Merge pull request #5346 from umairsy/domains 
Domainifying
 2016-05-16 12:02:51 +05:30
Umair Sayyed
99f7528578 domanifying ERPNext via #5334 2016-05-13 18:06:17 +05:30
Rohit Waghchaure
8904730cd4 [Fix] Removed is_pro_applicable 2016-05-12 18:03:08 +05:30
Rushabh Mehta
4b9238a03b [cleanup] homepage 2016-05-12 15:23:17 +05:30
Nabin Hait
b81ed45b2b fixed conflict 2016-05-11 12:52:31 +05:30
Nabin Hait
1997350364 [fix] Divisional loss in purchase receipt 2016-05-11 12:06:29 +05:30
Nabin Hait
a9c4c8fc31 In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate 2016-05-09 17:34:47 +05:30
Nabin Hait
332d29f166 Merge branch 'master' into develop 2016-05-06 16:13:35 +05:30
Nabin Hait
e67c1cdf12 [fix] In purchase return entry, consider outgoing rate for serialized items 2016-05-06 15:46:31 +05:30
Rushabh Mehta
c711b82889 Merge pull request #5296 from KanchanChauhan/websitemakeover 
New look to the website
 2016-05-02 15:54:41 +05:30
Kanchan Chauhan
239b351367 New look to the website 2016-05-02 11:43:44 +05:30
Rushabh Mehta
be2ee18de4 [fixed] frappe.require is now async 💥 2016-04-29 17:22:42 +05:30
Rushabh Mehta
1aa1c8a9ef [minor] remove hide_first in forms 2016-04-29 12:20:23 +05:30
Nabin Hait
6146cc1e33 Merge branch 'master' into develop 2016-04-29 11:44:55 +05:30
Nabin Hait
761a7a8e7c [fix] On rename update item code in item_wise_tax_detail json in tax table 2016-04-28 17:33:49 +05:30
Rushabh Mehta
5dfe20ce17 [fix] frappe.require in stock_entry.js 2016-04-26 12:59:08 +05:30
Rushabh Mehta
3d2622ce91 [refacator] added dashboard in item 2016-04-25 17:53:42 +05:30
Rushabh Mehta
0fa7b7c4f2 [test] [fix] default cost_center 2016-04-23 11:11:10 +05:30
Rushabh Mehta
0394aec6a4 [wip] inventory tool 2016-04-22 17:22:22 +05:30
Rushabh Mehta
68d428bfd4 [fix] for sort selector 2016-04-22 13:23:34 +05:30
Rushabh Mehta
621283c5c5 [enhancement] stock balance page 2016-04-21 19:00:34 +05:30
Rushabh Mehta
202cb7cdf1 Merge pull request #5249 from nabinhait/fixed_asset 
Fixed asset
 2016-04-21 11:41:11 +05:30
Rushabh Mehta
c291ab64a6 Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext 
[WIP] No not merge
 2016-04-21 11:39:45 +05:30
Rushabh Mehta
02772442b6 [cleanup] added dashboard in project 2016-04-20 18:45:56 +05:30
Nabin Hait
3d9c5c0c20 Fixed Asset module cleanup and fixes 2016-04-20 17:57:11 +05:30
Kanchan Chauhan
11638ba358 Changes 3 2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952 Changes 2 2016-04-20 16:24:24 +05:30
Rushabh Mehta
0525387328 [enhancement] added reserved_qty_for_production in bin and updated item dashboard 2016-04-18 19:27:46 +05:30
Nabin Hait
c46c1f0288 [fix] Rejected serial nos in purchase invoice 2016-04-18 17:46:36 +05:30
Nabin Hait
14aa9c5320 [fix] Cleanup and fixes in update stock feature in Purchase Invoice 2016-04-18 16:59:47 +05:30
Saurabh
7fee1b8343 [fixes] set expence account to item on sales invoice 2016-04-18 15:58:43 +05:30
Saurabh
224737b9ed [fixes] split make gl entry function into chuncks as per SI 2016-04-18 15:58:43 +05:30
Saurabh
fbb342c1ac [enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI 2016-04-18 15:58:43 +05:30
Saurabh
130c57b201 [fixes] code clean-up 2016-04-18 15:58:43 +05:30
Saurabh
e29248bcb3 [fixes] test-case to validate quantity after update stock and purchase return and code-cleaning 2016-04-18 15:58:43 +05:30
Saurabh
4bd34a58ba [fixes] fix perpetual inventory 2016-04-18 15:57:55 +05:30
Rushabh Mehta
17d52becdf [typo] 2016-04-15 16:51:33 +05:30
Rushabh Mehta
86a824c767 [ux] added opening stock and rate in new Item 2016-04-15 16:44:44 +05:30
Rushabh Mehta
e8e9440b06 [fix] [tests] 2016-04-15 15:19:35 +05:30
Rushabh Mehta
be2dde468d [enhance] set material request title as comma separated list of items 2016-04-15 15:11:06 +05:30
Rushabh Mehta
a305c29b0e [cleanup] remove is_pro_applicable 2016-04-15 15:03:16 +05:30
Rushabh Mehta
dd9a973a0b Merge pull request #5216 from umairsy/is-sales-purchase 
Removed Is Sales Item and Is Purchase Item
 2016-04-15 14:12:14 +05:30
Rushabh Mehta
f4c25b13e2 [fix] update total_projected_qty in bin.py 2016-04-15 13:01:09 +05:30
Umair Sayyed
72534deea2 removed Is Sales Item and Is Purchase Item 2016-04-15 12:57:00 +05:30
Nabin Hait
972c25f78d Fixed conflict 2016-04-14 18:25:53 +05:30
Rushabh Mehta
15a7f215b9 [enhancement] heatmaps on item and notifications for item 2016-04-14 17:30:53 +05:30
Umair Sayyed
6269f1e3d0 address and contact related fields re-arranged in the sales transactions fixes #5192 2016-04-14 13:07:41 +05:30
Rushabh Mehta
0e2dd859b0 [cleanup] link dashboard for customer, supplier, item, employee and hide form by default 2016-04-13 17:22:09 +05:30
Nabin Hait
4b09f48d94 Merge pull request #5195 from nabinhait/stock_non_stock_item_toggle 
Dont allow to toggle stock and non-stock settings if any transaction exists against the item
 2016-04-13 11:40:45 +05:30
Rushabh Mehta
8bbca6fa2e [enhancement] links menu in customer, supplier, item 2016-04-12 19:16:33 +05:30
Nabin Hait
dd94d4e43d Dont allow to toggle stock and non-stock settings if any transaction exists against the item 2016-04-12 19:00:50 +05:30
Nabin Hait
32b2a7795e [fix] Set actual qty onload of the draft stock entry. Fixed #5172 2016-04-11 15:14:05 +05:30
Rushabh Mehta
203cc962f5 [enhancement] Item Selector 2016-04-08 17:21:00 +05:30
shreyas
ffeacb299d [Fix] Show a message while user tries to create Material request with BOM which contains only non-stock item 2016-04-08 16:32:19 +05:30
shreyas
b94b94afd9 [Fix] Move company field to top of the Stock Entry form 2016-04-07 16:25:29 +05:30
Rushabh Mehta
78b7a53635 [cleanup] set default bold, print_hide for prints 2016-04-06 15:29:45 +05:30
Rushabh Mehta
d690094b12 [image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM 2016-04-04 16:57:56 +05:30
Nabin Hait
4f10f15686 [fix] Modified date changed in query report due to project field renaming 2016-04-01 17:59:06 +05:30
Rushabh Mehta
45c6b550f0 [cleanup] assets and made items mandatory in transactions 2016-03-31 15:37:51 +05:30
Nabin Hait
1d04a23a00 Merge pull request #5082 from umairsy/perm-issue-2 
[Fix] changed permission for the Stock Ledger Entry
 2016-03-31 11:54:28 +05:30
Rushabh Mehta
72b4ad8155 [cleanup] for quick-entry 2016-03-30 15:42:22 +05:30
Rushabh Mehta
3fc6fdeba0 [cleanup] for quick-entry 2016-03-30 13:18:30 +05:30
Rushabh Mehta
652dee45a6 [minor] make margin collapsible 2016-03-29 16:42:13 +05:30
Umair Sayyed
6481ab23ce [Fix] changed permission for stock ledger entry 2016-03-29 13:35:46 +05:30
Nabin Hait
4fdb05228d fixed asset depreciation 2016-03-29 11:54:37 +05:30
Nabin Hait
3a15c92c5e Fixed Asset Depreciation first commit 2016-03-29 11:54:37 +05:30
Rushabh Mehta
3117b4b8d6 [fix] minor for quick-entry 2016-03-29 11:53:17 +05:30
Rushabh Mehta
e1b20a0b29 Merge pull request #5044 from rohitwaghchaure/add_margin_feature 
[Enhancement] Add margin in sales flow.
 2016-03-28 18:27:05 +05:30
rohitwaghchaure
a1064a6149 [enhancement] request for quotation 2016-03-28 17:28:45 +05:30
rohitwaghchaure
6d1b5d618a [enhancement] request for quotation 2016-03-28 12:13:07 +05:30
rohitwaghchaure
44d0449895 [enhancement] request for quotation 2016-03-28 12:13:07 +05:30
Rushabh Mehta
c20c536f28 [fix] [wip] cleanup for collaborative pm 2016-03-25 17:22:17 +05:30
mbauskar
a52472cf5b [fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py 2016-03-24 14:07:51 +05:30
mbauskar
b6d19bcfc2 [fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item 2016-03-24 14:07:50 +05:30
mbauskar
6f60339e75 [fix] total margin calculations 2016-03-24 14:07:50 +05:30
mbauskar
b8b56f127f fetched the markup type and rate of selected item 2016-03-24 14:07:49 +05:30
Rushabh Mehta
b2269dd326 [fix] back links from project web view 2016-03-23 18:29:00 +05:30
Rushabh Mehta
17da0b8f8b Merge pull request #5035 from rmehta/warehouse-buttons 
[enhancement] [minor] stock ledger, general ledger buttons in warehouse
 2016-03-23 11:50:30 +05:30
Rushabh Mehta
3cc9b3ef08 [enhancement] [minor] stock ledger, general ledger buttons in warehouse 2016-03-22 16:18:01 +05:30
Neil Trini Lasrado
11dafa27ba Added Project to materail request 2016-03-21 12:40:42 +05:30
Nabin Hait
9a75530c26 [fix] reload doctype for renaming project 2016-03-18 16:19:25 +05:30
Nabin Hait
4e78cee1c2 Merge pull request #4959 from ShashaQin/patch-37 
Improvements about Item Prices Report
 2016-03-17 18:13:09 +05:30
Nabin Hait
6221117069 [fix] shipping address position in document 2016-03-16 16:23:30 +05:30
Saurabh
14d646f636 [fixes] shipping address on purchase flow 2016-03-16 16:23:30 +05:30
Neil Trini Lasrado
f433a5a124 Fixed bug while selecting project in sales_invoice, sales_order, delivery_note 2016-03-16 16:00:27 +05:30
ShashaQin
769b01e07a Update item_prices.py 2016-03-16 16:37:28 +08:00
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
rohitwaghchaure
986616f8ee [fixes]draft BOM showing in Material Request 2016-03-14 19:33:30 +05:30
Nabin Hait
b1f0a7d52e Merge pull request #4876 from saurabh6790/valuation_rate_on_so 
[enhancement] get valuation rate and gross profit on sales order item
 2016-03-14 19:18:58 +05:30
Nabin Hait
d1f85c4fe6 [fix] Item or Warehouse filter mandatory in Stock Balance if number of sle is greater than 500000 2016-03-14 14:59:21 +05:30
Valmik Jangla
13bb2ba779 Removed fiscal year related things from, Recurrent Document, Leave Application, Upload attendance, Stock Reconciliation and Stock Balance 2016-03-11 13:07:49 +05:30
Valmik Jangla
063946a02f Removed from Purchase Invoice and Purchase Reciept 2016-03-11 13:07:48 +05:30
Valmik Jangla
d89dcf60e6 Removed from Delivery Note and Appraisal 
Added back in Stock Ledger Entry
Added validation in GL Entry and SL Entry
Stock Controller sets Fiscal Year using Posting Date
 2016-03-11 13:07:48 +05:30
Valmik Jangla
d4ac3d8ceb Removed from Stock Ledger Entry and Sales Invoice 2016-03-11 13:07:48 +05:30
Valmik Jangla
cd9daf6671 Removed from Journal Entry and Stock Reconciliation 2016-03-11 13:07:16 +05:30
Valmik Jangla
319bbad4d4 Removed from Stock Entry 2016-03-11 13:05:19 +05:30
ShashaQin
e8d635827a Update item_prices.py 2016-03-10 14:55:06 +08:00
ShashaQin
c6b5f7dcae Update item_prices.py 2016-03-10 08:49:38 +08:00
Saurabh
3fbf3ce852 [fixes] raise if selects product bundle as sub item in another product bundle. 2016-03-09 15:42:01 +05:30
Saurabh
bd01a81638 [fixes] calculate valuation rate for stock, non-stop and product bundle items 2016-03-09 15:42:01 +05:30
Saurabh
5ada14b887 [fixes] calculate valuation rate for non stock item 2016-03-09 15:42:01 +05:30
Saurabh
2d7af63351 [fixe] typo-fixes and set base currency symbol to gross-profit and valuation rate 2016-03-09 15:42:00 +05:30
Saurabh
d313553ae3 [enhancement] get valuation rate and gross profit on sales order item 2016-03-09 15:42:00 +05:30
Anand Doshi
3fb67c7c3b Merge pull request #4945 from shreyasp/mr-wn-sup17487 
[Minor] Displaying 'for warehouse' while creating Material request from BOM
 2016-03-09 10:32:15 +05:30
shreyas
007e87b8a5 [Minor] Whitespace fixes 2016-03-08 19:01:50 +05:30
shreyas
405b66898e [Minor] Displaying 'for warehouse' while creating Material request from BOM 2016-03-08 18:39:20 +05:30
Anand Doshi
dab167791c Merge pull request #4934 from anandpdoshi/fix/stock-balance-filters 
[fix] Run Stock Balance report only after one of the filters is set
 2016-03-07 14:31:08 +05:30
Anand Doshi
0902fb2e3d [fix] Run Stock Balance report only after one of the filters is set 2016-03-07 13:11:59 +05:30
Rushabh Mehta
5a700820e7 [fix] [minor] autoload chart of accounts 2016-03-07 11:57:54 +05:30
Rushabh Mehta
aac4dcedc8 [fix] print language and contact_email fields and removed translations 2016-03-02 15:45:09 +05:30
Rushabh Mehta
cbed331047 Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test 
Multilingual print format test
 2016-03-01 17:10:50 +05:30
rohitwaghchaure
4151e3dc92 [enhancement] Multi-lingual print format 2016-03-01 16:33:08 +05:30
Rushabh Mehta
5b9d6494a6 Merge pull request #4900 from rmehta/minor-fixes 
[minor] fix notification for material request, splash icon, cleanup project form layout
 2016-03-01 16:15:25 +05:30
Rushabh Mehta
e670525c55 Merge pull request #4899 from nabinhait/seriailized_stock_valuation 
Seriailized stock valuation
 2016-03-01 16:13:09 +05:30
Rushabh Mehta
f1083c9a74 [minor] fix messages in material request 2016-02-29 14:38:25 +05:30
Nabin Hait
2620bf402f [fix] Stock Valuation for serialized items 2016-02-29 12:07:42 +05:30
Rushabh Mehta
4403853828 [minor] fix notification for material request, splash icon, cleanup project form layout 2016-02-27 16:24:34 +05:30
Saurabh
cc7132763f [fixes] set projected qty in Quotaion Item table 2016-02-26 18:33:53 +05:30
Anand Doshi
acd1bcffde [fix] changed field type to Code 2016-02-24 12:38:08 +05:30
Nabin Hait
57b30430e4 Merge pull request #4695 from neilLasrado/develop 
Material Request of type Manufcture
 2016-02-24 12:30:53 +05:30
Nabin Hait
d2d261dc87 Merge pull request #4854 from patilsangram/develop 
Removed Stop Button from SO and PO
 2016-02-24 11:21:17 +05:30
Nabin Hait
38f470288f Merge pull request #4806 from creador30/productbundle_improvement 
Product Bundle improvement
 2016-02-24 11:12:47 +05:30
creador
4b6b6fe5a8 [fix] unify packing description and packed item description 2016-02-23 22:12:02 +02:00
patilsangram
a812d67837 [fixes] 2016-02-23 19:04:29 +05:30
Neil Trini Lasrado
f79760ce2d Mumtiple fixes 2016-02-23 18:35:45 +05:30
Neil Trini Lasrado
d5e15eaadf Added test cases 2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
43114bab71 renamed label of Quantity Requested for Purchase to Requested Quantity in Bin 2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
dddf42560f Added code to update Material Request on Submission of Production Order 2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
abd9248ba6 Rename sales_order_no to sales_order in Material Request Item 2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
0b40ccc43c Removed unwanted code 2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
695bf47a1d changed image feild (type attach) to attach image, removed Image view 2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
e9cd22aff9 Fixed make Prod_order from Material Request 2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
9739dc3639 Added make Production Order button against Material Request 2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
cc23bc0549 Removed Material Request type validation 2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
3353b5ee62 Added material request type Manufacture 2016-02-23 18:35:42 +05:30
Saurabh
ac33724656 [fixes] removed no copy for warehouse field 2016-02-23 18:18:04 +05:30
Saurabh
3724448cd3 [fixes] typo-fixes and fix in balance qty fetching 2016-02-23 18:18:04 +05:30
Saurabh
dcb72c6be7 [enhance] Displaying stock balance while creating quotation 2016-02-23 18:18:04 +05:30
saurabh
65820ed013 added new field language for users 2016-02-23 02:17:03 +05:30
Nabin Hait
e32f9c3a24 Update reorder_item.py 2016-02-22 16:50:13 +05:30
patilsangram
bf2b511988 [Removed Stop Button from SO and PO] 2016-02-22 16:24:23 +05:30
Nabin Hait
38be62c7e3 [fix] Allow auto reorder based on reorder qty, even if reordeer level is zero 2016-02-22 16:24:23 +05:30
Nabin Hait
7736e092e7 Merge branch 'reorder_level_zero' of https://github.com/creador30/erpnext into creador30-reorder_level_zero 2016-02-22 16:19:33 +05:30
Nabin Hait
1a99cb8bfe [fix] Escaping strings with percentage 2016-02-19 12:45:57 +05:30
Anand Doshi
39a289145c [fix] fetch price list rate 2016-02-15 11:42:18 +05:30
creador
e156cd6379 Product Bundle improvement 
This change allows addition of multiple instances of the same product
inside a product bundle, if each has a different description in the
bundle list (thus no duplicates).

We use product bundles to include scrap material into our stock
calculations. Here we need to enter the same product with different
quantities into the same bundle. We explicitly specify scrap in the
description of each line in product bundle.
 2016-02-14 12:22:10 +02:00
creador
e71fa9210f Allow reorder_level to be set to 0 
For items you don’t want to keep in stock, you can set the
reorder_level to 0 and define reorder_qty.

If there is e.g. a sales order for that item, the projected quantity
will fall below 0, which will trigger an automatic material request.
 2016-02-14 11:58:21 +02:00
Anand Doshi
4b249fe8ec [optimization] stock balance report - force index + improve memory usage 2016-02-11 20:38:01 +05:30
Rushabh Mehta
adee283caf [minor] map custom fields from delivery note to packing slip 2016-02-11 11:58:50 +05:30
Nabin Hait
3070deb295 Packing Slip layout changes 2016-02-10 13:07:42 +05:30
Rushabh Mehta
0a67c9715c Merge pull request #4766 from nabinhait/permlevel1 
[fix] Read permission to All for permlevel 1 fields
 2016-02-08 18:52:03 +05:30
Rushabh Mehta
3cdf3544fb [enhancement] default warehouse not mandatory in time, re-order level and re-order qty must always be set per warehosue 2016-02-08 18:50:40 +05:30
Nabin Hait
4c6af87ad0 [fix] Read permission to All for permlevel 1 fields 2016-02-08 16:56:19 +05:30
Anand Doshi
17d4fc4fa7 [enhancement] Merge Comment and Feed into Communication 💥 
Depends on frappe/frappe#1532
 2016-02-08 13:06:56 +05:30
Nabin Hait
4129ae5395 [fix] Translations in Stock balance report 2016-02-04 17:22:57 +05:30
Nabin Hait
49b275ad1d Merge pull request #4704 from chaoyee/develop 
Update material_request.py
 2016-02-02 16:11:35 +05:30
Nabin Hait
3c55d89f7f [minor] Reference doctype in Item-wise price List Rate report 2016-02-01 15:55:09 +05:30
Nabin Hait
d5fda57297 [fix] Ignore permissions and made Customer warehouse field hidden in selling cycle 2016-02-01 15:55:09 +05:30
Nabin Hait
a85a1ff145 [fix] Validate rate with reference doc 2016-02-01 15:55:09 +05:30
ShashaQin
ed11e93b25 Update stock_reconciliation.py 
exclude 'disabled' item when get items
 2016-02-01 16:54:19 +08:00
ShashaQin
1d702bf112 Update stock_reconciliation_item.json 
Update valuation rate description. This description will be shown on downloaded template in order to input valuation rate correct.
 2016-02-01 16:51:01 +08:00
Chao-Yee Hsu 許朝益
71a9be8add Update material_request.py 
Add "order by mr_item.item_code ASC" to 'get_material_requests_based_on_supplier(supplier)' in order to get material request item sorted by ascending order.
 2016-01-29 18:45:22 +08:00
Anand Doshi
77e4f6b774 [fix] strip item_code before autoname 2016-01-29 11:29:36 +05:30
Chao-Yee Hsu 許朝益
c118fc9343 Update material_request.py 
Add "order by mr_item.item_code ASC" to 'get_material_requests_based_on_supplier(supplier)' in order to get material request item sorted by ascending order.
 2016-01-29 10:38:33 +08:00
Anand Doshi
01de945388 [cleanup] Removed 'Is Service Item' checkbox and filters 
'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.
 2016-01-26 16:22:51 +05:30
Anand Doshi
47c2aa179b [fix] test case for get_item_details 2016-01-21 23:18:08 +05:30
Anand Doshi
54abf025b7 [hotfix] get_price_list_rate 2016-01-21 22:28:55 +05:30
Nabin Hait
cf3b318f7d Changes modified date 2016-01-21 18:52:25 +05:30
Nabin Hait
1d21274d65 Update manufacturer.json 2016-01-21 17:01:23 +05:30
Nabin Hait
a613ea8abf [patch] Create manufacturer records 2016-01-20 18:32:37 +05:30
Dominik
d737390b80 Changed Manufacturer from Data to its own DocType, copied most of the logic from Customer but used short_name for namig series. 2016-01-20 18:32:37 +05:30
Nabin Hait
fb0b24af78 Rounding based on smallest circulating currency fraction value 2016-01-20 17:07:35 +05:30
Nabin Hait
c2c9124af8 Merge pull request #4643 from nabinhait/status_button 
[fix] Close button visible in all sumitted PR and DN
 2016-01-20 16:47:17 +05:30
Nabin Hait
5ac22ce6a1 [fix] Close button visible in all sumitted PR and DN 2016-01-19 18:30:02 +05:30
Nabin Hait
9824e22ce1 [fix] Price list rate applied via set_missing_values 2016-01-19 16:48:32 +05:30
Nabin Hait
34d2822483 Fixes in get_item_details and test cases 2016-01-19 16:48:32 +05:30
Rushabh Mehta
c978b9c36a [minor] [fix] in Item > Add / Edit Prices, go to list view instead of report, fixes #4639 2016-01-19 16:34:49 +05:30
Rushabh Mehta
aee26219ed [fix] get warehouse details on selection 2016-01-18 18:57:49 +05:30
Rushabh Mehta
b46069d44b [cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order 2016-01-15 16:59:26 +05:30
Rushabh Mehta
2e3d2b8426 Merge pull request #4613 from nabinhait/fixes 
[fix] Item query and exchange rate
 2016-01-15 11:19:44 +05:30
Rushabh Mehta
66eaf7e1c3 Merge pull request #4607 from saurabh6790/group_custom_buttons 
[enhance] merge customize buttons under groups
 2016-01-15 11:15:23 +05:30
Nabin Hait
ad42d2f67a Minor fixes 2016-01-15 11:09:41 +05:30
Nabin Hait
a88912a2f5 [fix] Item query and exchange rate 2016-01-14 10:43:17 +05:30
Saurabh
e23e99f4bd [enhance] merge customize buttons under groups 2016-01-13 09:18:31 +05:30
Anand Doshi
cc5632a99c [minor] removed image_view from in list view 2016-01-11 13:03:14 +05:30
Anand Doshi
4096603656 [fix] add index on so_detail in Delivery Note Item 2016-01-07 17:10:09 +05:30
Anand Doshi
ed72a28e41 [minor] patch for billed in DN and PR 2016-01-06 18:53:12 +05:30
Anand Doshi
2c021dcdcd [fix] Stock Entry: calculate amount in javascript 2016-01-06 17:47:39 +05:30
Anand Doshi
6b71ef5843 [refactor] changed set_modified, change_modified to update_modified like in the framework 2016-01-06 16:32:06 +05:30
Nabin Hait
c040075bd4 [patch] Update billing status in Delivery Note and Purchase Receipt 2016-01-06 15:42:44 +05:30
Nabin Hait
a2afb16f6b [testcase] Billing status in Purchase Receipt 2016-01-06 15:42:44 +05:30
Nabin Hait
bdab0eea0f Billing status in Purchase Receipt 2016-01-06 15:42:43 +05:30
Nabin Hait
ba5d6b5004 [test-case] for billing status in DN 2016-01-06 15:42:27 +05:30
Nabin Hait
5b13b99441 Update billing status in Delivery Note if directly invoiced against SO 2016-01-06 15:42:27 +05:30
Anand Doshi
e88ffe032e [fix] show fields like sales_order, against_sales_order, schedule_date in item grid if In List View is checked 2016-01-06 12:54:59 +05:30
Anand Doshi
a40c6282a1 [fix] don't allow import for child tables 2016-01-06 12:20:25 +05:30
Anand Doshi
d27308d1cd Merge pull request #4575 from nabinhait/report_fix_1 
[fix] minor fix in stock projected qty
 2016-01-05 18:41:48 +05:30
Anand Doshi
06a82d4e1f Merge pull request #4574 from rmehta/translations 
Translation fixes
 2016-01-05 18:41:18 +05:30
Anand Doshi
13bf123b24 [hotfix] item on web 2016-01-04 17:51:35 +05:30
Nabin Hait
d35d74346d [fix] minor fix in stock projected qty 2016-01-04 16:16:49 +05:30
Rushabh Mehta
5760b79747 [translations] fixes #4533 2016-01-04 15:57:01 +05:30
Rushabh Mehta
eb961370ff [translations] fixes #4532 2016-01-04 15:48:37 +05:30
Anand Doshi
aee8b5bcad [fix] Purchase Receipt: Show row no. against the Rejected Warehouse mandatory error 2016-01-04 13:16:09 +05:30
Nabin Hait
884d4cbc48 Merge pull request #4560 from nabinhait/item_variants 
[fix] Disable atrribute table in variant item record
 2015-12-31 15:58:41 +05:30
Nabin Hait
51ff2658cb [fix] Minor changes in item naming 2015-12-31 15:49:00 +05:30
Nabin Hait
dd1c3ba164 Merge branch 'develop' of https://github.com/gabtzi/erpnext into gabtzi-develop 2015-12-31 15:46:15 +05:30
Nabin Hait
6b068e1367 [fix] Disable atrribute table in variant item record 2015-12-31 15:44:12 +05:30
Nabin Hait
6626e32719 [fix] Disable atrribute table in variant item record 2015-12-31 14:54:57 +05:30
gabtzi
d46abb49f3 Fix for Issue #4543: Suffix now uses attribute abbreviation if it exists or value for numeric attributes 2015-12-28 12:03:24 +02:00
gabtzi
096fc88200 Fix for Issue #4543: Improved code to check if it's a variant only once. 2015-12-28 11:07:10 +02:00
gabtzi
9d44ac88f2 Fix for Issue #4543: Automatic item_code generation for variants when parent item is named after a Naming Series 2015-12-28 10:26:42 +02:00
Saurabh
b166bcf50b [fixes] flag to trigger actual qty update 2015-12-28 13:25:35 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Rushabh Mehta
01293bb3a3 [fix] [minor] fix available qty even if 0 2015-12-22 12:57:42 +05:30
Anand Doshi
ee2129ce1c Merge pull request #4513 from nabinhait/discount_percentage 
Additional Discount amount based on percentage
 2015-12-21 16:13:17 +05:30
Anand Doshi
50ddf921be [minor] UOM message 2015-12-21 10:58:33 +05:30
Nabin Hait
3769d87240 Additional Discount amount based on percentage 2015-12-18 13:12:08 +05:30
Anand Doshi
0f809426d2 [fix] Validate transfer qty cannot be greater than qty 2015-12-17 22:35:03 +05:30
ShashaQin
81b8627250 Update serial_no.json 2015-12-15 14:14:51 +05:30
ShashaQin
79586775b2 Update serial_no.json 
change "delivery_document_type" to Link and ""delivery_document_no" to Dynamic link will be more convenient, like "purchase_document_type" and "purchase_document_no".
 2015-12-15 14:14:26 +05:30
Anand Doshi
695d09f9cd [fix] typo 2015-12-11 15:03:26 +05:30
Anand Doshi
66c9940d73 [fix] [validation] website url should be public 2015-12-11 15:02:58 +05:30
Nabin Hait
fc4eca5cc7 [fix] Website Image validation 2015-12-11 11:47:05 +05:30
Anand Doshi
b3051ab84d [fix] validate that Item's website image is public 2015-12-10 11:46:20 +05:30
Giovanni Lion
5de53eb0eb Voucher dynamic link fix to allow links to work if user language is not english 2015-12-09 15:45:40 +08:00
Nabin Hait
41c8cf645a [fix] Get incoming rate if args as json 2015-12-08 14:50:24 +05:30
Nabin Hait
06db236aa0 [fix] Allow Production Order, by default unchecked in item 2015-12-07 14:19:13 +05:30
Nabin Hait
5eefff13a1 [fix] get_incoming_rate function whitelisted 2015-12-07 10:44:56 +05:30
Rushabh Mehta
e1f8b1d695 [minor] [production planning tool] include non production items without default BOM in multi-level BOM 2015-12-04 10:53:15 +05:30
Rushabh Mehta
2c069a418a [minor] allow stock entry for manufacture without production order 2015-12-03 11:10:23 +05:30
Rushabh Mehta
f1f556c0ac Merge pull request #4409 from nabinhait/reorder_level 
[fix] Reorder Qty mandatory if reorder level entered
 2015-12-02 12:25:09 +05:30
Nabin Hait
20abc2d0e8 [fix] Reorder Qty mandatory if reorder level entered 2015-12-01 19:01:19 +05:30
Nabin Hait
d793fc9446 [fix] Mapping allowed for negative quantity 2015-12-01 17:28:12 +05:30
Nabin Hait
5b73dea9f6 [fix] Get items in stock reconciliation based on default warehouse or existing bin 2015-12-01 16:47:17 +05:30
Rushabh Mehta
29f9f6c147 [fixes] [ux] get product bundle items only on po, mr and button on toolbar 2015-12-01 11:36:22 +05:30
Rushabh Mehta
9f7de868ef [fixes] stock reco, must always set qty and rate 2015-11-30 14:16:36 +05:30
Anand Doshi
70f57eb7f0 [fix] call apply price list, apply pricing rule only if price list is mentioned or there are items in the table 2015-11-27 14:38:01 +05:30
Anand Doshi
15b22c9d7d Merge pull request #4383 from anandpdoshi/fix/auto-material-request-template 
[fix] Show Item Name in re-order email. Fixes #4381
 2015-11-27 11:31:36 +05:30
Anand Doshi
f942d97a18 [fix] removed UOM Replace Utility from message 2015-11-26 16:08:09 +05:30
Anand Doshi
5cf7a0bf72 [fix] Show Item Name in re-order email. Fixes #4381 2015-11-26 15:11:18 +05:30
Rushabh Mehta
03b3d66b90 [minor] re-order at re-order level, not below 2015-11-25 17:23:00 +05:30
Nabin Hait
c4f4c09e42 Get Items from Product Bundle button in purchase cycle 2015-11-23 12:51:37 +05:30
Revant Nandgaonkar
bde324a90f fix frappe call to update_purchase_receipt_status 
changed update_purchase_order_status to update_purchase_receipt_status
 2015-11-20 12:41:58 +05:30
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Saurabh
2e292060c5 [fix] Reserved and ordered qty fix for drop ship orders 2015-11-18 17:39:26 +05:30
Nabin Hait
43ce642649 [fix] Uncheck 'Is Production Item' if it is a non-stock item 2015-11-16 16:50:59 +05:30
Nabin Hait
95d025f9aa Show Close button in Delivery Note and Purchase Receipt, only if it is returned and user has submit permission 2015-11-13 14:22:32 +05:30
Rushabh Mehta
c1531e7008 [minor] catch SSL error on make_thumbnail, via support 2015-11-13 11:39:38 +05:30
Anand Doshi
d65a03d437 [fix] material request type in reorder 2015-11-12 20:36:44 +05:30
Nabin Hait
61fb7ee5b8 Deleted Stock UOM Replace Utility 2015-11-12 12:06:47 +05:30
Rushabh Mehta
54fc260a42 [minor] trigger link triggers while mapping material request to po to set supplier default currency 2015-11-05 15:26:02 +05:30
Rushabh Mehta
7a39d51366 [fix] pull tax rate in item tax 2015-11-05 15:19:11 +05:30
Rushabh Mehta
c541b87bb9 [thumbnail] remove attachment if fails 2015-11-05 10:49:42 +05:30
Rushabh Mehta
20a7d820ab [fix] shot ledger buttons for closed DN / PR 2015-11-04 15:31:41 +05:30
Rushabh Mehta
d48c2394e8 [cleanup] drop ship testing & cleanup 2015-11-04 15:24:04 +05:30
Saurabh
6197860643 [fixes] test case update 2015-11-04 12:43:40 +05:30
Saurabh
95fbfa4928 [fixes] typo fixes 2015-11-04 12:10:01 +05:30
Saurabh
b7f0a4961e - no delivery / reserve warehouse in drop ship 
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
 2015-11-04 12:03:54 +05:30
Rushabh Mehta
9c044eefff [cleanup] re-arrange drop ship field 2015-11-03 18:28:37 +05:30
Rushabh Mehta
5951692db0 [fix] cleanup stop-resume code 2015-11-03 18:20:39 +05:30
Saurabh
c40148e0da [fixes] missing delivered by supplier field 2015-11-03 10:32:46 +05:30
Rushabh Mehta
b1d8979a59 Merge pull request #4179 from saurabh6790/drop-shipping 
Drop shipping
 2015-11-02 15:43:48 +05:30
Saurabh
a8a91cca16 [feature] Close feature for Purchase Receipt and Delivery Note 2015-11-02 12:57:08 +05:30
Saurabh
381385d19a [fixes] add status 'Closed' in filter creating PR, PI from PO and SI, DN from SO 2015-11-02 11:30:51 +05:30
Saurabh
653cffec1e [change_log and fixes] set print hide, add change_log 2015-10-29 19:43:35 +05:30
Saurabh
cc8f1afa56 [fixes] test case fixes for drop shipping 2015-10-29 19:43:35 +05:30
Saurabh
2f702dcb32 [fixes] bulk close facility, rename Drop Ship to Delivered By Supplier 2015-10-29 19:43:35 +05:30
Saurabh
8a8ef85174 [fixes] reviwe fixes 2015-10-29 19:43:33 +05:30
Saurabh
a4efbf0db7 [fixes] check for close status 2015-10-29 19:43:33 +05:30
Saurabh
e930f0f74e [fixes] filter on supplier list for DropShip, checking closed status 2015-10-29 19:43:33 +05:30
Saurabh
98b287565a [enhance] close purchase order 2015-10-29 19:43:32 +05:30
Saurabh
c6dbe70256 [Fixes] Drop Shipping 2015-10-29 19:43:32 +05:30
Anand Doshi
21e09a2bd8 [enhancement] Ability to disable an Item 2015-10-29 12:39:47 +05:30
Anand Doshi
6d69ca6bac [fix] don't show expired items in website item list. Fixes #4210. 2015-10-29 11:35:16 +05:30
Nabin Hait
a90a0528aa Fixed conflict 2015-10-28 15:50:26 +05:30
Nabin Hait
6d490e530a [fix] Ignore users permission for To Warehouse field in Delivery Note 2015-10-28 12:43:45 +05:30
Anand Doshi
c794ca53fb [fix] delete file records created via item.py even if website_image file didn't exist 2015-10-27 16:56:42 +05:30
Anand Doshi
3f3696d1eb [enhancement] [website] numeric attribute selector, smart selection of variant based on attribute combinations 2015-10-26 21:55:34 +05:30
Nabin Hait
abc0b64b68 [fix] Label changed for Target Warehouse in Delivery Note 2015-10-26 11:58:43 +05:30
Anand Doshi
b9bfe6117e [optimization] Stock Projected Qty report 2015-10-23 14:49:09 +05:30
Rushabh Mehta
5033e7b431 [hot] fix stock projected qty 2015-10-23 10:51:56 +05:30
Nabin Hait
398c83afa5 [fix] For Serial No Status 2015-10-22 15:11:44 +05:30
Anand Doshi
d1441245fb [fix] variant website page render 2015-10-21 16:36:43 +05:30
Anand Doshi
066ff9599a Merge pull request #4206 from neilLasrado/variant 
Prevent Template Item from going into infinite loop while saving
 2015-10-21 14:20:49 +05:30
Neil Trini Lasrado
3a573d1a6d Prevent Template Item from going into infinite loop while saving 2015-10-21 12:20:06 +05:30
Rushabh Mehta
7f66983309 [minor] added column type definition in batch-wise balance history 2015-10-21 12:04:27 +05:30
Anand Doshi
ea0d98891f [minor] don't display missing file doc message in item's make thumbnail 2015-10-20 18:57:38 +05:30
Anand Doshi
3bc43682f1 Merge pull request #4199 from neilLasrado/item 
Default value of allow production order in Item master changed to 1
 2015-10-20 17:44:26 +05:30
Anand Doshi
7c0eadb451 [fix] Patch template item to be shown in website, show variant's description and price on change of attribute 2015-10-20 17:30:02 +05:30
Neil Trini Lasrado
c0f88e4caf Default value fot allow production order in Item master changed to 1 2015-10-20 15:51:04 +05:30
Anand Doshi
7b2b0cd73c [fix] Item Re-order if Bin does not exists and fixed Stock Projected Qty report to show per Warehouse Re-order level 2015-10-20 14:29:47 +05:30
Anand Doshi
17c633d00f [fix] Set fieldtype of description field as Text Editor in Landed Cost Item 2015-10-20 14:26:44 +05:30
Nabin Hait
4d20f3029b [fix] Set fieldtype of description field as Text in Landed Cost Item 2015-10-20 12:18:19 +05:30
Anand Doshi
25956d6282 [fix] Item thumbnail 2015-10-20 08:48:43 +05:30
Nabin Hait
6f64a78ecf Test case fixed for swtiching valuation method 2015-10-19 16:53:35 +05:30
Nabin Hait
608bbc7850 Test case fixed for swtiching valuation method 2015-10-19 16:53:35 +05:30
Nabin Hait
afd14f6f0e [fix] Allowed accounts with account type='Income Account' for default income account in item 2015-10-19 15:27:58 +05:30
Anand Doshi
b4e9c1da64 [fix] thumbnail generation for item 2015-10-19 12:57:19 +05:30
Anand Doshi
1d093a4039 [fix] change attach fields to small text 2015-10-19 12:56:29 +05:30
Rushabh Mehta
3a519f269d Merge pull request #4175 from anandpdoshi/dynamic-linked-with 
[fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339
 2015-10-15 14:25:18 +05:30
Rushabh Mehta
d3b8a74508 [test] fix, force values in target warehouse too 2015-10-15 13:23:10 +05:30
Anand Doshi
1d23ebb51d [fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339 2015-10-15 12:54:40 +05:30
Rushabh Mehta
ba5b0e8458 [test] [fix] print values for failing test 2015-10-15 12:45:42 +05:30
Rushabh Mehta
14a908bdec [test] [fix] abs(valuation_rate) for moving average 2015-10-15 12:28:20 +05:30
Rushabh Mehta
f94f153078 [test] fixes 2015-10-15 11:31:59 +05:30
Rushabh Mehta
c9bacedbfe [test] fixes 2015-10-15 11:00:34 +05:30
Rushabh Mehta
c4d4c7feb0 [fix] repost_actual_qty fix 2015-10-14 17:37:28 +05:30
Rushabh Mehta
ee6862b277 [fix] VARCHAR lengths as 140 2015-10-14 17:28:35 +05:30
Rushabh Mehta
fb73151da6 [fixes] 2015-10-14 16:22:01 +05:30
Rushabh Mehta
6e322d0a02 [enhancement] use thumbnails in grid views, patch to make thumbnails 2015-10-14 16:21:24 +05:30
Rushabh Mehta
80d2a55342 [enhancement] add variants in website 2015-10-14 16:16:00 +05:30
Anand Doshi
71ebad5668 Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error 2015-10-14 16:13:49 +05:30
Nabin Hait
38e4c6f2af Allow same serial nos for raw materials and fg item in repack / manufacture entry 2015-10-13 18:37:39 +05:30
Nabin Hait
03afb45e34 [fix] Validate deletion of serial no 2015-10-13 15:46:42 +05:30
Nabin Hait
d91382dbf3 [fix] serial no status 2015-10-13 15:46:42 +05:30
Nabin Hait
b445be3552 Test case for delivery to target warehouse 2015-10-13 15:46:42 +05:30
Nabin Hait
c865f229fb Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status 2015-10-13 15:46:42 +05:30
Rushabh Mehta
22d0d586ab [minor] [typo] 2015-10-13 12:30:21 +05:30
Rushabh Mehta
eb62aed8c7 Merge pull request #4157 from nabinhait/bin 
[fix][patch] Delete duplicate bins
 2015-10-12 18:39:16 +05:30
Rushabh Mehta
5f349a67c9 Merge pull request #4156 from rmehta/item-section-fix 
[fix] [minor] collapsible section for Item - removed custom script
 2015-10-12 18:35:38 +05:30
Rushabh Mehta
d256055a8c Merge pull request #4153 from rmehta/stock-entry-fix 
[fix] [minor] stock_entry.py error for None qty
 2015-10-12 18:32:28 +05:30
Nabin Hait
b7e46c4ed9 [fix][patch] Delete duplicate bins 2015-10-12 18:28:50 +05:30
Rushabh Mehta
d4882653c3 [fix] [minor] collapsible section for Item - removed custom script 2015-10-12 16:45:53 +05:30
Rushabh Mehta
a30f3ea1f9 [fix] [minor] stock_entry.py error for None qty 2015-10-12 16:12:52 +05:30
Nabin Hait
51e980dd2c [fix] Multiple minor fixes 2015-10-10 18:10:05 +05:30
Nabin Hait
314086d6c0 [fix] Fetch UOM Conversion Factor from template if not specified in variants 2015-10-07 11:55:08 +05:30
Nabin Hait
5c66fb7631 Merge pull request #4130 from nabinhait/reports 
[fix][report] Left join used in pending reports
 2015-10-07 11:15:36 +05:30
Nabin Hait
8a7bdd5a92 [fix] Valuation Rate in Stock Balance report 2015-10-06 18:46:56 +05:30
Nabin Hait
f4edaef481 [fix][report] Left join used in pending reports 2015-10-06 12:48:04 +05:30
Anand Doshi
21f6ea6f7e [hotfix] remove allow on submit from item tables 2015-09-30 18:45:29 +05:30
Anand Doshi
c320fe541d Merge pull request #4067 from anandpdoshi/remove-party-account-currency 
Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
 2015-09-30 16:55:24 +05:30
Anand Doshi
f40a87511e Merge pull request #4091 from rmehta/repack-allow-low-rate 
[fix] remove validation to disallow lower rate
 2015-09-30 16:46:31 +05:30
Rushabh Mehta
cb96b61449 [fix] remove validation to disallow lower rate 2015-09-30 16:22:05 +05:30
Anand Doshi
cd0989e051 Added method get_account_currency 2015-09-30 15:11:12 +05:30
Anand Doshi
edba8f5582 [fix] Print 'Attach' field in Stock Entry Detail 2015-09-30 11:50:08 +05:30
gmarke
e5a31462fe Update get_item_details.py 
like this it will be possible to correctly handle cost center for stock entries when no default cost center per company is set
 2015-09-27 09:38:01 +02:00
Anand Doshi
361eca4cae Merge pull request #4054 from anandpdoshi/sales-team-update-after-submit 
Sales Team editable after submit
 2015-09-24 11:30:31 +05:30
Anand Doshi
e2d46d0474 [fix] Allow Sales Team to be added/updated after submit 2015-09-23 19:26:29 +05:30
Anand Doshi
06ad308ca1 [fixes] setup wizard and other fixes related to cart 2015-09-23 12:50:35 +05:30
Anand Doshi
52dfc32eca [fix] validate_valuation_rate for Repack 2015-09-23 12:50:35 +05:30
Rushabh Mehta
8ffd483e24 [wip] shopping cart shipping rule, price list cleanup 2015-09-23 12:49:16 +05:30
Rushabh Mehta
156ce607e2 [cleanup] [wip] portal, shopping cart cleanup 2015-09-23 12:49:16 +05:30
Anand Doshi
b6ec680c46 [fix] round percentages in get_indicator 2015-09-22 16:36:20 +05:30
Saurabh
5fe0086d9a [Fixes] Warehouse check while company delete & Variant Attribute value check 2015-09-16 16:59:24 +05:30
Anand Doshi
69f2cc8d24 [fix] don't fetch template item in get items of stock reconciliation 2015-09-15 11:54:13 +05:30
Anand Doshi
dbe623b167 [fix] Use User Permission value as default only if the document type is Setup 2015-09-14 13:08:53 +05:30
Anand Doshi
5d9cfc76cd Don't copy title field in Duplicate 2015-09-11 15:35:26 +05:30
Nabin Hait
2377cdfa4e Fixed conflict 2015-09-09 18:45:41 +05:30
Anand Doshi
9d5b84e78a Merge pull request #3996 from nabinhait/fix6 
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
 2015-09-09 15:11:12 +05:30
Nabin Hait
f0b3014a23 Planned Qty logic fixed and reposted for existing 2015-09-09 11:04:10 +05:30
Nabin Hait
cd103c05d6 Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order 2015-09-08 19:24:35 +05:30
Anand Doshi
bc1e8b4408 [minor] Unset Apply User Permissions in default permissions 2015-09-08 19:23:23 +05:30
Nabin Hait
6c3ff3e2ed Fixed conflict 2015-09-08 18:09:03 +05:30
Anand Doshi
9f25575e0c Merge pull request #3988 from nabinhait/fix2 
Set expense account in stock reco only if company available
 2015-09-08 15:59:18 +05:30
Nabin Hait
f44128f81c Set expense account in stock reco only if company available 2015-09-07 10:45:15 +05:30
Nabin Hait
11a746d363 Fixed conflict 2015-09-03 16:04:11 +05:30
Rushabh Mehta
85abdc4fad [minor] added stock settings for serial no. #3967. Merge with https://github.com/frappe/frappe/pull/1291 2015-09-03 10:29:38 +05:30
Anand Doshi
283850ce47 Merge pull request #3971 from anandpdoshi/fix-item-variant-attributes 
Attributes in the variant should be in the same order as in the Template
 2015-09-02 16:09:09 +05:30
Anand Doshi
099bbbded0 Attributes in the variant should be in the same order as in the Template 
- Moved Item Variant code from item.py to controllers/item_variant.py
- Use Template Item's order of Attribute for Variant Item
 2015-09-02 15:56:55 +05:30
Nabin Hait
906bf64f04 [fix] Insert Item Price automatically based on Rate in Stock UOM 2015-09-02 11:32:14 +05:30
Nabin Hait
76bb927337 Fixed conflict 2015-08-31 17:28:05 +05:30
Nabin Hait
6e439a5e53 Multi currency: test case and fixes 2015-08-28 19:24:22 +05:30
Anand Doshi
8b66f2a691 Exported all doctypes 2015-08-27 16:45:52 +05:30
Anand Doshi
f370b0c6a4 [fix] print hide additional discount, reload doctypes in sales return patch 2015-08-27 16:03:29 +05:30
Nabin Hait
09c68c9ad0 Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency 2015-08-27 14:55:55 +05:30
Nabin Hait
13d8835b75 Fixed merge conflict 2015-08-27 14:55:34 +05:30
Anand Doshi
b8610e1079 [fix] removed update_stock_ledger from delivery note 2015-08-27 14:46:47 +05:30
Anand Doshi
41e948b00a [hotfix] update reserved quantity in delivery note 2015-08-27 14:42:25 +05:30
Anand Doshi
c6802ca6d0 [minor] show Inventory section for new Item if Maintain Stock is checked 2015-08-27 13:21:43 +05:30
Anand Doshi
282e4947fa [fix] Changed more section label to 'More Information' 2015-08-27 13:11:46 +05:30
Anand Doshi
b99c180466 Merge branch 'rmehta-validation-settings' into develop 2015-08-27 12:22:06 +05:30
Rushabh Mehta
740db53b86 [fix] returned_qty reapply and change-log 2015-08-27 12:00:16 +05:30
Anand Doshi
69b6195d3b Merge branch 'validation-settings' of https://github.com/rmehta/erpnext into rmehta-validation-settings 
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
 2015-08-27 11:39:20 +05:30
Rushabh Mehta
cd2d8a0410 [merge] re-applied changes to sales invoice & delivery note 2015-08-27 11:05:26 +05:30
Rushabh Mehta
5bec301929 Merge branch 'layout-cleanup' into develop 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
	erpnext/stock/doctype/delivery_note/delivery_note.json
 2015-08-27 11:01:39 +05:30
Rushabh Mehta
17679c6902 [layout cleanup] purchase, stock, journal entry 2015-08-26 22:20:38 +05:30
Anand Doshi
fa65c7bf29 [minor] stopped or cancelled message 2015-08-26 19:15:24 +05:30
Rushabh Mehta
f7800c053b [layout cleanup] in Quotation, Sales Order, Delivery Note 2015-08-26 18:53:37 +05:30
Anand Doshi
ab9f03d557 Merge pull request #3952 from neilLasrado/variant-duplication 
Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes
 2015-08-26 16:52:25 +05:30
Neil Trini Lasrado
755f1f6841 Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes 2015-08-26 12:59:29 +05:30
Anand Doshi
80a784fdc5 Merge pull request #3943 from nabinhait/fix4 
[fix] Print Delivery Note without amount
 2015-08-26 12:29:24 +05:30
Rushabh Mehta
b8a6f40370 [cleanup] layouts of item, customer, supplier, lead 2015-08-26 10:51:45 +05:30
Anand Doshi
fe13bfed44 Fixes to Return Improvements pull request 
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
 2015-08-25 19:07:04 +05:30
Rushabh Mehta
3c107cdbf8 [enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699 2015-08-25 14:26:42 +05:30
Nabin Hait
3f321ebfde utilities/repost_stock file renamed to stock/stock_balance 2015-08-25 14:11:13 +05:30
Nabin Hait
1f94fa25a8 Update delivered / ordered qty in sales/purchase order from return entry 
Reserved Qty logic cleaned up
 2015-08-25 14:11:12 +05:30
Nabin Hait
a7c013c030 [fix] Print Delivery Note without amount 2015-08-24 18:43:19 +05:30
Neil Trini Lasrado
db189d7f19 Fixed test case for Item Variants 2015-08-24 16:59:24 +05:30
Neil Trini Lasrado
4c614bd59a Fixed validation for numeric variants to check with values from template instead of master 2015-08-24 15:13:01 +05:30
Neil Trini Lasrado
7a6f048928 Fixed issue while creating item variants with decimal values (precision error) 2015-08-24 15:13:01 +05:30
Anand Doshi
bcb386fb64 Merge pull request #3922 from nabinhait/fraction_gle 
Divisonal loss adjustment in purchase receipt
 2015-08-21 14:55:44 +05:30
Nabin Hait
7c2901fb56 [fix]Stock UOM Replace Utility: Multiply Qty after Transaction by conversion factor as well, as there is no qty mentioned for stock reconciliation 2015-08-21 14:45:59 +05:30
Nabin Hait
c561a499d7 Multi currency GL entry fixes 2015-08-21 14:31:47 +05:30
Nabin Hait
46bcbaf97b GL Entry in account currency 2015-08-21 14:31:47 +05:30
Nabin Hait
597a402dff Divisonal loss adjustment in purchase receipt 2015-08-21 14:13:55 +05:30
Nabin Hait
1b6fd1ba5b [fix]Stock UOM Replace Utility: Multiply Qty after Transaction by conversion factor as well, as there is no qty mentioned for stock reconciliation 2015-08-21 13:05:19 +05:30
Nabin Hait
d7ed197131 [fix] UOM Conversion factor mandatory in stock entry 2015-08-21 12:00:32 +05:30
Anand Doshi
db1a9edbdf [minor] removed test case of template cannot have stock 2015-08-20 18:20:06 +05:30
Anand Doshi
5c85740aab [minor] don't validate stock for template item 2015-08-20 17:43:35 +05:30
Anand Doshi
98c3aec274 [minor] hide Attribute Value using script so that it is visible in data import 2015-08-20 11:56:31 +05:30
Anand Doshi
f3eeb601ad Merge pull request #3908 from rmehta/text-editor 
[fix] changed text > text editor for description fields in tables
 2015-08-19 16:48:06 +05:30
Rushabh Mehta
81e9d4e8f5 [fix] changed text > text editor for description fields in tables 2015-08-19 13:00:03 +05:30
Anand Doshi
8af567a229 [minor] import error 2015-08-19 12:10:03 +05:30
Anand Doshi
ffca81dbc1 [fix] added test cases and fixes to Item Variants 2015-08-19 11:52:05 +05:30
Anand Doshi
90fd6fee23 [fix] generate item code for variant 2015-08-19 10:21:24 +05:30
Anand Doshi
2538e51887 Fixes to Item Variant Attribute. Fixes #3905 2015-08-19 09:33:07 +05:30
Anand Doshi
cf2c624c03 Merge pull request #3902 from rmehta/pos-print 
[enhancement] POS print after save #3853
 2015-08-18 18:32:04 +05:30
Rushabh Mehta
ad9156a6ae [enhancement] POS print after save #385:wq:wq 2015-08-18 18:05:43 +05:30
Anand Doshi
afbe39a559 [fix] patch and rename Variant Attribute to Item Variant Attribute 2015-08-18 17:30:44 +05:30
Nabin Hait
91e1077e4c [fix] precision issue in stock entry 2015-08-17 17:58:52 +05:30
Nabin Hait
1c98886c85 [fix] Get stock and rate function restored 2015-08-17 17:58:52 +05:30
Anand Doshi
862c36832a Merge pull request #3892 from nabinhait/fix1 
[fix] Get stock and rate function restored
 2015-08-17 14:26:01 +05:30
Nabin Hait
c01342190c [fix] precision issue in stock entry 2015-08-17 14:18:44 +05:30
Nabin Hait
ac07b1cc07 [fix] Get stock and rate function restored 2015-08-17 10:50:30 +05:30
Neil Trini Lasrado
68f66a7e8b fixed Test Cases 2015-08-13 17:34:25 +05:30
Neil Trini Lasrado
9710eede00 Fixed Test Cases 2015-08-13 16:19:55 +05:30
Neil Trini Lasrado
62dba50e9b Multiple Fixes 2015-08-13 16:18:55 +05:30
Neil Trini Lasrado
cdc060cb7c Allow Editing variant attribute in Variant. Add validation to check duplication. 2015-08-13 16:17:36 +05:30
Neil Trini Lasrado
b9b49632f2 Added patch to fetch Item Template Attributes 2015-08-13 16:17:36 +05:30
Neil Trini Lasrado
ebf4cbeae3 Fixed Manage Variant 2015-08-13 16:17:01 +05:30
Neil Trini Lasrado
8b608c9043 Search Variants added to Item Master 
Added feature for Variants to hande numeric values
 2015-08-13 16:17:01 +05:30
Anand Doshi
cb4784c940 Merge pull request #3822 from neilLasrado/item-uom 
Changed UOM validation for Item Master
 2015-08-13 14:36:37 +05:30
Nabin Hait
58aea1f819 minor fix 2015-08-13 14:15:27 +05:30
Nabin Hait
760bfb27d0 Merge branch 'patch-7' of https://github.com/bobzz-zone/erpnext into bobzz-zone-patch-7 2015-08-13 14:14:26 +05:30
Neil Trini Lasrado
9a73b7a319 Changed UOM validation for Item Master 2015-08-13 12:21:32 +05:30
Anand Doshi
57ca765d9e Merge pull request #3848 from rmehta/journal-entry-refactor 
[refactor] added dynamic link in journal entry, #3847, #3814
 2015-08-13 11:39:13 +05:30
Rushabh Mehta
1828c12481 [refactor] added dynamic link in journal entry, #3847 2015-08-12 12:28:33 +05:30
Nabin Hait
4a91c49e0d discount percentage should not be reset to zero on applying price list 2015-08-11 18:16:10 +05:30
Nabin Hait
ac6d11eb3c minor improvements 2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
1c6eeb228f Fixes in Stock Entry 2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
b44f26d1ba Fixed Max value for update FG Item in Production Order 2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
8ea2f45713 Renamed update_fg_goods_based_on in Manufacturing Settings to backflush_raw_materials_based_on 2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
dde65752b6 Fixed code to consider partial FG entry 2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
845980c010 Added Feature - Update FG based on Material Transfer For Manufacturing 2015-08-10 19:14:43 +05:30
Nabin Hait
3c3a3ecea8 Additional Costs in Stock Entry 2015-08-10 14:07:45 +05:30
Nabin Hait
f6aad5ed2d Distribute tax amount between items in stock entry 2015-08-10 14:07:01 +05:30
Nabin Hait
aa87931172 Show only active BOM in stock entry 2015-08-10 14:07:01 +05:30
Nabin Hait
fc155c7712 Added tax table in stock entry 2015-08-10 14:07:01 +05:30
Nabin Hait
8142cd2865 [fix] fifo in stock ledger 2015-08-05 18:57:37 +05:30
bobzz-zone
ff04bf6346 Update stock_entry.py 
fixed for null expense account
 2015-08-05 11:28:11 +07:00
Rushabh Mehta
5bd394278d [fix] test-case, warehouse mandatory for mix type product bundle 2015-08-04 14:49:25 +05:30
Rushabh Mehta
a208c56813 [enhancement] auto insert item price if missing, #3533 2015-08-04 14:48:52 +05:30
Rushabh Mehta
862a2eb975 [enhancement] make service type product bundle: 2015-08-04 14:47:45 +05:30
Anand Doshi
950250d444 Merge pull request #3793 from nabinhait/serial_no 
Validate serial no in return entry with against document
 2015-08-04 14:45:30 +05:30
Nabin Hait
b7c0c55d61 Validate serial no in return entry with against document 2015-08-04 12:18:12 +05:30
Nabin Hait
7edb951fdb [fix] Get fifo rate only qty exists in batch 2015-08-04 11:09:14 +05:30
Nabin Hait
1755a5f298 [fix] get items from bom in material request 2015-08-03 19:18:21 +05:30
Rushabh Mehta
b16b9cd7a0 [fix] force stock_uom in item and stock ledger entry 2015-08-03 16:13:33 +05:30
Nabin Hait
b30c40ec8a [fix] UOM conversion factor in stock entry 2015-07-31 19:48:57 +05:30
Rushabh Mehta
2f5587ab25 [fix] uom conversion factor in stock entry, #3734 2015-07-31 15:20:29 +05:30
Anand Doshi
2f443a5789 [hotfix] Item checkbox mandatory and removed Module Def Contacts 2015-07-30 14:44:43 +05:30
Nabin Hait
f33787a706 [fix] Get serial nos using FIFO in Return Delivery Note 2015-07-29 18:08:10 +05:30
Nabin Hait
763821d57d Merge pull request #3746 from nabinhait/get_item_details 
[fix] Get item details based on selected company
 2015-07-29 16:02:39 +05:30
Nabin Hait
453cc374d4 - Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice 
- Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered
- Make packing list on validate
 2015-07-29 15:59:57 +05:30
Nabin Hait
e95c18a42d Merge pull request #3744 from nabinhait/return 
Sales / Purchase Return Improvements
 2015-07-29 15:51:34 +05:30
Nabin Hait
18c2c54633 Merge pull request #3718 from rmehta/item-cleanup 
[cleanup] yes/no selects changed to checks in Item
 2015-07-29 15:49:54 +05:30
Nabin Hait
0edec9d25b Merge pull request #3730 from nabinhait/fix1 
minor fixes
 2015-07-29 15:48:24 +05:30
Nabin Hait
15216fdd6f [fix] Get item details based on selected company 2015-07-29 15:47:45 +05:30
Rushabh Mehta
8bf0b89595 [minor] currency field in list view for item price 2015-07-29 14:55:48 +05:30
Nabin Hait
746c162055 Return status in listview for return entry 2015-07-29 14:54:33 +05:30
Nabin Hait
1e046aa49a Hide buttons for return entry 2015-07-29 13:16:37 +05:30
Rushabh Mehta
1e8025b327 [cleanup] yes/no selects changed to checks in Item 2015-07-29 11:38:33 +05:30
Nabin Hait
9088432f10 Fetch default expense account and cost center from item if company matches, otherwise fetch from company master 2015-07-28 11:16:22 +05:30
Nabin Hait
c80059e10e [fix] Ignore making SLE for opening stock reco with zero qty 2015-07-28 11:16:22 +05:30
Nabin Hait
2b7eda8135 Merge pull request #3683 from nabinhait/return 
Sales / Purchase Return Enhancement
 2015-07-24 16:53:01 +05:30
Nabin Hait
6a09b3f7ef Merge pull request #3702 from neilLasrado/capacity-planning 
Global switch to set capacity planning in manufacturing
 2015-07-24 14:26:28 +05:30
Nabin Hait
3cf67a462b Cleanup and test cases for serialized item 2015-07-24 13:26:54 +05:30
Nabin Hait
f061877b4f [fix] Stock Entry permissions 2015-07-24 13:26:54 +05:30
Nabin Hait
061f7079ed Test case for purchase return 2015-07-24 13:26:53 +05:30
Nabin Hait
246ed3f122 Test cases for sales return 2015-07-24 13:26:53 +05:30
Nabin Hait
6b25708b7a Minor fixes 2015-07-24 13:26:53 +05:30
Nabin Hait
623ed57663 Removed Sales/Purchase Return option from Stock Entry 2015-07-24 13:26:53 +05:30
Nabin Hait
1d21842f68 Sales / Purchase Return redesigned via negative DN / SI / PR / PI 2015-07-24 13:26:53 +05:30
Nabin Hait
ada485f096 Outgoing rate in Purchase Return based on reference/original Purchase Receipt rate 2015-07-24 13:26:53 +05:30
Neil Trini Lasrado
f965c5d203 now_datetime changed to nowdate 2015-07-24 13:14:57 +05:30
Neil Trini Lasrado
9c3dca63fa Disallowed End of Life Items from getting selected in Production Orders and Stock Reconciliation 2015-07-24 13:14:56 +05:30
Neil Trini Lasrado
2771b7d828 Track Operations removed and Global Switch added to disable capacity planning in manufacturing settings 2015-07-23 17:39:35 +05:30
Nabin Hait
2820a8749f Merge pull request #3710 from neilLasrado/stock-report 
Opening Balance row added to Stock Ledger Report
 2015-07-23 15:21:26 +05:30
Neil Trini Lasrado
13df8a40ef Validation added to prevent user to Manage Variants if Item Template is Unsaved. Prevented message stating variants updated while saving item template if there are no variants against that item Template 2015-07-23 12:46:59 +05:30
Neil Trini Lasrado
d0387f41df Opening Balance row added to Stock Ledger Report 2015-07-22 18:44:59 +05:30
Anand Doshi
7590aa2524 [minor] raise EmptyStockReconciliationItemsError when no change in any of the items 2015-07-22 14:43:36 +05:30
Rushabh Mehta
823e88d5bd [minor] close button for task and item not found error fix 2015-07-20 10:56:39 +05:30
Rushabh Mehta
94157334a7 [rename] Material User > Stock User 2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
008d1a0334 Fixes in Stock Entry 2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
fe2ffaeafa Fixes in Production Planning Tool 2015-07-13 12:41:28 +05:30