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 |
|
Nabin Hait
|
e7679703cf
|
Taxes and totals calculation in party currency
|
2015-02-24 10:02:27 +05:30 |
|
Anand Doshi
|
f9fc04ce8e
|
Website Listing
|
2015-02-23 22:34:27 +05:30 |
|
Rushabh Mehta
|
a1da88a3d3
|
[capacity planning] automatically plan Time Logs from Production Order
|
2015-02-23 20:18:38 +05:30 |
|
Rushabh Mehta
|
d06c1188a0
|
[item] patches
|
2015-02-23 14:43:15 +05:30 |
|
Rushabh Mehta
|
d54031f3b5
|
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
|
2015-02-22 22:32:39 +05:30 |
|
Rushabh Mehta
|
65a2759432
|
[minor] opportunity / item
|
2015-02-21 17:35:50 +05:30 |
|
Rushabh Mehta
|
e8a37949cf
|
[issue fixes] + added fixtures for item attribute and operation
|
2015-02-20 20:10:11 +05:30 |
|
Rushabh Mehta
|
813f0eda05
|
[form] section labels
|
2015-02-20 16:02:48 +05:30 |
|
Rushabh Mehta
|
dc93e0adc6
|
[fixes] stock reco
|
2015-02-20 15:11:56 +05:30 |
|
Nabin Hait
|
ad3fd5166b
|
update stock uo in sle for DN
|
2015-02-20 14:23:58 +05:30 |
|
Sambhaji Kolate
|
973f78e7d3
|
fixed stock_balance report for stock_uom and stock ledger entry for Delivery Note #2802
|
2015-02-20 13:09:39 +05:30 |
|
Rushabh Mehta
|
50dc4e90e3
|
[cleanup] item grid views, removed desc etc
|
2015-02-19 20:05:45 +05:30 |
|
Rushabh Mehta
|
c7a11cc451
|
[usability] [fixes] stock entry and production order
|
2015-02-19 16:28:35 +05:30 |
|
Rushabh Mehta
|
d60acb9f26
|
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
|
2015-02-19 14:53:31 +05:30 |
|
Rushabh Mehta
|
8bb6e530c7
|
[fixes] accounts, stock changes
|
2015-02-18 20:22:59 +05:30 |
|
Rushabh Mehta
|
614e7ab757
|
[cleanup] SMS, and added item filter in stock balance
|
2015-02-18 19:51:48 +05:30 |
|
Rushabh Mehta
|
4ea1ade7b9
|
[hub] start
|
2015-02-18 19:09:56 +05:30 |
|
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 |
|