Neil Trini Lasrado
|
8fb123b20e
|
item variants, creation, deleation and update logic added.
logic added to copy changes in template to variants
|
2015-07-01 12:51:11 +05:30 |
|
Neil Trini Lasrado
|
333ccd212b
|
variants combination generation logic added
|
2015-07-01 12:51:10 +05:30 |
|
Neil Trini Lasrado
|
c8cc8b7115
|
manage variants new doctype created
|
2015-07-01 12:51:10 +05:30 |
|
Anand Doshi
|
0820161157
|
[fix] Item Variant Attribute autocomplete appearance. Fixes #3488, #3515, #3525
|
2015-06-29 20:57:06 -07:00 |
|
Nabin Hait
|
93cdee4503
|
[fix] Escape values in queries
|
2015-06-27 12:51:00 +05:30 |
|
Neil Trini Lasrado
|
035160c9a6
|
Added validation to prevent transfer of raw material from an expired batch for manufacturing
|
2015-06-24 15:25:57 +05:30 |
|
Nabin Hait
|
9cf2910ba1
|
[fix] validate items in stock entry for subcontracting against purchase order
|
2015-06-23 11:07:34 +05:30 |
|
Nabin Hait
|
7ee45b4af2
|
[fix] Batch-wise balance history: show records only with batch-id
|
2015-06-18 15:29:14 +05:30 |
|
Rushabh Mehta
|
ed9d5cfdaf
|
[minor] cleanup
|
2015-06-17 02:13:03 +05:30 |
|
Rushabh Mehta
|
bf4547ca5f
|
[fix] dynamic link in BOM Search report
|
2015-06-17 02:12:06 +05:30 |
|
Rushabh Mehta
|
b45a6bcb88
|
[report] BOM Search
|
2015-06-17 01:54:56 +05:30 |
|
Anand Doshi
|
ac59c2b300
|
[minor] clear Item's introduction section on refresh
|
2015-06-16 13:06:48 -04:00 |
|
Nabin Hait
|
7c5ba957ac
|
Label changed for discount amount in base currency
|
2015-06-15 15:47:07 +05:30 |
|
Nabin Hait
|
5c7557914b
|
Removed BOM No from mandatory from Stock Entry against Production Order
|
2015-06-11 16:50:35 +05:30 |
|
Nabin Hait
|
b937fac3ce
|
[report] Warehouse column added in 'Ordered Items to be Delivered' report
|
2015-06-10 18:21:57 +05:30 |
|
Nabin Hait
|
a790ba05f4
|
[fix] Item name, description should not be overwritten on saving of stock entry
|
2015-06-09 18:42:52 +05:30 |
|
Neil Trini Lasrado
|
f64fae752f
|
fixes
|
2015-06-09 15:46:57 +05:30 |
|
Neil Trini Lasrado
|
82763f052f
|
Status Indicators fixed in Material Request List
|
2015-06-09 15:46:57 +05:30 |
|
Neil Trini Lasrado
|
d015195617
|
fixes in barcode
|
2015-06-09 15:21:50 +05:30 |
|
Neil Trini Lasrado
|
b2f550ccb3
|
Barcode added to Purchase Receipt
|
2015-06-09 15:18:58 +05:30 |
|
Nabin Hait
|
ebbdd772a9
|
[fix] Validate and update manufactured qty in Stock Entry
|
2015-06-05 18:21:35 +05:30 |
|
Nabin Hait
|
6262496e70
|
[fix] item test case
|
2015-06-03 18:33:47 +05:30 |
|
Nabin Hait
|
c87595b2da
|
show item description in item grid view if marked for 'In List View'
|
2015-06-03 11:24:37 +05:30 |
|
Nabin Hait
|
4a6c178795
|
On selection of item, set default qty as 1
|
2015-06-01 14:01:56 +05:30 |
|
Anand Doshi
|
1b6c3f1a39
|
[fix] selenium test and changed Creation Document No to a Dynamic Link
|
2015-05-28 23:06:38 -04:00 |
|
Nabin Hait
|
10026ea85c
|
Merge pull request #3354 from rmehta/discount-field-relabel
[cleanup] rename discount and reserver warehouse #3325
|
2015-05-28 11:02:51 +05:30 |
|
Anand Doshi
|
8860b9d94d
|
[fix] Check if company exists in re-order item. Fixes #3365.
|
2015-05-28 01:09:21 -04:00 |
|
Pratik Vyas
|
f52b5ac8af
|
Merge pull request #3339 from rmehta/help
[help] added links in modules, added learn desktop module
|
2015-05-27 15:21:00 +05:30 |
|
Nabin Hait
|
eb00cae86c
|
Fiscal Year removed from Material Request
|
2015-05-27 13:18:09 +05:30 |
|
Rushabh Mehta
|
69fb13f229
|
[cleanup] rename discount and reserver warehouse #3325
|
2015-05-27 12:20:07 +05:30 |
|
Rushabh Mehta
|
c7cfa270cd
|
[minor] add import link in item price
|
2015-05-26 14:07:05 +05:30 |
|
Rushabh Mehta
|
f29a618b69
|
[email] [website] footer cleanup
|
2015-05-26 12:15:39 +05:30 |
|
Rushabh Mehta
|
6771240471
|
[help] added links in modules, added learn desktop module
|
2015-05-25 18:31:08 +05:30 |
|
Nabin Hait
|
2c6705ef83
|
Merge pull request #3322 from nabinhait/test_case
Test case
|
2015-05-25 16:19:03 +05:30 |
|
Nabin Hait
|
4809d36fbe
|
validate fields value with reference docs
|
2015-05-25 14:13:03 +05:30 |
|
Rushabh Mehta
|
c4d38e2183
|
[minor] setup wizard language fix and no submit messages for gl/sl entry
|
2015-05-25 11:29:37 +05:30 |
|
Nabin Hait
|
fe8d107731
|
stock entry: get item details
|
2015-05-22 18:04:44 +05:30 |
|
Nabin Hait
|
e2968e9893
|
minor fixes in test cases
|
2015-05-22 17:25:55 +05:30 |
|
Nabin Hait
|
fd4bcd855b
|
test case fixes
|
2015-05-22 16:55:55 +05:30 |
|
Nabin Hait
|
2eba53f763
|
test case fixes
|
2015-05-22 16:55:55 +05:30 |
|
Nabin Hait
|
1d08304ba5
|
added total row in stock balance report
|
2015-05-22 11:56:13 +05:30 |
|
Neil Trini Lasrado
|
753e40b4d5
|
fixes in validation for item varients
|
2015-05-21 14:38:58 +05:30 |
|
Nabin Hait
|
de7b87ee3a
|
[fix] operations and bom
|
2015-05-21 13:24:49 +05:30 |
|
Nabin Hait
|
4a929d53bc
|
Merge pull request #3310 from neilLasrado/item-var-validation
validation added to item varients
|
2015-05-21 13:21:21 +05:30 |
|
Nabin Hait
|
7f8d6b6252
|
Merge pull request #3303 from rmehta/letter-head-in-stock-entry
[enhancement] letter head in stock entry #3291
|
2015-05-21 13:20:26 +05:30 |
|
Neil Trini Lasrado
|
4258753ae8
|
validation added to item varients
|
2015-05-21 12:22:33 +05:30 |
|
Rushabh Mehta
|
a60984866c
|
[enhancement] letter head in stock entry #3291
|
2015-05-20 17:45:18 +05:30 |
|
Rushabh Mehta
|
a27cca97b5
|
[rename] POS Setting > POS Profile #3271
|
2015-05-20 15:43:17 +05:30 |
|
Pratik Vyas
|
803e998e9d
|
Fix merge mistakes
|
2015-05-19 13:08:54 +05:30 |
|
Pratik Vyas
|
1a84d8ecd2
|
Merge branch 'develop'
|
2015-05-19 12:23:52 +05:30 |
|
Nabin Hait
|
fb7140df2f
|
Don't repost future sle while cancelling PR via landed cost voucher
|
2015-05-19 11:12:06 +05:30 |
|
Rushabh Mehta
|
7231bd76a2
|
[minor] [fix] default status in Purchase Receipt
|
2015-05-18 14:36:57 +05:30 |
|
Rushabh Mehta
|
9dd8aab211
|
[fix] status updater
|
2015-05-18 11:19:10 +05:30 |
|
Nabin Hait
|
a6ee8290ce
|
Inclusive tax for deduction and manipulation of tax amount to fix rounding issue
|
2015-05-15 12:02:27 +05:30 |
|
Nabin Hait
|
90fc19ed9a
|
Item image in print view
|
2015-05-14 12:32:26 +05:30 |
|
Nabin Hait
|
f6e4723101
|
minor fix in landed cost voucher
|
2015-05-13 12:53:11 +05:30 |
|
Nabin Hait
|
dd82bf2ad9
|
Exchange rate issue fixed
|
2015-05-11 16:49:31 +05:30 |
|
Nabin Hait
|
affb3ec220
|
Item variants: validation added
|
2015-05-11 15:11:17 +05:30 |
|
Nabin Hait
|
93e0ec6663
|
Show only sub-contracted purchase order in stock entry for subcontracting
|
2015-05-11 11:32:38 +05:30 |
|
Nabin Hait
|
d1a64d89be
|
date issue fixed serial no
|
2015-05-11 11:32:38 +05:30 |
|
Nabin Hait
|
6752b31091
|
Fixed issue while updating Requested Qty on stoping material request and patch to recalculate
|
2015-05-08 12:49:50 +05:30 |
|
Nabin Hait
|
e27690ceda
|
Fixed issue while updating Requested Qty on stoping material request and patch to recalculate
|
2015-05-08 12:43:10 +05:30 |
|
Nabin Hait
|
08c0c04ef2
|
Removed old page style Stock ledger end stock level report
|
2015-05-07 16:59:51 +05:30 |
|
Rushabh Mehta
|
bcdea3ea51
|
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
|
2015-05-06 18:45:47 +05:30 |
|
Nabin Hait
|
64568fb296
|
Default expense account and cost center are always visible in item
|
2015-05-04 16:16:12 +05:30 |
|
Nabin Hait
|
f73aa079a0
|
item list view indicator fix
|
2015-05-04 16:06:59 +05:30 |
|
Rushabh Mehta
|
5dbf8a7418
|
[cleanup] frappe.get_user
|
2015-05-01 11:51:26 +05:30 |
|
Nabin Hait
|
67fdbcf242
|
precision fixed in batch-wise balance report
|
2015-04-28 12:53:26 +05:30 |
|
Nabin Hait
|
5ce31174be
|
precision fixed in batch-wise balance report
|
2015-04-28 12:36:53 +05:30 |
|
Rushabh Mehta
|
50ce9753e0
|
[minor] added cache in get_value
|
2015-04-27 13:13:50 +05:30 |
|
Nabin Hait
|
52cf6e947c
|
patch fix
|
2015-04-24 16:07:32 +05:30 |
|
Rushabh Mehta
|
38c6b52770
|
[rename] group_or_ledger to is_group
|
2015-04-23 13:14:17 +05:30 |
|
Nabin Hait
|
b650d691a0
|
fixed conflict
|
2015-04-21 17:16:28 +05:30 |
|
Rushabh Mehta
|
4665f7eb70
|
[enhancement] added description, batch_no in packing slip
|
2015-04-21 11:20:24 +05:30 |
|
Rushabh Mehta
|
0939a5ac4c
|
feature to delete company
|
2015-04-17 11:52:45 +05:30 |
|
Rushabh Mehta
|
53bc304be2
|
Merge pull request #3037 from neilLasrado/production-planning
Production planning
|
2015-04-15 12:06:44 +05:30 |
|
Rushabh Mehta
|
3ee1f11771
|
[cleanup] quality inspection fixes #3061
|
2015-04-14 17:53:36 +05:30 |
|
Neil Trini Lasrado
|
cf96cc26a0
|
Fixes for test cases
|
2015-04-14 13:00:54 +05:30 |
|
Neil Trini Lasrado
|
d3d94d1efe
|
fix- Material Transferred for Manufacturing not Updating in Production Order Error
|
2015-04-14 13:00:54 +05:30 |
|
Neil Trini Lasrado
|
cd1816cc5a
|
removed unnecesssary functions. Production related feilds made mandatory in TIme Log
|
2015-04-14 13:00:54 +05:30 |
|
Nabin Hait
|
4642d0697e
|
fixed conflict
|
2015-04-09 11:42:24 +05:30 |
|
Anand Doshi
|
c994647704
|
fixed test cases
|
2015-04-08 21:22:36 +05:30 |
|
Nabin Hait
|
0277ae298a
|
pending amount to be delivered in report
|
2015-04-07 17:49:53 +05:30 |
|
Nabin Hait
|
6eb55d4d3d
|
allowed import for delivery note
|
2015-04-07 09:42:44 +05:30 |
|
Anand Doshi
|
c399709789
|
fixes to test cases
|
2015-04-06 19:29:16 +05:30 |
|
Anand Doshi
|
0dc79f4de0
|
Merge remote-tracking branch 'frappe/v4.x.x' into develop
Conflicts:
.travis.yml
erpnext/__version__.py
erpnext/controllers/queries.py
erpnext/hooks.py
erpnext/selling/sales_common.js
erpnext/stock/doctype/bin/bin.py
erpnext/stock/doctype/stock_entry/stock_entry.js
erpnext/stock/doctype/stock_entry/stock_entry.py
erpnext/stock/stock_ledger.py
setup.py
|
2015-04-06 13:21:07 +05:30 |
|
Anand Doshi
|
22af7deadd
|
minor fixes
|
2015-04-05 17:18:07 +05:30 |
|
Anand Doshi
|
6208c49859
|
Added Company field in various Query Reports
|
2015-03-30 15:21:20 +05:30 |
|
Nabin Hait
|
54c865e77c
|
Landed cost voucher: fixes for serialized item
|
2015-03-27 15:39:06 +05:30 |
|
Nabin Hait
|
789ef7e346
|
stock balance report fixed
|
2015-03-26 17:40:57 +05:30 |
|
Rushabh Mehta
|
308e6ea21e
|
[fixes] default_website and stock reco
|
2015-03-24 17:35:16 +05:30 |
|
Rushabh Mehta
|
fea22de3e8
|
[minor] material request and newsletter list
|
2015-03-23 15:44:54 +05:30 |
|
Nabin Hait
|
da5cfb1630
|
Exchange rate upto 9 decimals
|
2015-03-23 14:51:45 +05:30 |
|
Nabin Hait
|
ca7e778f82
|
modified date updated
|
2015-03-23 14:17:59 +05:30 |
|
Rushabh Mehta
|
c2eae25d0e
|
[cleanup] validate_email_add
|
2015-03-23 14:10:51 +05:30 |
|
Nabin Hait
|
97cc4dd582
|
precision issue fixed in report
|
2015-03-23 13:10:50 +05:30 |
|
Nabin Hait
|
544af6d4cf
|
fix
|
2015-03-23 12:35:39 +05:30 |
|
Nabin Hait
|
63e00dcfd2
|
Set qty as per stock_uom while mapping Material request to Purchase order
|
2015-03-20 16:25:53 +05:30 |
|
Nabin Hait
|
2ed71bac20
|
Batch related cleanup
|
2015-03-20 15:06:30 +05:30 |
|
Nabin Hait
|
5601d9fbda
|
match condition in get_query
|
2015-03-20 14:40:36 +05:30 |
|
Anand Doshi
|
2b2b639492
|
fixes
|
2015-03-20 14:29:23 +05:30 |
|
Nabin Hait
|
fd2bf93b50
|
test case fix
|
2015-03-18 17:56:09 +05:30 |
|
Anand Doshi
|
9d8154dd40
|
fixed test cases
|
2015-03-18 16:22:13 +05:30 |
|
Nabin Hait
|
60aee54c6c
|
currency in test records
|
2015-03-18 16:06:13 +05:30 |
|
Nabin Hait
|
2df422de25
|
Test case fixes
|
2015-03-18 14:57:09 +05:30 |
|
Neil Trini Lasrado
|
adb1b2ccef
|
fix - price list none is disabled error if price list is made blank in purchase order
|
2015-03-18 11:41:58 +05:30 |
|
Nabin Hait
|
a1bf43b1a6
|
Merged develop into v5
|
2015-03-17 10:50:47 +05:30 |
|
Nabin Hait
|
d3fd8965de
|
test case fixed
|
2015-03-17 10:15:19 +05:30 |
|
Anand Doshi
|
9d9e31f4e8
|
moved get_list_context to module
|
2015-03-13 12:48:05 +05:30 |
|
Nabin Hait
|
7c9d003917
|
Test case cleanup and fixes
|
2015-03-13 08:14:46 +05:30 |
|
Neil Trini Lasrado
|
6f272f2f53
|
fixes in Production Order
|
2015-03-12 17:51:06 +05:30 |
|
Sambhaji Kolate
|
845f1c636e
|
code cleanup
|
2015-03-10 15:19:29 +05:30 |
|
Sambhaji Kolate
|
98dbccd1d6
|
added actual_batch_qty at warehouse in DN & SI #1873
|
2015-03-10 15:04:28 +05:30 |
|
Rushabh Mehta
|
f5f0d5a83a
|
[breadcrumbs] refactor
|
2015-03-09 15:48:16 +05:30 |
|
Anand Doshi
|
c0eb8c0de3
|
Fixed some Stock Entry test cases
|
2015-03-08 12:42:18 +05:30 |
|
Anand Doshi
|
e514323be4
|
load all js and css like before in desk.html
|
2015-03-06 13:17:26 +05:30 |
|
Anand Doshi
|
ec5ec60764
|
Fixed Test Cases
|
2015-03-05 19:31:40 +05:30 |
|
Nabin Hait
|
b50833a1e8
|
Fields alignment
|
2015-03-04 16:14:02 +05:30 |
|
Rushabh Mehta
|
0c677aa151
|
fix #2847
|
2015-03-04 12:32:59 +05:30 |
|
Nabin Hait
|
652c7db6e8
|
Stock entry fixes: incoming rate, toggle display of bom related fields
|
2015-03-03 18:33:34 +05:30 |
|
Rushabh Mehta
|
e693f794f5
|
[subcontract] refactor, make stock entry from PO
|
2015-03-03 15:50:24 +05:30 |
|
Nabin Hait
|
56c6a65a22
|
argument name fix in sendmail
|
2015-03-03 15:48:33 +05:30 |
|
Anand Doshi
|
885e074697
|
Changed company name from Web Notes to Frappe Technologies
|
2015-03-03 14:56:43 +05:30 |
|
Nabin Hait
|
43ba7e1a30
|
allow negative stock issie fixed
|
2015-03-03 14:07:21 +05:30 |
|
Rushabh Mehta
|
1758357a0a
|
[item] toggle reqd, fixes #2832
|
2015-03-03 11:08:22 +05:30 |
|
Rushabh Mehta
|
b83fa3bc2d
|
[pos] [barcode] fixes #2831
|
2015-03-02 18:25:14 +05:30 |
|
Nabin Hait
|
b7ae9b4283
|
Merge pull request #2866 from neilLasrado/barcode
Barcode added to stock entry
|
2015-02-27 11:35:07 +05:30 |
|
Nabin Hait
|
851c745fdf
|
Merge branch 'develop' of https://github.com/frappe/erpnext into v5.0
|
2015-02-26 12:32:04 +05:30 |
|
Nabin Hait
|
98a8fae7c2
|
hotfix for fetching default account and warehouse
|
2015-02-26 11:37:07 +05:30 |
|
Neil Trini Lasrado
|
4abda67a98
|
Barcode added to stock entry
|
2015-02-25 19:01:17 +05:30 |
|
Nabin Hait
|
69d874e7d7
|
Merge pull request #2864 from neilLasrado/delivery-note
Delivery note - Batch Id made Link Feild
|
2015-02-25 18:37:17 +05:30 |
|
Rushabh Mehta
|
a8a2fb225d
|
[fixes] item, test site install
|
2015-02-25 17:32:22 +05:30 |
|
Rushabh Mehta
|
66a92792b4
|
[fix] default account for manufacturing stock entry should be cogs
|
2015-02-25 17:15:45 +05:30 |
|
Rushabh Mehta
|
2a21bc9fc2
|
[taxes and charges] refactor
|
2015-02-25 15:08:57 +05:30 |
|
Rushabh Mehta
|
e91388381c
|
[minor] notifications and other fixes to stock
|
2015-02-25 15:08:57 +05:30 |
|
Anand Doshi
|
d75ef108fc
|
Allow user to change page_name in Item and Item Group #2397
|
2015-02-25 13:50:14 +05:30 |
|
Neil Trini Lasrado
|
b9ff7186ed
|
batch field changed to link feild in packed_item
|
2015-02-25 12:44:45 +05:30 |
|
Anand Doshi
|
d35354cc06
|
Merge remote-tracking branch 'frappe/develop' into v5.0
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
|
2015-02-24 18:12:17 +05:30 |
|
Anand Doshi
|
da858cc587
|
Website Product Image
|
2015-02-24 17:52:09 +05:30 |
|
Rushabh Mehta
|
b620fed762
|
[fixes] [minor]
|
2015-02-24 16:51:22 +05:30 |
|
Nabin Hait
|
7ce2f55ca9
|
print_hide for total_taxes_and_charges in buying
|
2015-02-24 16:06:14 +05:30 |
|
Nabin Hait
|
903c42a130
|
multiplefixes
|
2015-02-24 15:24:49 +05:30 |
|
Rushabh Mehta
|
99d0941008
|
[time logs] fixes
|
2015-02-24 14:48:11 +05:30 |
|
Anand Doshi
|
d57e793bf3
|
[fix] Added unicode_literals if missing in py files
|
2015-02-24 12:24:53 +05:30 |
|
Nabin Hait
|
7b19b9ed02
|
minor fixes
|
2015-02-24 10:04:00 +05:30 |
|
Nabin Hait
|
82e3e25cdb
|
fixes for base_rate, base_amount, tax_amount: mass search and replace
|
2015-02-24 10:02:28 +05:30 |
|
Nabin Hait
|
37b047d9a8
|
Fields added in all sales and purchase doctypes
|
2015-02-24 10:02:28 +05:30 |
|
Nabin Hait
|
613d081a60
|
Validate taxes and charges input, commonified
|
2015-02-24 10:02:28 +05:30 |
|
Nabin Hait
|
34afcfb4a1
|
Print without amount in delivery note
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
de9c8a9028
|
discount calculation and in print view
|
2015-02-24 10:02:27 +05:30 |
|