Nabin Hait
|
df01b5770b
|
Merge branch 'master' into develop
|
2016-11-01 17:44:43 +05:30 |
|
Nabin Hait
|
06fe0c7c9d
|
Merge pull request #6790 from neilLasrado/hotfix
Hotfixes for demo
|
2016-11-01 17:40:03 +05:30 |
|
Nabin Hait
|
dec9f2558e
|
Update purchase_receipt.py
|
2016-11-01 17:24:46 +05:30 |
|
Neil Trini Lasrado
|
9dde085144
|
Fixes to demo
|
2016-11-01 17:05:43 +05:30 |
|
Rohit Waghchaure
|
60e5e4ac2d
|
change fieldtype from float to currency
|
2016-11-01 16:32:33 +05:30 |
|
Saurabh
|
0cf7f7aee0
|
[fix] set default value as empty frappe dict
|
2016-11-01 16:19:33 +05:30 |
|
Nabin Hait
|
f4068fd6f1
|
Fixed merge conflict
|
2016-11-01 15:06:55 +05:30 |
|
Nabin Hait
|
b9f708663c
|
Update item.py
|
2016-10-31 16:52:17 +05:30 |
|
Kanchan Chauhan
|
9100322462
|
[Fix] Serial No report fixed for Creation No link
|
2016-10-31 16:01:09 +05:30 |
|
Nabin Hait
|
d08ced14ca
|
Merge pull request #6751 from neilLasrado/develop
Fixes to demo
|
2016-10-31 13:15:36 +05:30 |
|
Nabin Hait
|
eb1a55bbba
|
Update purchase_receipt.py
|
2016-10-29 14:49:33 +05:30 |
|
Nabin Hait
|
952c9cccfc
|
Merge pull request #6734 from KanchanChauhan/default-warehouse-in-item
Default warehouse in Item master
|
2016-10-29 14:44:19 +05:30 |
|
Neil Trini Lasrado
|
71e3746a05
|
Fixes to demo
|
2016-10-28 18:59:33 +05:30 |
|
Kanchan Chauhan
|
4c22825f01
|
Default warehouse in Item master
|
2016-10-27 23:56:04 +05:30 |
|
Saurabh
|
468e41f24f
|
[enhance] introduce ignore_fields param for _tree and get_query
|
2016-10-27 15:23:19 +05:30 |
|
Nabin Hait
|
7f19a24e5e
|
Merge pull request #6705 from KanchanChauhan/get-serial-no
Fetch serial no by default
|
2016-10-26 16:31:11 +05:30 |
|
Kanchan Chauhan
|
0a3f2c818a
|
Fetch serial no by default
|
2016-10-26 14:59:43 +05:30 |
|
Saurabh
|
8c3764a6ef
|
test case for scrap item
|
2016-10-24 13:55:36 +05:30 |
|
Saurabh
|
4ae4eb0eb9
|
added get_scrap_items param to get_bom_items_as_dict
|
2016-10-24 13:55:36 +05:30 |
|
Saurabh
|
5a2fa8aac7
|
[enhance] scrap management
|
2016-10-24 13:55:36 +05:30 |
|
Kanchan Chauhan
|
55106ab66b
|
Warehouse based on selected Company
|
2016-10-22 21:42:28 +05:30 |
|
Rohit Waghchaure
|
69be01aa1b
|
[Stock Entry] Show total amount for purpose Material Issue/Receipt/Transfer
|
2016-10-20 16:38:30 +05:30 |
|
Nabin Hait
|
0702fa2fc6
|
Fixed version conflict
|
2016-10-19 16:49:36 +05:30 |
|
Rohit Waghchaure
|
ac9172f6df
|
[Fix] total projected qty
|
2016-10-19 15:06:30 +05:30 |
|
Nabin Hait
|
fa1cdd5bf0
|
Fixed merge conflict
|
2016-10-18 15:37:33 +05:30 |
|
Rushabh Mehta
|
17f6874450
|
[minor] [fix] doctype_dasboard.py files, move data to get_data
|
2016-10-18 14:54:39 +05:30 |
|
KanchanChauhan
|
9cb69ca0e3
|
Posting Date cannot be future date (#6628)
|
2016-10-17 16:40:16 +05:30 |
|
Saurabh
|
048ee48475
|
[fix] #6573 Material Request Required Date auto set (#6627)
|
2016-10-17 16:24:20 +05:30 |
|
Nabin Hait
|
cd9c45f816
|
Fixed merge conflict
|
2016-10-07 16:53:07 +05:30 |
|
Rohit Waghchaure
|
022d87969d
|
[Fix] Issue in merging duplicate item
|
2016-10-07 13:40:45 +05:30 |
|
Saurabh
|
a2a25abfa5
|
[fix] warehouse account rename fix #6526
|
2016-10-06 18:20:53 +05:30 |
|
Nabin Hait
|
8db8a91d2e
|
Minor fixes
|
2016-10-05 13:11:19 +05:30 |
|
Kanchan Chauhan
|
f6f8ec68ad
|
Total and difference added for amount and qty
|
2016-10-05 13:11:19 +05:30 |
|
Nabin Hait
|
efa68fb6b8
|
Fixed version conflict
|
2016-10-04 17:27:02 +05:30 |
|
Nabin Hait
|
80de91776d
|
Merge pull request #6539 from rohitwaghchaure/stock_entry_grid_issue
[Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record
|
2016-10-04 16:20:47 +05:30 |
|
Nabin Hait
|
cf87027422
|
Merge pull request #6537 from rohitwaghchaure/pos_multi_company_issue
[Fix] Multi company issue for POS
|
2016-10-04 16:20:24 +05:30 |
|
Rohit Waghchaure
|
661db8ba71
|
[Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record
|
2016-10-04 14:46:34 +05:30 |
|
Rohit Waghchaure
|
6f1d012b65
|
[Fix] Multi company issue for POS
|
2016-10-04 12:18:59 +05:30 |
|
Nabin Hait
|
5fd5a77750
|
Fixed version conflict
|
2016-10-03 14:13:50 +05:30 |
|
Rohit Waghchaure
|
74bf022273
|
[Fix] Purchase receipt title issue
|
2016-09-30 18:35:48 +05:30 |
|
Nabin Hait
|
80499bb657
|
Fixed merge conflict
|
2016-09-29 14:18:53 +05:30 |
|
Nabin Hait
|
b3bc41131e
|
Reposting of GLE and SLE for all stock transactions
|
2016-09-28 18:17:52 +05:30 |
|
Nabin Hait
|
443ac7bf30
|
Test case fix
|
2016-09-28 16:54:23 +05:30 |
|
Nabin Hait
|
706612bcd4
|
Fixed version conflict
|
2016-09-26 18:11:56 +05:30 |
|
Rohit Waghchaure
|
d728f5a429
|
[Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288
|
2016-09-23 18:06:24 +05:30 |
|
Nabin Hait
|
6b4eb7f77f
|
Fixed version conflict
|
2016-09-23 12:16:31 +05:30 |
|
Nabin Hait
|
d03087d3ab
|
Patch fixed for legacy migration
|
2016-09-23 11:08:02 +05:30 |
|
Nabin Hait
|
0be6073f10
|
Fixed version conflict
|
2016-09-21 13:06:19 +05:30 |
|
Nabin Hait
|
a36325c6e5
|
Merge pull request #6403 from saurabh6790/treeview_quick_entry_fix
[fix] minor fix to accomodate custom fields in tree popup
|
2016-09-20 18:06:49 +05:30 |
|
Nabin Hait
|
429a38f90b
|
Merge pull request #6415 from rmehta/hotfix
[minor] bring back old grid style in material request
|
2016-09-20 18:05:32 +05:30 |
|
Rushabh Mehta
|
57a1905576
|
[minor] bring back old grid style in material request
|
2016-09-20 17:22:54 +05:30 |
|
Nabin Hait
|
902bcc07b5
|
Merge pull request #6401 from rmehta/fix-lead-link
[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051
|
2016-09-19 19:22:34 +05:30 |
|
Saurabh
|
9aacf46c51
|
[fix] minor fix to accomodate custom fields in tree popup
|
2016-09-19 16:45:35 +05:30 |
|
Rushabh Mehta
|
5a58d8a11e
|
[minor] production order link in material request, fixes #6197
|
2016-09-19 15:33:46 +05:30 |
|
Chude Osiegbu
|
1f64f9897c
|
Additional corrections for cases where get_exchange_rate was not called with the correct number of arguments.
|
2016-09-19 01:34:49 +01:00 |
|
Kanchan Chauhan
|
d1d129edf0
|
Actual Qty added to Material Request Item
|
2016-09-19 00:22:37 +05:30 |
|
Rushabh Mehta
|
39b5d39df6
|
[fix] remove campaign depends on
|
2016-09-16 15:55:34 +05:30 |
|
Rushabh Mehta
|
59dc0ece9f
|
[enhance] added Lead Source master, fixes #6231
|
2016-09-16 11:44:49 +05:30 |
|
Nabin Hait
|
d5ebd79ad7
|
Fixed version conflict
|
2016-09-14 15:50:22 +05:30 |
|
Nabin Hait
|
cd23530d24
|
Merge pull request #6324 from RobertSchouten/patch-24
stock entries from production_order dont fetch serial number of project
|
2016-09-12 18:35:13 +05:30 |
|
Nabin Hait
|
6c08f5caf9
|
Update stock_entry.py
|
2016-09-12 18:34:46 +05:30 |
|
Nabin Hait
|
0a7c0f4418
|
Merge pull request #6338 from RobertSchouten/report_names
add customer and supplier names to some reports
|
2016-09-12 17:36:46 +05:30 |
|
pawan
|
af111e9c43
|
[fix] #6195
|
2016-09-12 15:16:23 +05:30 |
|
Nabin Hait
|
a36a88b6de
|
Remove Difference Account field from Stock Entry parent form
|
2016-09-12 13:15:59 +05:30 |
|
Nabin Hait
|
294664b24c
|
Merge pull request #6267 from PawanMeh/fixes_6254
[fix] #6254
|
2016-09-12 13:03:14 +05:30 |
|
Nabin Hait
|
9c82dd9157
|
Merge pull request #6332 from rmehta/item-group-paging
[fix] paging for item group
|
2016-09-12 13:01:54 +05:30 |
|
robert schouten
|
4fc70d962b
|
add customer and supplier names to some reports
|
2016-09-12 15:23:51 +08:00 |
|
Rushabh Mehta
|
3aa315040f
|
[fix] paging for item group
|
2016-09-11 16:48:24 +05:30 |
|
RobertSchouten
|
b64fc33be1
|
stock entries from production_order dont fetch serial number of project
|
2016-09-09 11:08:39 +08:00 |
|
pawan
|
7b2bd20a09
|
[fix] #6254
|
2016-09-06 18:28:41 +05:30 |
|
Kanchan Chauhan
|
366ba04823
|
Barcode added to Stock Reconciliation
|
2016-09-06 12:44:57 +05:30 |
|
Rohit Waghchaure
|
cc1c7ad2df
|
added test cases
|
2016-09-05 00:43:17 +05:30 |
|
pawan
|
bd9a275d5f
|
[fix] #6254
|
2016-09-02 16:51:22 +05:30 |
|
Nabin Hait
|
15b26d8b1a
|
Fixed merge conflicts
|
2016-09-02 14:29:57 +05:30 |
|
Saurabh
|
ff910f4c72
|
[fixes] set filter for warehouse
|
2016-09-02 13:39:05 +05:30 |
|
RobertSchouten
|
ba4456b42b
|
dont run duplicate set status on submit
|
2016-08-30 08:21:20 +08:00 |
|
Kanchan Chauhan
|
dd96cbd012
|
Coded column deleted, column added from UI
|
2016-08-26 14:32:38 +05:30 |
|
Nabin Hait
|
3b6dc141c6
|
[fix] Repost only distinct purchase receipts and invoices
|
2016-08-19 16:39:50 +05:30 |
|
Nabin Hait
|
e68b089187
|
Query for warehouse in delivery note
|
2016-08-18 16:14:23 +05:30 |
|
Nabin Hait
|
40c60b6182
|
Default material request type field restored
|
2016-08-17 16:14:24 +05:30 |
|
Rushabh Mehta
|
d973c1606a
|
[revert] is_sales_item, is_purchase_item back
|
2016-08-16 11:32:08 +05:30 |
|
Rushabh Mehta
|
730f3e7aba
|
[minor] remove validation #4904
|
2016-08-11 17:17:26 +05:30 |
|
Nabin Hait
|
764e6ef210
|
default material request type field restored in item
|
2016-08-03 17:32:26 +05:30 |
|
Rushabh Mehta
|
06c92a782a
|
[fix] small text for route
|
2016-08-03 16:27:11 +05:30 |
|
Rohit Waghchaure
|
08aadb853c
|
PPT looks at default MR type in Item to set MR type.
|
2016-08-02 16:59:03 +05:30 |
|
Rushabh Mehta
|
180e43585f
|
[minor] formatter for item and employee
|
2016-07-29 18:52:00 +05:30 |
|
Nabin Hait
|
7590b8fff1
|
minor fix for stock ledger entry
|
2016-07-27 16:44:26 +05:30 |
|
Saurabh
|
3642f987c7
|
[fix] report filter fix
|
2016-07-27 11:42:50 +05:30 |
|
Rushabh Mehta
|
6c3ac9587e
|
[fix] quick entry
|
2016-07-25 15:03:39 +05:30 |
|
Rushabh Mehta
|
29517d0b8c
|
[fix] purchase order dashboard
|
2016-07-22 21:01:39 +05:30 |
|
Nabin Hait
|
db4aca3eaf
|
Merge pull request #5823 from nabinhait/fix_107
Update opening stock on creation if item, only if it is non-serialized and does maintain batch
|
2016-07-22 13:17:26 +05:30 |
|
Nabin Hait
|
0953aeb731
|
Merge branch 'master' into develop
|
2016-07-22 13:15:53 +05:30 |
|
Nabin Hait
|
767cf99435
|
Update opening stock on creation if item, only if it is non-serialized and does maintain batch
|
2016-07-21 18:46:09 +05:30 |
|
Rohit Waghchaure
|
47c64ec728
|
[Fix] Stock entry differnce amount issue.
|
2016-07-21 12:24:12 +05:30 |
|
Nabin Hait
|
89d0b1b9a5
|
Merge pull request #5804 from nabinhait/demo1
Demo data for fixed asset depreciation
|
2016-07-21 10:05:00 +05:30 |
|
Rushabh Mehta
|
5a39d41a0c
|
[redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792
|
2016-07-20 22:53:23 +05:30 |
|
Nabin Hait
|
3edefb19b9
|
Demo data for fixed asset depreciation
|
2016-07-20 16:14:30 +05:30 |
|
Rushabh Mehta
|
649e2538e5
|
[fix] merge conflict?
|
2016-07-20 15:30:17 +05:30 |
|
Nabin Hait
|
9d93ad92bc
|
minor fixes
|
2016-07-20 11:28:50 +05:30 |
|
Rushabh Mehta
|
636acc2565
|
[minor] run stock reco in background if more than 100 items, fixes #4904
|
2016-07-19 17:14:48 +05:30 |
|