Nabin Hait
|
06fd10620e
|
Merge pull request #2734 from neilLasrado/kill-html-desc
Kill html desc -WIP
|
2015-02-18 13:13:52 +05:30 |
|
Nabin Hait
|
5fd1727acd
|
Merge pull request #2752 from neilLasrado/stock-amount
client side - recalculate amount and total amount on change of qty or va...
|
2015-02-18 13:11:41 +05:30 |
|
Neil Trini Lasrado
|
d8b35639d8
|
image feild made hidden
|
2015-02-18 12:33:53 +05:30 |
|
Neil Trini Lasrado
|
7f70367dde
|
image view fixed for stock entry and bom
|
2015-02-18 12:33:19 +05:30 |
|
Neil Trini Lasrado
|
3361df709c
|
Image field and view added to all stock doctypes
|
2015-02-18 12:33:19 +05:30 |
|
Neil Trini Lasrado
|
c48f06c095
|
Image field and view added to all selling doctypes
|
2015-02-18 12:33:19 +05:30 |
|
Neil Trini Lasrado
|
66df3566a9
|
html item desc removed from item master, item image added in oppurtunity
|
2015-02-18 12:32:37 +05:30 |
|
Nabin Hait
|
fe81da2dd1
|
listview indicator fix
|
2015-02-18 12:23:18 +05:30 |
|
Neil Trini Lasrado
|
b2c521847e
|
fixes
|
2015-02-18 12:07:09 +05:30 |
|
Nabin Hait
|
da5f766dd5
|
fixed conflict
|
2015-02-18 11:55:13 +05:30 |
|
Neil Trini Lasrado
|
3efc6ab94d
|
fixes
|
2015-02-18 11:51:09 +05:30 |
|
Neil Trini Lasrado
|
9aafe76f63
|
client side - recalculate amount and total amount on change of qty or valuation reate of the item
|
2015-02-18 11:51:09 +05:30 |
|
Rushabh Mehta
|
2e0e711eb2
|
[minor] stock_ledger_entry.py
|
2015-02-18 11:38:48 +05:30 |
|
Rushabh Mehta
|
df9e80c87a
|
[refactor] stock entry, minor ux
|
2015-02-17 19:56:04 +05:30 |
|
Rushabh Mehta
|
0fb678e7cf
|
[stock reco] cleanups
|
2015-02-17 19:56:04 +05:30 |
|
Anand Doshi
|
8c0f05fbae
|
[minor] grid report loading
|
2015-02-17 19:53:23 +05:30 |
|
Nabin Hait
|
7945195478
|
Merge pull request #2761 from neilLasrado/update-finished-goods-fix
Update finished goods fix
|
2015-02-17 14:21:41 +05:30 |
|
Nabin Hait
|
13e6ac737f
|
Merge pull request #2748 from neilLasrado/get-prod-order
fixes in stock entry
|
2015-02-17 14:12:00 +05:30 |
|
Nabin Hait
|
133b7ed218
|
Merge pull request #2743 from neilLasrado/price-list
Price list name made - 'no copy'
|
2015-02-17 14:08:18 +05:30 |
|
Rushabh Mehta
|
2712e36f08
|
[stock reco] added items table
|
2015-02-17 12:50:20 +05:30 |
|
Rushabh Mehta
|
06072c1e51
|
[refactor] Material Transfer for Manufacture
|
2015-02-17 11:50:45 +05:30 |
|
Nabin Hait
|
6f0a3ed8d4
|
fixed conflict
|
2015-02-17 11:12:04 +05:30 |
|
Nabin Hait
|
b09ed41c52
|
Fetch default accounts, cost center only if company matches with the transactions
|
2015-02-17 10:34:17 +05:30 |
|
Rushabh Mehta
|
36b84408a8
|
[fixes] precision in purchase receipt and item group route
|
2015-02-16 18:26:38 +05:30 |
|
Neil Trini Lasrado
|
35898d7518
|
Update finished goods fix
|
2015-02-16 17:25:28 +05:30 |
|
Neil Trini Lasrado
|
4d4c643b7e
|
fixes in stock entry
|
2015-02-13 13:09:17 +05:30 |
|
Neil Trini Lasrado
|
62885b3c56
|
Price list name made -no copy
|
2015-02-12 17:41:20 +05:30 |
|
Nabin Hait
|
5690be103c
|
Replaced renamed total fields in code files
|
2015-02-12 16:09:11 +05:30 |
|
Nabin Hait
|
dd1c2d3018
|
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
|
2015-02-12 13:31:48 +05:30 |
|
Nabin Hait
|
461ee2ebae
|
Renamed total fields
|
2015-02-12 11:47:45 +05:30 |
|
Neil Trini Lasrado
|
daaf5814fa
|
landed cost voucher fix
|
2015-02-11 16:23:46 +05:30 |
|
Nabin Hait
|
8fa503e177
|
Fixed conflict while merging v4 into v5
|
2015-02-10 16:44:00 +05:30 |
|
Nabin Hait
|
15cd12214e
|
Fixed conflict while merging v4 into v5
|
2015-02-10 16:37:18 +05:30 |
|
Anand Doshi
|
6dfd430a2f
|
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
|
2015-02-10 14:41:27 +05:30 |
|
Neil Trini Lasrado
|
845be908d6
|
function moved to validate
|
2015-02-06 16:15:45 +05:30 |
|
Neil Trini Lasrado
|
8fd3828ef5
|
Update Item Desc Button Removed from BOM, Item desc automatically updated in BOM on save of item master
|
2015-02-06 16:09:55 +05:30 |
|
Anand Doshi
|
9b30a8626c
|
[minor] removed default filters for sales order and material request, fixed pos css
|
2015-02-06 12:30:08 +05:30 |
|
Rushabh Mehta
|
a232c80d77
|
[share] add share permission
|
2015-02-05 15:52:58 +05:30 |
|
Nabin Hait
|
e0ce9407cb
|
divisional loss adjustment while doing gl entry for purchase receipt
|
2015-02-05 15:12:37 +05:30 |
|
Rushabh Mehta
|
0e13221338
|
[print] item tables - override description and uom
|
2015-02-04 17:02:24 +05:30 |
|
Neil Trini Lasrado
|
14e24a947b
|
fixes for batch validations
|
2015-02-03 18:23:46 +05:30 |
|
Neil Trini Lasrado
|
9448aaf2a6
|
validation added in stock entry
|
2015-02-03 18:09:56 +05:30 |
|
Neil Trini Lasrado
|
75e0f0a153
|
batch list view fix:
|
2015-02-03 17:41:11 +05:30 |
|
Nabin Hait
|
7e333c6a31
|
Merge pull request #2596 from neilLasrado/item-in-bom
allow bom field removed from Item Master
|
2015-02-02 16:33:46 +05:30 |
|
Rushabh Mehta
|
052bd624c1
|
[minor] removed company description and don't call apply_price_list if no items
|
2015-01-30 16:57:24 +05:30 |
|
Rushabh Mehta
|
06fa46fafe
|
[fix] onshow > on_page_show
|
2015-01-29 18:09:11 +05:30 |
|
Nabin Hait
|
79dc136d50
|
default target warehouse for subcontract
|
2015-01-29 12:51:17 +05:30 |
|
Nabin Hait
|
238fd68803
|
Minor fix
|
2015-01-28 14:30:03 +05:30 |
|
Anand Doshi
|
6f701b3b6a
|
[minor] Packing Slip get_query
|
2015-01-27 13:18:01 +05:30 |
|
Nabin Hait
|
4ccd8d3326
|
Allow nagative batch balance from landed cost voucher
|
2015-01-23 12:18:14 +05:30 |
|
Nabin Hait
|
963393409e
|
minor fix: child table length
|
2015-01-21 17:22:11 +05:30 |
|
Nabin Hait
|
9c47efb592
|
Landed cost voucher: allow negative stock while doing cancellation entry for purchase receipts
|
2015-01-21 16:22:45 +05:30 |
|
Nabin Hait
|
3f671ea60f
|
Landed Cost Voucher: Add field and fixed reposting issue
|
2015-01-21 14:08:06 +05:30 |
|
Neil Trini Lasrado
|
c784fa219b
|
commit
|
2015-01-19 17:05:05 +05:30 |
|
Neil Trini Lasrado
|
f37a5ddff5
|
allow bom field removed from Item Master
|
2015-01-19 17:05:05 +05:30 |
|
Nabin Hait
|
cff8993478
|
Merge pull request #2572 from neilLasrado/credit-note
journal entry linked with Stock Entry
|
2015-01-19 14:26:58 +05:30 |
|
Nabin Hait
|
6609938483
|
Removed validation: target_valuation > source_valuation
|
2015-01-16 11:59:47 +05:30 |
|
Rushabh Mehta
|
0335005eea
|
[minor] added allow rename
|
2015-01-15 15:29:22 +05:30 |
|
Nabin Hait
|
239c2c327c
|
Hide currency and price list section after submission
|
2015-01-15 14:22:04 +05:30 |
|
Nabin Hait
|
45a5d52a2a
|
minor changes in packing slip
|
2015-01-15 14:22:04 +05:30 |
|
Nabin Hait
|
fff3ab752c
|
Fixed conflict
|
2015-01-14 16:27:13 +05:30 |
|
Neil Trini Lasrado
|
9235c6d65a
|
update stock_entry.py
|
2015-01-14 11:54:55 +05:30 |
|
Neil Trini Lasrado
|
50763d58ce
|
frappe.db.exist used
|
2015-01-14 11:54:55 +05:30 |
|
Neil Trini Lasrado
|
adfdd6f83c
|
journal entry linked and validation added
|
2015-01-14 11:54:55 +05:30 |
|
Nabin Hait
|
2244ac4d52
|
Discount amount in party currency
|
2015-01-12 17:35:37 +05:30 |
|
Rushabh Mehta
|
135fe3405f
|
[ui] listviews
|
2015-01-12 16:11:02 +05:30 |
|
Nabin Hait
|
e8500ad4e6
|
Multiple fixes
|
2015-01-10 16:05:17 +05:30 |
|
Nabin Hait
|
675276b802
|
valuation rate mandatory if item is transacting for the first time
|
2015-01-10 10:27:28 +05:30 |
|
Rushabh Mehta
|
d49a123fd0
|
[ui] listviews
|
2015-01-07 16:43:47 +05:30 |
|
Neil Trini Lasrado
|
a17d7cea34
|
test records fixed
|
2015-01-07 15:42:59 +05:30 |
|
Rushabh Mehta
|
738d4ef5c8
|
[ui] [listviews] indicators
|
2015-01-06 18:09:02 +05:30 |
|
Rushabh Mehta
|
e1cb0ae738
|
[design] list views
|
2015-01-05 17:39:05 +05:30 |
|
Anand Doshi
|
9b955feff8
|
[design] POS - item grid and taxes
|
2015-01-05 16:19:12 +05:30 |
|
Nabin Hait
|
0938b5dec6
|
FG item and raw material can not be merged
|
2015-01-02 15:12:30 +05:30 |
|
Anand Doshi
|
3f5e95a99e
|
[design] Fixed Grid Reports
|
2015-01-01 16:26:18 +05:30 |
|
Rushabh Mehta
|
4c36d7388c
|
[ux] fixed creation via tree views for Item Group etc
|
2015-01-01 15:59:34 +05:30 |
|
Rushabh Mehta
|
419ae33c3e
|
[merge] v5-design
|
2014-12-31 15:03:14 +05:30 |
|
Nabin Hait
|
54361e8651
|
fixed conflict while merging develop into v5
|
2014-12-31 13:24:36 +05:30 |
|
Nabin Hait
|
a4e547d71d
|
minor fix
|
2014-12-31 12:08:13 +05:30 |
|
Nabin Hait
|
dd38a266b8
|
Removed tname and fname from code
|
2014-12-26 13:15:21 +05:30 |
|
Rushabh Mehta
|
4096a3ab2b
|
[design] form toolbar
|
2014-12-26 12:53:02 +05:30 |
|
Rushabh Mehta
|
a9ba5eff99
|
[design] pos
|
2014-12-26 12:52:11 +05:30 |
|
Rushabh Mehta
|
f870527e7c
|
[design] wip
|
2014-12-26 12:52:11 +05:30 |
|
Nabin Hait
|
79f091e2fe
|
field renaming
|
2014-12-26 11:41:15 +05:30 |
|
Nabin Hait
|
4b8185db19
|
renaming: entries
|
2014-12-25 18:19:39 +05:30 |
|
Nabin Hait
|
23d2a53017
|
Code replacement for journal voucher renaming
|
2014-12-25 17:14:18 +05:30 |
|
Nabin Hait
|
e7d153624f
|
Table Field Renaming: code replace, JV and budget distribution renamed
|
2014-12-25 16:01:55 +05:30 |
|
Nabin Hait
|
d8f4984d71
|
Table fieldnames renaming: updated json and patch
|
2014-12-24 17:04:48 +05:30 |
|
Nabin Hait
|
b0b7e7fdf8
|
Merge pull request #2497 from neilLasrado/batch-redesign
batch redesigned
|
2014-12-23 17:44:41 +05:30 |
|
Nabin Hait
|
89c52eacc7
|
Actual operation cost in stock entry, fixed cost removed from bom and workstation
|
2014-12-23 17:39:00 +05:30 |
|
Nabin Hait
|
da4e3fb366
|
fixed negative batch wty message
|
2014-12-23 10:58:01 +05:30 |
|
Nabin Hait
|
a04489a72b
|
minor fix no-copy
|
2014-12-22 14:58:36 +05:30 |
|
Nabin Hait
|
e4c659386a
|
packing list index
|
2014-12-16 15:16:55 +05:30 |
|
Nabin Hait
|
0f2137be18
|
no copy property for customer's po no
|
2014-12-16 10:37:55 +05:30 |
|
Neil Trini Lasrado
|
26320fc755
|
batch redesigned
|
2014-12-15 17:42:33 +05:30 |
|
Nabin Hait
|
ad0bd4ca92
|
Pull all customer's po no in delivery note when made from multiple sales order
|
2014-12-12 12:49:45 +05:30 |
|
Nabin Hait
|
a94478a618
|
Merge pull request #2390 from ankitjavalkarwork/fix2314
Add selectable BOM field for Subcontracted Item
|
2014-12-11 17:41:45 +05:30 |
|
ankitjavalkarwork
|
5edae0e47b
|
[#2314] Add selectable BOM field for Subcontracted Item
|
2014-12-04 15:54:54 +05:30 |
|
Rushabh Mehta
|
969069fbf9
|
[report] gross profit WIP
|
2014-12-04 12:37:39 +05:30 |
|
Rushabh Mehta
|
6d950d23a8
|
[merge]
|
2014-11-28 12:08:51 +05:30 |
|
Nabin Hait
|
789b74257e
|
test case fixes
|
2014-11-27 15:22:24 +05:30 |
|
Nabin Hait
|
40fffc0f4d
|
fixes during testing version 5
|
2014-11-26 15:43:27 +05:30 |
|
Nabin Hait
|
249bbbc56f
|
fixes during testing version 5
|
2014-11-26 15:35:39 +05:30 |
|
Nabin Hait
|
9ed41b3abb
|
Reordered Item fields
|
2014-11-26 10:54:11 +05:30 |
|
Nabin Hait
|
db74e316d2
|
Validate serial no after auto-creation based on naming series
|
2014-11-24 15:25:13 +05:30 |
|
Nabin Hait
|
2c114b5bb5
|
Merge pull request #2407 from ankitjavalkarwork/packingsliphead
Add letterhead field and mapper in Packing Slip
|
2014-11-14 14:50:28 +05:30 |
|
ankitjavalkarwork
|
f60f111afe
|
Add letterhead field and mapper in Packing Slip
|
2014-11-13 17:28:42 +05:30 |
|
ankitjavalkarwork
|
338eb36811
|
[#2219] Re-Order Level Validation: Warehouse cannot have two reorders for same item
|
2014-11-11 13:59:46 +05:30 |
|
Nabin Hait
|
f004077734
|
Map only pending qty from Material Request to Purchase Order/Stock Entry
|
2014-11-11 10:51:41 +05:30 |
|
Neil Trini Lasrado
|
6bde5868a9
|
Test Cases Fixed
|
2014-11-05 16:34:02 +05:30 |
|
Neil Trini Lasrado
|
6d8f48ff8d
|
Test Cases Added - Work Pending
|
2014-11-05 15:57:06 +05:30 |
|
Neil Trini Lasrado
|
f9ced8f28f
|
test-cases added
|
2014-11-05 15:46:32 +05:30 |
|
Neil Trini Lasrado
|
67e9081bbf
|
required modifications done
|
2014-11-05 15:46:32 +05:30 |
|
Neil Trini Lasrado
|
ce020cfb27
|
mapper added, type 'Transfer' renamed to 'Material Transfer', patch added
|
2014-11-05 15:46:32 +05:30 |
|
Neil Trini Lasrado
|
f24407e119
|
Material Issue added to Material Request Type
|
2014-11-05 15:46:32 +05:30 |
|
Nabin Hait
|
ae1dcabcb5
|
Fixed merge conflict
|
2014-11-05 12:41:02 +05:30 |
|
Nabin Hait
|
f73a7c1d17
|
Merge pull request #2376 from ankitjavalkarwork/fix2287
Delete Item Price on deletion of linked Item
|
2014-11-05 11:44:18 +05:30 |
|
Nabin Hait
|
941a965af4
|
Ordered qty calculation logic
|
2014-11-04 15:34:03 +05:30 |
|
Nabin Hait
|
4acd431b92
|
Requested qty calculation logic
|
2014-11-04 15:34:03 +05:30 |
|
ankitjavalkarwork
|
a03eda54a2
|
Delete Item Price on deletion of linked Item
|
2014-11-03 16:00:28 +05:30 |
|
Nabin Hait
|
0d421c1bf1
|
Minor fixes
|
2014-11-03 15:46:15 +05:30 |
|
Nabin Hait
|
11e50a8eee
|
Merge pull request #2366 from ankitjavalkarwork/fixprinthideamt
Hide totals in DN, Auto set Bank/Cash acc. in JV
|
2014-11-03 15:38:45 +05:30 |
|
Nabin Hait
|
5288bdeabb
|
Minor fix
|
2014-11-03 15:08:21 +05:30 |
|
ankitjavalkarwork
|
6e06357dc5
|
Hide totals on checking print_without_amount field in DN
|
2014-11-03 11:57:44 +05:30 |
|
Rushabh Mehta
|
98ae5bd9db
|
[form] show website link for website generator
|
2014-10-31 14:28:47 +05:30 |
|
Neil Trini Lasrado
|
0683fc33ed
|
Fix error in get_default_cost_center() function
|
2014-10-22 14:51:37 +05:30 |
|
Nabin Hait
|
16e05c321c
|
Removed stock ageing grid report
|
2014-10-22 13:10:43 +05:30 |
|
Nabin Hait
|
23d7919865
|
Stock ageing report fix
|
2014-10-22 13:06:26 +05:30 |
|
Nabin Hait
|
38265efc39
|
Minor fix
|
2014-10-21 20:23:39 +05:30 |
|
Rushabh Mehta
|
39dbf73de7
|
[merge] item-variants
|
2014-10-21 13:24:46 +05:30 |
|
Rushabh Mehta
|
be1a8d82c5
|
[merge] develop
|
2014-10-21 13:14:55 +05:30 |
|
Rushabh Mehta
|
ab43942b35
|
Merge pull request #2231 from rmehta/item-variants
Item variants
|
2014-10-21 12:38:16 +05:30 |
|
Nabin Hait
|
fc2dd44694
|
Partial payment reconciliation. Fixes #1982
|
2014-10-17 14:57:20 +05:30 |
|
Nabin Hait
|
f1a07ff105
|
Allow zero rate while reposting
|
2014-10-15 12:23:35 +05:30 |
|
Nabin Hait
|
fb6e434315
|
Guess valuation rate in case of negative stock
|
2014-10-15 11:34:40 +05:30 |
|
Nabin Hait
|
0dc18f0102
|
Minor fixes
|
2014-10-14 17:15:02 +05:30 |
|
Nabin Hait
|
bf492122f8
|
minor fix
|
2014-10-14 16:09:14 +05:30 |
|
Nabin Hait
|
38d0ed9f3a
|
Negative stock allowed for perpetual inventory. Blocked in specific case
|
2014-10-14 16:08:19 +05:30 |
|
Nabin Hait
|
8a28ccfa2f
|
Repost gl entries where mismatch with stock balance
|
2014-10-14 11:41:56 +05:30 |
|
Nabin Hait
|
daf344e5fd
|
Precision fixed in batch-wise balance report
|
2014-10-13 10:48:26 +05:30 |
|
Nabin Hait
|
70ec88b733
|
fixed test cases
|
2014-10-10 21:22:46 +05:30 |
|
Nabin Hait
|
4f0e5db216
|
Stock balance grid report deprecated and moved to server side
|
2014-10-10 20:54:57 +05:30 |
|
Nabin Hait
|
30a0e3e8b4
|
Merge pull request #2275 from ankitjavalkarwork/fix2164
Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes
|
2014-10-10 18:05:19 +05:30 |
|
Nabin Hait
|
7c6f990cf9
|
Minor fix for moving average
|
2014-10-10 18:03:27 +05:30 |
|
Nabin Hait
|
7820b171d3
|
Stock balance grid report deprecated and moved to server side
|
2014-10-10 18:03:07 +05:30 |
|
Nabin Hait
|
4d74216147
|
Maintain negative stock balance if balance qty is negative
|
2014-10-09 19:25:19 +05:30 |
|
ankitjavalkarwork
|
e69a611991
|
[#2164] New field names in DN, fix field name refs, Patch added
|
2014-10-09 17:31:46 +05:30 |
|
ankitjavalkarwork
|
9aadb0d95d
|
[#2164] Add Delivered Qty to Sales Inv from Delivery Note, fix issues
|
2014-10-09 17:31:46 +05:30 |
|
Neil Trini Lasrado
|
eaae58f507
|
Transaction.js fixed , code commonified
|
2014-10-09 15:01:13 +05:30 |
|
Neil Trini Lasrado
|
9614b552fd
|
fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim
|
2014-10-09 15:01:12 +05:30 |
|