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
Neil Trini Lasrado
565d986198
fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6
Fixed issues
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
78fa6954e5
Fiscal year autofetch added
2014-10-09 15:01:12 +05:30
Nabin Hait
e96e83d557
stock reco and repost vouchers
2014-10-08 18:06:14 +05:30
Rushabh Mehta
ebc6016ffb
[tests] fixes
2014-10-08 13:54:19 +05:30
Rushabh Mehta
7472a1147c
[tests] fixes
2014-10-08 12:41:06 +05:30
Rushabh Mehta
f850987db0
[fixes] tests and moved reorder_item to separate module
2014-10-08 12:03:19 +05:30
Nabin Hait
6c48ef781b
Utility: Repost stock ledger entries and gl entries for all stock transactions
2014-10-08 11:02:18 +05:30
Nabin Hait
adeb976a1b
Block negative stock in perpetual inventory
2014-10-08 11:02:18 +05:30
Nabin Hait
bb19b91ef9
stock reco fixes
2014-10-08 11:02:18 +05:30
Nabin Hait
bfa7f171bd
Stock reconciliation sl entries
2014-10-08 11:02:18 +05:30
Nabin Hait
b96c014daf
Stock Reconciliation logic simplified
2014-10-08 11:02:18 +05:30
Rushabh Mehta
b31e90c7a5
[tests] fixes to stock entry
2014-10-07 16:56:46 +05:30
Rushabh Mehta
db08041f05
[fix] remove test for item attribute value
2014-10-07 15:39:35 +05:30
Rushabh Mehta
724f9e57e3
[item-variants] get table values from template if not set in variant #2224
2014-10-07 15:29:58 +05:30
Rushabh Mehta
baef96b5a2
[item-variants] allow production order of variant #2224
2014-10-07 12:34:19 +05:30
Rushabh Mehta
1a7637459c
[item-variants] added more validations, tests #2224
2014-10-07 11:40:47 +05:30
Rushabh Mehta
ef276045c4
[item variants] make variants, bom updates
2014-10-07 11:40:47 +05:30
Rushabh Mehta
70aa8933b1
[item variant] started
2014-10-07 11:39:54 +05:30
Rushabh Mehta
9974b16c32
[fix] packing slip
2014-10-07 10:52:05 +05:30
Nabin Hait
997a7a1d3e
Test case fixes
2014-10-06 13:15:21 +05:30
Nabin Hait
36cf4a4708
Test case fixes
2014-10-06 13:15:02 +05:30
Nabin Hait
894a1b539a
Dynamic link in general ledger and stock ledger report
2014-10-06 13:14:22 +05:30
Nabin Hait
db030d1761
Set Receivable/Payable account based on party
2014-10-06 13:13:27 +05:30
Nabin Hait
3a40435f8c
Credit days and credit limit option in customer group / supplier type #1354
2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f
Credit Limit and credit days fixes #2031
2014-10-06 13:05:28 +05:30
Nabin Hait
be8ec39678
Deleted master_type, master_name, credit_days, credit_limit fields from account
...
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
2014-10-06 13:02:40 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
ankitjavalkarwork
e9877a0c48
[fix][minor]Add Actual Qty, Projected Qty to Ordered Items to be Delivered Report
2014-10-01 18:07:25 +05:30
Nabin Hait
4f614b4030
Merge pull request #2195 from neilLasrado/manufacture-and-repack
...
[fix] Issue #2183 - Manufacturing and repack seprated in stock entry
2014-09-30 15:11:05 +05:30
Neil Trini Lasrado
29d1a1c593
manufacturing and repack sepreted, test cases fixed, patch fixed
2014-09-30 14:07:56 +05:30
Neil Trini Lasrado
3b90de558f
Has Batch No field should be freezed #2023
2014-09-30 12:57:32 +05:30
Rushabh Mehta
86211cd219
Merge pull request #2203 from rmehta/mailbox
...
Mailbox
2014-09-29 14:18:10 +05:30
Rushabh Mehta
39764685f0
[fix] material request feed
2014-09-29 13:00:36 +05:30
Rushabh Mehta
e1509162e1
[fix] material request feed
2014-09-29 12:53:53 +05:30
Rushabh Mehta
66e08e39f7
[fix] currency moved to frappe
2014-09-29 12:17:03 +05:30
Nabin Hait
d60235e239
minor fix in warehouse-wise stock balance report
2014-09-29 11:36:06 +05:30
Nabin Hait
9b50b0a762
Fixes for item list view
2014-09-29 11:36:06 +05:30
Nabin Hait
5e080f9039
Update utils.py
2014-09-26 15:05:30 +05:30
Nabin Hait
b0bd99266d
Fix in landed cost voucher
2014-09-26 14:30:02 +05:30
ankitjavalkarwork
9aa11d2ad7
Add ability to fetch Non stock items in Gross Profit report
2014-09-18 19:08:04 +05:30
Anand Doshi
11b75759d2
Merge pull request #2194 from ankitjavalkarwork/stockbalreport
...
Update report with Valuation rate, stock values, move to Main report
2014-09-16 15:22:25 +05:30
Anand Doshi
8950abc36f
Merge pull request #2197 from anandpdoshi/anand-september-15
...
[minor] removed Suggest
2014-09-16 15:18:57 +05:30
Rushabh Mehta
bf8715dba4
[refactor] used frappe.sendmail
2014-09-16 15:12:18 +05:30
Rushabh Mehta
5cdc8e560c
[mailbox] removed separate email settings for jobs, sales, support
2014-09-16 15:12:18 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a
[refactor modules]
2014-09-16 15:08:02 +05:30
Nabin Hait
ca260618d8
Minor fix
2014-09-16 11:24:25 +05:30
Anand Doshi
30c5b41398
[minor] removed Suggest
2014-09-15 16:43:34 +05:30
81552433qqcom
ac0c3fb696
#2190 hotfix, item page
2014-09-15 10:21:36 +08:00
81552433qqcom
951da0ca3d
added translations to report py file.
2014-09-12 16:07:12 +05:30
81552433qqcom
351be9ca42
translations.
2014-09-12 16:07:11 +05:30
81552433qqcom
4bab0a2f54
various translation missed __()
2014-09-12 16:07:11 +05:30
Ankit Javalkar
8e7ca41817
Payment Tool #2106
2014-09-12 15:23:46 +05:30
Neil Trini Lasrado
e9882e12ba
Cost of Production cycle
2014-09-12 11:25:03 +05:30
ankitjavalkarwork
2e07305616
Update report with Valuation rate, stock values, move to Main report
2014-09-11 16:47:19 +05:30
Anand Doshi
907494c5d4
[fix] transfer_qty in get_stock_and_rate
2014-09-11 16:22:12 +05:30
Anand Doshi
fc33d5a75b
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
2014-09-09 15:25:43 +05:30
Anand Doshi
dc79334f1c
[fix] Clear website cache for Item Group on saving Item
2014-09-09 12:35:15 +05:30
Nabin Hait
ff7e9b6b22
Get items in PO from material requests based on supplier
2014-09-09 11:01:55 +05:30
Anand Doshi
45c9b1c065
[minor] Set in_list_view for Sales and Purchase item tables
2014-09-08 17:42:17 +05:30
Nabin Hait
0f798dda15
Valuation rate for finished goods in repack entries
2014-09-04 15:21:46 +05:30
Nabin Hait
629e51a8e9
Search field fixed in stock entry
2014-09-04 15:21:46 +05:30
Nabin Hait
a84f3663dd
removed test records for landed cost voucher
2014-09-02 23:11:06 +05:30
Nabin Hait
96bdc5834c
Get valuation rate in manufacturing/repack entry
2014-09-02 20:02:25 +05:30
Nabin Hait
9e563e7b47
Stock reconciliation when valuation rate column is blank
2014-09-01 18:16:24 +05:30
Nabin Hait
12ce3eefca
landed cost voucher added in module page
2014-09-01 18:16:24 +05:30
Anand Doshi
40a8ae2907
[fix] get incoming rate
2014-08-29 16:28:31 +05:30
Anand Doshi
43f087c99d
[hotfix] Supplier read permission for Purchase User
...
[Fix] Issue #448
[Fix] Issue #448 2
2014-08-26 16:30:39 +05:30
Neil Trini Lasrado
9d1e8b61fe
[Fix] Issue #980 final
2014-08-25 19:04:30 +05:30
Neil Trini Lasrado
d676491b6e
Merge https://github.com/frappe/erpnext into item_group
2014-08-25 16:18:31 +05:30
Neil Trini Lasrado
caba531e89
[fix] issue#980
2014-08-25 13:22:15 +05:30
Rushabh Mehta
e8dd4160d4
[cleanup] remove allow_attach
2014-08-25 13:04:21 +05:30
Rushabh Mehta
cb067aa579
[route] refactor, wip
2014-08-20 11:44:30 +05:30
Rushabh Mehta
74bc2baa1d
remove website route, wip
2014-08-20 11:43:58 +05:30
Anand Doshi
cca6460e65
[fix] Error Reports
2014-08-19 16:06:09 +05:30
Anand Doshi
6ab831b387
Allow Default Warehouse for Item, even if not a Stock Item
2014-08-18 19:04:19 +05:30
Nabin Hait
448c9b71c1
minot fix in material request
2014-08-18 15:40:36 +05:30
Pratik Vyas
c0d31ce648
Merge pull request #2062 from nabinhait/hotfix
...
Hotfix
2014-08-15 11:06:44 +05:30
Anand Doshi
eb39435481
[hotfix] Allow on submit for Projected Qty
2014-08-14 18:08:19 +05:30
Nabin Hait
54498452b6
Stock entry minor fix
2014-08-14 15:49:44 +05:30
Nabin Hait
821aad5281
Sales/purchase return: fixes for qty validation
2014-08-14 15:15:14 +05:30
Rushabh Mehta
ab8bde0149
[ux] added folds, show actual / projected qty in pos
2014-08-14 11:43:46 +05:30
Anand Doshi
f957cbd8ef
[test] Purchase Receipt - update rejected serial no
2014-08-11 18:03:43 +05:30
Nabin Hait
5c0db8d05e
Landed Cost voucher test case for serialized items
2014-08-11 16:28:29 +05:30
Nabin Hait
200e8d971f
Landed Cost voucher test case for serialized items
2014-08-11 16:12:32 +05:30
Nabin Hait
a97e700371
Add rejected serial nos in Purchase Receipt if auto-created based on series
2014-08-11 16:12:32 +05:30
Nabin Hait
2b776e8c3a
Landed cost voucher minor fixes
2014-08-11 16:12:32 +05:30
Nabin Hait
f3e1181ad9
Landed cost voucher fixes
2014-08-11 16:12:32 +05:30
nabinhait
9cbcf96aeb
no copy property for landed cost voucher amount field
2014-08-11 16:12:32 +05:30
nabinhait
8ca3189f07
pr and pi gl entries
2014-08-11 16:12:31 +05:30
nabinhait
98e7dcfe2c
landed cost voucher minor fix
2014-08-11 16:12:31 +05:30
nabinhait
cfd1b10980
Purchase receipt gl entries if there is warehouse without account
2014-08-11 16:12:31 +05:30
nabinhait
f807cda375
PR and PI gl entries fixes for landed cost
2014-08-11 16:12:31 +05:30
nabinhait
11594c7927
purchase receipt gl entries
2014-08-11 16:12:31 +05:30
nabinhait
509aa52efc
minor fix
2014-08-11 16:12:31 +05:30
nabinhait
e2c3f7ab14
Added help in landed cost voucher
2014-08-11 16:12:31 +05:30
nabinhait
fe39442c48
Removed old landed cost wizard
2014-08-11 16:12:31 +05:30
nabinhait
b21b6598f1
Test case for landed cost voucher
2014-08-11 16:12:31 +05:30
nabinhait
5e1b0014c2
GL entries for sub-contracting and rejected qty
2014-08-11 16:12:31 +05:30
nabinhait
cc0692d714
landed cost fix
2014-08-11 16:12:31 +05:30
nabinhait
87f2401c1e
Landed Cost on_submit and gl entries for PR
2014-08-11 16:12:31 +05:30
nabinhait
f6ea21c8ae
landed cost voucher design changed #1921
2014-08-11 16:12:30 +05:30
nabinhait
4436157da1
Landed cost redesign initial commit #1921
2014-08-11 16:12:30 +05:30
Anand Doshi
b00a2422e4
[hotfix] Allow on Submit - Actual / Projected Qty for Packed Item
2014-08-11 15:54:20 +05:30
Anand Doshi
42335fb2cb
[minor] Allow on Submit - Actual / Projected Qty
2014-08-11 13:28:29 +05:30
Anand Doshi
52d1ea83a0
[hotfix] Stock Entry List
2014-08-11 09:16:59 +05:30
Anand Doshi
03eadb74ab
Fixes to microtemplate feature
2014-08-08 11:56:32 +05:30
Rushabh Mehta
c9bd3f5d4a
added templates for projects
2014-08-08 11:56:32 +05:30
Rushabh Mehta
873141c1a5
more updates to lists and started sane filters
2014-08-08 11:56:32 +05:30
Rushabh Mehta
8544447b19
added more listview templates
2014-08-08 11:56:32 +05:30
Rushabh Mehta
18eb4f5015
added listviews for sales, purchase
2014-08-08 11:56:31 +05:30
Rushabh Mehta
b5e768906a
built item grids for sales, purchase, stock
2014-08-08 11:56:31 +05:30
Rushabh Mehta
995185d02d
[ux] fixed primary action
2014-08-08 11:51:23 +05:30
Nabin Hait
67cd3fb89c
Fixes in making credit note from Sales Return
2014-08-07 15:34:53 +05:30
Anand Doshi
29817d6d8b
[print] Moved Total Taxes and Charges to the right column
2014-07-31 16:05:19 +05:30
Anand Doshi
fbe37c9158
Labels: Use Date instead of Posting Date
2014-07-31 14:31:25 +05:30
nabinhait
0ad677045a
Test record fixed for warehouse
2014-07-31 11:40:40 +05:30
nabinhait
c1f65dd863
Validation: Account must belong to the same company
2014-07-31 11:40:40 +05:30
Anand Doshi
627f13ea26
Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text
2014-07-30 13:09:01 +05:30
Anand Doshi
60ee2ea8af
[hotfix] Stock Entry search fields
2014-07-29 23:16:24 +05:30
Anand Doshi
0e93352c8d
[print] Hide Rate, Amount if Print Without Amount in Delivery Note
2014-07-29 22:03:40 +05:30
nabinhait
92a1e06665
message fix
2014-07-29 12:46:56 +05:30
nabinhait
7555d619f2
Message for frozen stock entries
2014-07-29 11:35:41 +05:30
nabinhait
0a35277c96
Stock reconciliation only for valuation
2014-07-28 16:41:34 +05:30
nabinhait
3d48a4ef65
Sales / purchase return: Get party details fix
2014-07-28 16:41:33 +05:30
nabinhait
957971eb1d
Column added 'Reqd by Date' in po_items_to_be_billed report
2014-07-28 16:41:33 +05:30
Anand Doshi
62b1cbf003
[impact] Limit available functions in jinja environment
2014-07-25 13:02:29 +05:30
Anand Doshi
a5437cdac1
Fixes for print
2014-07-25 13:02:28 +05:30
Rushabh Mehta
5b51cc86a9
many fixes to print
2014-07-25 13:01:53 +05:30
Rushabh Mehta
f84c240d1c
cleanup for print format
2014-07-25 13:01:52 +05:30
Anand Doshi
4c5d7617fb
[minor] Update if missing, source and target warehouse in stock entry detail table, when they are specified in the form
2014-07-21 18:02:22 +05:30
Rushabh Mehta
1c6313679b
Update material_request.js
2014-07-21 13:08:49 +05:30
Anand Doshi
d141cf7293
Minor fix in reorder item
2014-07-18 10:31:34 +05:30
Anand Doshi
e8332be285
Merge pull request #1949 from anandpdoshi/anand-july-17
...
Fix in Stock Entry test case
2014-07-17 12:37:42 +05:30
Anand Doshi
fa0db761da
Fix in Stock Entry test case
2014-07-17 12:30:55 +05:30
nabinhait
d16081c4d9
Batch no get query fix
2014-07-17 11:08:19 +05:30
nabinhait
143400d444
Batch no get query fix
2014-07-17 11:00:13 +05:30
Anand Doshi
b8189d7d23
Auto Re-order Item for default warehouse only, if Warehouse wise re-order not specified
2014-07-16 19:24:53 +05:30
Anand Doshi
4b5e89a067
Fixes in Stock Entry test cases
2014-07-16 19:23:58 +05:30
Anand Doshi
d93fa2f78b
Fixes in Stock Entry and test cases
2014-07-16 16:08:15 +05:30
nabinhait
d5fd535909
Minor fix, if no default company
2014-07-14 12:39:50 +05:30
nabinhait
614fb750b7
set qty as per stock uom in entire purchase cycle
2014-07-14 10:48:12 +05:30
nabinhait
d5fb5d91e9
overflow validation fixed
2014-07-10 15:27:27 +05:30
Anand Doshi
a96cf5b96b
Print Hide other charges calculation
2014-07-10 12:16:39 +05:30
nabinhait
89b5e3e2ea
Set discount zero while fetching price list rate
2014-07-08 16:00:25 +05:30
nabinhait
ff2cc1626e
Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list
2014-07-08 15:30:25 +05:30
Anand Doshi
e729516af7
Minor fix
2014-07-07 15:54:11 +05:30
Anand Doshi
4f0a42846c
Catch FiscalYearError in Re-order Item
2014-07-07 15:21:18 +05:30
Anand Doshi
dffec8fb85
Reapply Price List on Change
2014-07-04 15:44:48 +05:30
nabinhait
23cce731ab
Fixes in action, not defined if called from outside document class
2014-07-03 12:25:06 +05:30
Prakash Hodage
c01f4582de
Description removed for default cost center
2014-07-03 10:50:35 +05:30
Anand Doshi
e673a664ac
Fixes to end_of_life conditions
2014-07-02 18:15:01 +05:30
Anand Doshi
8ac4643fd7
Merge pull request #1867 from nabinhait/v4-hotfix
...
Multiple fixes
2014-06-30 13:20:49 +05:30
Anand Doshi
c459fe21f8
Merge pull request #1865 from frappe/wip-4.1
...
Wip 4.1
2014-06-30 12:00:55 +05:30
Nabin Hait
606c601fc0
Make debit/credit note from sales/purchase return
2014-06-30 11:50:17 +05:30
Nabin Hait
7c9652997b
Item website specification from item group
2014-06-30 11:50:17 +05:30
Anand Doshi
11ada53ed5
Fixes related to Website Route system and other misc fixes
2014-06-28 12:13:11 +05:30
Nabin Hait
a0a18d963d
item query fixed in stock entry
2014-06-27 13:04:22 +05:30
Nabin Hait
b7e91ee95e
with_doc issue fixes
2014-06-26 15:54:45 +05:30
Anand Doshi
f1af06c00d
Merge remote-tracking branch 'frappe/develop' into wip-4.1
2014-06-26 15:05:42 +05:30
Nabin Hait
4a1c897b2d
Select field options in serial no
2014-06-26 12:35:14 +05:30
Anand Doshi
5263b1a9c1
Merge remote-tracking branch 'frappe/develop' into wip-4.1
2014-06-25 17:06:51 +05:30
Nabin Hait
2b400dc2ad
stock entry incoming rate based on precision
2014-06-25 16:57:49 +05:30
Anand Doshi
8b2dfcff29
Naming Series Property Setter Patch
2014-06-25 16:57:49 +05:30
Nabin Hait
061c9744af
Set status button in serial no
2014-06-25 16:57:48 +05:30
Nabin Hait
43616619ec
Set status button in serial no
2014-06-25 16:57:48 +05:30
Nabin Hait
9daca108b3
Pricing Rule fixes and improvements. Fixes #1795
2014-06-25 16:57:47 +05:30
Nabin Hait
c5e813f9f4
Overwrite from POS Settings if value exists
2014-06-25 16:57:07 +05:30
Nabin Hait
3b7dd0396f
Get party details fixes
2014-06-25 16:57:07 +05:30
Nabin Hait
c226292d8e
Stocvk entry incoming rate for sales return
2014-06-25 16:57:07 +05:30
Nabin Hait
216e5bb208
Incoming rate for sales return
2014-06-25 16:57:07 +05:30
Nabin Hait
afdc0a5f59
Valuation rate and amount for fg item
2014-06-25 16:57:07 +05:30
Anand Doshi
222b7b660e
Stock Entry: get fg item incoming rate if bom is mentioned
2014-06-25 16:57:06 +05:30
Anand Doshi
a469954ef3
Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
...
This reverts commit 297939325a
.
2014-06-25 16:57:06 +05:30
Anand Doshi
457515fc08
Stock Entry: get fg item incoming rate if bom is mentioned
2014-06-25 16:57:05 +05:30
Anand Doshi
e3ac8dd5a8
Don't set default for warehouse when creating serial no
2014-06-25 16:57:05 +05:30
Nabin Hait
cea571fc31
Fixes in fetching valuation rate in stock entry
2014-06-25 16:57:03 +05:30
Nabin Hait
7c6c2e0ccf
Do not make packing list after submission
2014-06-25 16:57:02 +05:30
Anand Doshi
a740f750c7
Stock Entry: Serial No Mandatory when purpose in Material Transfer, Sales Return, Purchase Return
2014-06-25 13:31:02 +05:30
Anand Doshi
610a405c85
Fix in warehouse query
2014-06-25 13:30:26 +05:30
Anand Doshi
e0a7ff77df
Merge pull request #1838 from nabinhait/v4-hotfix
...
Multiple fixes
2014-06-24 17:37:39 +05:30
Nabin Hait
fdf38dab6f
stock entry incoming rate based on precision
2014-06-24 12:42:36 +05:30
Anand Doshi
83da92fdcc
Naming Series Property Setter Patch
2014-06-23 18:04:07 +05:30
Nabin Hait
da490e3f53
Set status button in serial no
2014-06-23 15:51:03 +05:30
Nabin Hait
36da171a3d
Set status button in serial no
2014-06-23 15:36:31 +05:30
Nabin Hait
444f956e7b
Pricing Rule fixes and improvements. Fixes #1795
2014-06-20 16:00:45 +05:30
Nabin Hait
faf176d78c
Overwrite from POS Settings if value exists
2014-06-18 19:52:24 +05:30
Nabin Hait
4d7c4fc0f4
Get party details fixes
2014-06-18 16:40:59 +05:30
Nabin Hait
e7c2f74a07
Stocvk entry incoming rate for sales return
2014-06-18 16:40:59 +05:30
Nabin Hait
a7da6e1480
Incoming rate for sales return
2014-06-18 16:40:59 +05:30
Nabin Hait
ae0d753cad
Valuation rate and amount for fg item
2014-06-18 16:40:59 +05:30
Anand Doshi
de12a0941f
Stock Entry: get fg item incoming rate if bom is mentioned
2014-06-18 14:05:29 +05:30
Anand Doshi
987a28fc6a
Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
...
This reverts commit 297939325a
.
2014-06-18 14:05:08 +05:30
Anand Doshi
297939325a
Stock Entry: get fg item incoming rate if bom is mentioned
2014-06-18 13:10:10 +05:30
Anand Doshi
2f800521cb
Don't set default for warehouse when creating serial no
2014-06-18 12:48:46 +05:30
Nabin Hait
0693937c1e
Fixes in fetching valuation rate in stock entry
2014-06-18 10:20:01 +05:30
Nabin Hait
b73d3f925d
Do not make packing list after submission
2014-06-18 10:18:50 +05:30
Rushabh Mehta
36881807ed
Merge branch 'wip-4.2' into wip-4.1
2014-06-17 17:36:22 +05:30
Rushabh Mehta
9f887b436c
fixes new routing, for frappe/frappe#600
2014-06-17 16:53:44 +05:30
Rushabh Mehta
5df521bad5
updated generators for wip-4.2
2014-06-17 14:21:26 +05:30
Nabin Hait
d2e8a0a96a
Delivery note update after submission
2014-06-17 12:55:52 +05:30
Nabin Hait
a6fc3f6337
Ignore pricing rule for material request
2014-06-16 15:34:52 +05:30
Nabin Hait
539f352318
Delivery note to packing slip mapping
2014-06-16 15:03:36 +05:30
Anand Doshi
c1bfb63d96
Create price list if missing
2014-06-13 12:41:08 +05:30
Nabin Hait
f2202fc014
minor fix
2014-06-12 15:20:47 +05:30
Nabin Hait
46dc3b1442
validations added in stock entry
2014-06-12 12:48:28 +05:30
Nabin Hait
2128c98c35
available qty validation. Fixes #1045
2014-06-12 12:42:22 +05:30
Nabin Hait
e98b326ba3
Stock Entry: Always set valuation rate automatically if source warehouse provided or sales return. Fixes #932
2014-06-12 12:25:23 +05:30
Anand Doshi
7656377f3f
Show website route for generator via set_intro, fix in Support Email Settings
2014-06-10 15:48:37 +05:30
Anand Doshi
b527e54809
Fixed report: Item wise Price List Rate
2014-06-09 18:08:46 +05:30
Anand Doshi
edb9efd9a6
Fixed manifest and website
2014-06-09 15:11:18 +05:30
Anand Doshi
cdfa9a371d
Export perm for GL Entry and Stock Ledger Entry
2014-06-09 15:11:17 +05:30
Anand Doshi
482d29dc53
Fixed Purchase Receipt qty trigger
2014-06-06 20:34:08 +05:30
Rushabh Mehta
880b3ef6c0
added qty updating option multi-item selector
2014-06-06 11:45:30 +05:30
Rushabh Mehta
ba83e9cfbe
removed sms control and related cleanup, fixes frappe/erpnext#462
2014-06-05 17:56:42 +05:30
Nabin Hait
19d1e499c3
Removed Purchase in transit report #1435
2014-06-04 19:00:56 +05:30
Anand Doshi
ec8240e890
Apply User Permissions optional in Script and Query Reports
2014-06-04 17:48:58 +05:30
Anand Doshi
69eec9e344
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
a8ce570635
Permission relogication continued
2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7
Started permission relogication
2014-06-04 17:48:52 +05:30
Anand Doshi
ffc28faa51
Merge pull request #1744 from rmehta/develop
...
added multiple item select and allow non purchase items in Material Requ...
2014-06-04 17:47:58 +05:30
Rushabh Mehta
b6843f2087
added multiple item select and allow non purchase items in Material Request of type transfer
2014-06-04 13:10:41 +05:30
Nabin Hait
ce6977ffe6
Minor fixes in fetching item details
2014-06-03 23:02:02 +05:30
Nabin Hait
bc7efa6da6
Parent account mandatory for all non-root accounts
2014-06-03 23:02:02 +05:30
Nabin Hait
b15764ef2c
Translation issue fixed in analytics/grid report
2014-06-03 13:02:39 +05:30
Nabin Hait
548cf96c44
Minor fixes in sales return
2014-05-30 19:09:59 +05:30
Nabin Hait
e6ddd28067
Don't execute reorder_item, if initial setup not completed. fixes #1668
2014-05-30 15:53:20 +05:30
Nabin Hait
c1367d9d10
minor fixes
2014-05-30 11:43:00 +05:30
Nabin Hait
7f32cbeb06
Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials #1688
2014-05-30 11:22:15 +05:30
Nabin Hait
c7253b3a37
Get valuation rate for fg item base don issued item cost + operation cost. #1688
2014-05-30 11:22:15 +05:30
Nabin Hait
66cecf4824
uom trigger issue in stock entry fixes #1712
2014-05-30 11:22:15 +05:30
Nabin Hait
f3552ca737
packing slip fixes #1711
2014-05-30 11:22:15 +05:30
Nabin Hait
3dc6a80198
deleted delivery note packing list wise print format
2014-05-30 11:22:14 +05:30
Nabin Hait
e71159d6ea
Standard Rate field removed from item. Fixes #1688
2014-05-30 11:22:14 +05:30
Nabin Hait
732a7e81a0
Incoming rate in stock ledger and valuation rate in stock balance report. Fixes #1706
2014-05-30 11:22:14 +05:30
Nabin Hait
9bc9b8795b
Fixes in stock reconciliation
2014-05-30 11:22:13 +05:30
Nabin Hait
d0605443fb
removed print statement
2014-05-30 11:22:13 +05:30
Nabin Hait
47a8670d37
pricing rule testcase fixes
2014-05-30 11:22:12 +05:30
Nabin Hait
ccb9826afd
pricing list tets case fixes
2014-05-30 11:22:12 +05:30
Nabin Hait
a3dd72a759
Pricing Rule
2014-05-30 11:22:10 +05:30
Rushabh Mehta
f944e819e9
fixes #1581 and added icons to grid reports
2014-05-27 15:22:04 +05:30
Rushabh Mehta
a7c46e4d83
removed debug in query (packing_slip.py)
2014-05-26 13:35:47 +05:30
Rushabh Mehta
b15d760406
fix to packing slip (validation)
2014-05-26 13:05:19 +05:30
Nabin Hait
edf87a258f
Create serial no based on series only if item is serialized
2014-05-21 15:38:56 +05:30
Nabin Hait
2e0620e370
Server side onload functionality in multiple docs
2014-05-19 18:15:58 +05:30
Nabin Hait
b5a8cab8df
Valuation Rate column in Stock Ledger report. Fixed #1633
2014-05-15 11:50:46 +05:30
Anand Doshi
54b7962eb9
Pass frm to open_mapped_doc
2014-05-14 17:38:45 +05:30
Anand Doshi
39cc1df560
Fixes #1635 , Stock Reconcilation
2014-05-14 15:10:00 +05:30
Anand Doshi
4c83e407a9
Changed Print Format files to lowercase
2014-05-13 17:58:30 +05:30
Nabin Hait
aade34b0c9
Reports and print formats modified for renamed fields
2014-05-13 16:12:37 +05:30
Nabin Hait
b3bead2f06
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-12 17:46:02 +05:30
Nabin Hait
827480fd2b
import, export and report permission in account and pricing rule
2014-05-12 17:45:37 +05:30
Rushabh Mehta
2fdb51f85e
fixes frappe/erpnext#1627
2014-05-12 17:32:36 +05:30
Nabin Hait
2f50b85f99
Test case fixes for serial no
2014-05-11 13:03:53 +05:30
Nabin Hait
0ff6e3a6bb
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-11 12:11:50 +05:30
Nabin Hait
75e50ee082
Fixes for subcontracting
2014-05-11 12:11:15 +05:30
Nabin Hait
6d5c248402
Test case fixes for serial no
2014-05-11 12:10:57 +05:30
Anand Doshi
78e9c6ef70
Deprecate Select fields with options as link:
2014-05-09 13:36:13 +05:30
Nabin Hait
d64a952b5d
Stock reco: item and warehouse validation and translation fixes
2014-05-09 11:50:24 +05:30
Nabin Hait
344f4436f1
Create / update raw materials supplied table for sub-contracting
2014-05-08 19:08:20 +05:30
Nabin Hait
5d070753fd
Item managed batch-wise, can not be reconciled through stock reconciliation
2014-05-08 19:08:06 +05:30
Nabin Hait
227db769a0
Item valuation rate on material transfer based on fifo
2014-05-08 19:06:01 +05:30
Anand Doshi
0c85169539
Fixed clear cache for item page
2014-05-08 17:46:00 +05:30
Anand Doshi
f410bd9bf9
Better default permissions, ignore_restrictions for defaults, removed field trash_reason
...
Additions:
Account --> Material User: Read
Cost Center --> Sales User, Purchase User: Read
Mode of Payment --> Accounts User: Read
Supplier --> Material User, Accounts User: Read
Employee --> Employee: Restricted Read
Leave Type --> Employee: Read
Production Order --> Material User: Read
Sales Order --> Material User: Read
Print Heading --> All: Read
Terms and Conditions --> Purchase User, Material User: Read
Territory --> Material User, Maintenance User: Read
Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
Price List --> Manufacturing User: Read
Purchase Receipt --> Accounts User: Read
Warehouse --> Manufacturing User: Read
2014-05-07 17:20:42 +05:30
Anand Doshi
8c2dbab878
Changed default naming series options
...
C-Form: C-FORM-.#####
Purchase Invoice: PINV-.#####
Sales Invoice: SINV-.#####
Purchase Order: PO-.#####
Quality Inspection: QI-.#####
Supplier: SUPP-.#####
Supplier Quotation: SQTN-.#####
Attendance: ATT-.#####
Production Order: PRO-.#####
Installation Note: IN-.#####
Lead: LEAD-.#####
Opportunity: OPTY-.#####
Quotation: QTN-.#####
Sales Order: SO-.#####
Delivery Note: DN-.#####
Item: ITEM-.#####
Material Request: MREQ-.#####
Packing Slip: PS-.#####
Purchase Receipt: PREC-.#####
Stock Entry: STE-.#####
Customer Issue: CI-.#####
Support Ticket: SUP-.#####
Customer: CUST-.#####
Journal Voucher: JV-.#####
2014-05-06 19:43:11 +05:30
Anand Doshi
37909b292f
Remove India specific fields
2014-05-06 16:15:56 +05:30
Nabin Hait
cea4cd4e5f
Pull stock entry difference account from company
2014-05-06 11:57:33 +05:30
Nabin Hait
98c2a052e5
Fixes in pricing rule testcases #565
2014-05-05 18:41:41 +05:30
Nabin Hait
f2db87a766
Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565
2014-05-05 15:04:55 +05:30
Nabin Hait
53dab55703
Pricing Rule: if multiple rules, ask to resolve conflict #565
2014-05-05 14:49:40 +05:30
Nabin Hait
f57f0a661a
Stock Entry: pulling items from BOM fixed #1579
2014-05-05 10:27:53 +05:30
Anand Doshi
4ab5382d3f
Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564
2014-05-04 11:50:10 +05:30
Nabin Hait
296d626e53
Back flush issue fixed in sub contracting #1567
2014-05-02 17:36:13 +05:30
Nabin Hait
1e6c32e95f
Address and contact creation from opportunity #1570
2014-05-02 11:42:24 +05:30
Nabin Hait
d341254786
Purchase receipt to purchase invoice item
2014-05-01 17:42:21 +05:30
Anand Doshi
d9f0f27cd4
Fixes in test cases
2014-04-30 22:16:25 +05:30
Rushabh Mehta
a15164750d
started client side testing using selenium and other related and unrelated fixes
2014-04-30 19:39:13 +05:30
Nabin Hait
6777efa7fa
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-28 17:09:13 +05:30
Nabin Hait
2594e41462
Removed Stock Ledger doctype
2014-04-28 16:23:45 +05:30
Anand Doshi
6916baa299
BugFix: Item search in Stock UOM Replace Utility
2014-04-28 15:33:34 +05:30
Rushabh Mehta
41d126586e
fix get_server_fields in stock_entry.js
2014-04-27 12:30:20 +05:30
Anand Doshi
8e5b2af0fb
Set conversion_factor in stock entry test case
2014-04-25 19:35:06 +05:30
Anand Doshi
fc79efb97c
Fixes #1532 . Only show an error message for missing Quality Inspection but let the user submit Purchase Receipt.
2014-04-25 18:44:28 +05:30
Anand Doshi
bbffaf78fb
BugFix: use transfer_qty instead of actual_qty in check_duplicate_entry_for_production_order - ported webnotes/erpnext@942ff2583b
2014-04-25 18:31:09 +05:30
Anand Doshi
8bde7f9b3a
Conditionally toggle Naming Series. Fixes #1526
2014-04-24 18:11:49 +05:30
Anand Doshi
b054eb7a4f
Call calculate_taxes_and_totals after mapping
2014-04-22 20:35:22 +05:30
Anand Doshi
68d0b7c7ff
get_item_details fixed for Material Request
2014-04-22 19:30:53 +05:30
Anand Doshi
07339fc69e
Fixes in Setup Wizard and Attachments
2014-04-22 15:30:24 +05:30
Anand Doshi
0549b1c5c9
Duplicate supplier delivery number validation in Purchase Receipt should happen per financial year
2014-04-21 15:59:47 +05:30
Anand Doshi
21ae930b4c
Removed controller.py
2014-04-21 15:12:50 +05:30
Anand Doshi
424c033395
Removed controller.py
2014-04-21 15:06:56 +05:30
Anand Doshi
5d591ebe83
Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext
2014-04-18 16:20:07 +05:30
Rushabh Mehta
169c1fd93b
fixed translation for setup-wizard and removed purchase validation for Material Request #925
2014-04-18 10:40:17 +05:30
Anand Doshi
ac32bad25a
Fixes in Taxes, Quotation and Address Territory
2014-04-18 01:32:02 +05:30
Anand Doshi
dbfcd328fb
Fixes update_after_submit validation errors
2014-04-17 12:35:04 +05:30
Anand Doshi
0d345c9152
Fixes Item Price duplicate entry validation
2014-04-17 11:40:22 +05:30
Anand Doshi
094610d7ce
Fixes in Production, Stock Entry and Stock Controller
2014-04-16 20:23:24 +05:30
Rushabh Mehta
052fe82688
production order: test fixed and added in test_stock_entry.py
2014-04-16 19:20:11 +05:30
Rushabh Mehta
c38fc713c6
updated translations
2014-04-16 17:46:30 +05:30
Anand Doshi
652bc0784a
Ported v3 fixes to v4
...
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
2014-04-16 15:26:42 +05:30
Nabin Hait
6298536e46
set stock balance as per serial no count
...
Cherry Picked and Modified by @anandpdoshi
Conflicts:
stock/doctype/stock_ledger/stock_ledger.py
utilities/repost_stock.py
2014-04-16 15:23:08 +05:30
Rushabh Mehta
d85dc868ca
more message fixes for translation
2014-04-15 22:54:34 +05:30
Rushabh Mehta
ff93802d58
more message fixes
2014-04-15 18:40:31 +05:30