Nabin Hait
|
edc58619d1
|
Merge pull request #1211 from nabinhait/hotfix
fixes in item validation
|
2013-12-18 21:28:25 -08:00 |
|
Nabin Hait
|
85800fa929
|
fixes in item validation
|
2013-12-19 10:57:43 +05:30 |
|
Nabin Hait
|
90e0700e24
|
Merge pull request #1208 from nabinhait/hotfix
fixes in stock projected qty report
|
2013-12-18 05:46:03 -08:00 |
|
Nabin Hait
|
48156e3d8b
|
fixes in stock projected qty report
|
2013-12-18 18:51:20 +05:30 |
|
Nabin Hait
|
8b353e5e15
|
Merge pull request #1207 from nabinhait/hotfix
Removed sales_order_no from no_copy in material request item
|
2013-12-18 01:24:02 -08:00 |
|
Nabin Hait
|
fcbd4d7638
|
Removed sales_order_no from no_copy in material request item
|
2013-12-18 14:53:36 +05:30 |
|
Nabin Hait
|
64367a905a
|
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
|
2013-12-18 10:42:04 +05:30 |
|
Nabin Hait
|
c565de2c12
|
Removed schedule_date from no_copy in purchase receipt item
|
2013-12-18 10:41:29 +05:30 |
|
Nabin Hait
|
a4080eb840
|
[fix] [minor] item validation
|
2013-12-17 17:45:50 +05:30 |
|
Nabin Hait
|
8b7da55617
|
Merge branch 'develop' of github.com:webnotes/erpnext into reports
|
2013-12-17 16:10:06 +05:30 |
|
Nabin Hait
|
57e89ff6f1
|
[reports] general ledger: grid report to script report
|
2013-12-17 16:09:21 +05:30 |
|
Akhilesh Darjee
|
9ee20e8f5a
|
[fix] [minor] material request sales order wise through production planning tool
|
2013-12-17 13:07:00 +05:30 |
|
Akhilesh Darjee
|
dbb69dacff
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-12-16 19:33:20 +05:30 |
|
Akhilesh Darjee
|
9ff9dafd00
|
[feature] create material request sales order wise from production planning tool
|
2013-12-16 19:32:22 +05:30 |
|
Nabin Hait
|
ea4f66791e
|
Merge branch 'develop' of github.com:webnotes/erpnext into reports
|
2013-12-16 15:18:34 +05:30 |
|
Nabin Hait
|
1d361cf26c
|
[minor] merge conflict
|
2013-12-14 17:36:22 +05:30 |
|
Nabin Hait
|
45a35ced33
|
[fix] [minor] match condition fixes for customer and supplier
|
2013-12-14 17:29:42 +05:30 |
|
Nabin Hait
|
5534b59d07
|
Merge pull request #1180 from nabinhait/hotfix
[fix] [minor] fixes in packed item
|
2013-12-12 22:11:22 -08:00 |
|
Nabin Hait
|
1251a93fc5
|
[fix] [minor] fixes in packed item
|
2013-12-13 11:40:16 +05:30 |
|
Nabin Hait
|
2e66a842bb
|
Merge pull request #1170 from akhileshdarjee/master
[fix] [minor] rename fix for customer and supplier
|
2013-12-11 23:29:18 -08:00 |
|
Nabin Hait
|
ffa938a3fb
|
Merge pull request #1174 from nabinhait/hotfix
[fix] [minor] convert serial no to upper case for comparing
|
2013-12-11 22:28:50 -08:00 |
|
Nabin Hait
|
9d835a039a
|
[fix] [minor] convert serial no to upper case for comparing
|
2013-12-12 11:56:56 +05:30 |
|
Akhilesh Darjee
|
aebb9f422b
|
[fix] [minor] merge conflict fixes
|
2013-12-10 18:01:18 +05:30 |
|
Akhilesh Darjee
|
5ce1b8b8f9
|
[fix] [minor] customer name visibility fixed in sales invoice
|
2013-12-09 16:29:04 +05:30 |
|
Akhilesh Darjee
|
a652347bd1
|
[fix] [minor] customer_name not visible in sales invoice
|
2013-12-09 15:52:47 +05:30 |
|
Akhilesh Darjee
|
d9255abd46
|
[fix] [minor] set send_print_in_body_and_attachment in email settings
|
2013-12-06 18:49:48 +05:30 |
|
Nabin Hait
|
86da17d5d9
|
[minor] removed mandatory validation in server side
|
2013-12-06 13:23:31 +05:30 |
|
Nabin Hait
|
ce2dfadfbd
|
Merge branch 'develop' of github.com:webnotes/erpnext into reports
|
2013-12-06 12:10:37 +05:30 |
|
Nabin Hait
|
c8c13b90ce
|
[report] stock ledger loading time
|
2013-12-05 16:08:30 +05:30 |
|
Nabin Hait
|
01d2811ccd
|
[report] migrated stock level report to script report and renamed to Stock Projected Qty
|
2013-12-04 19:16:50 +05:30 |
|
Nabin Hait
|
690c75fa0d
|
[report] migrated stock level report to script report and renamed to Stock Projected Qty
|
2013-12-04 19:16:32 +05:30 |
|
Nabin Hait
|
462401c4df
|
[minor] fixed conflict
|
2013-12-04 17:26:22 +05:30 |
|
Nabin Hait
|
281a2d2bd1
|
[fix] [minor] fetch items from bom while repacking
|
2013-12-04 17:04:58 +05:30 |
|
Nabin Hait
|
47e40242bd
|
[minor] removed old stock ageing grid report
|
2013-12-02 23:13:36 +05:30 |
|
Nabin Hait
|
7eb90d3d5c
|
Stock Ageing report migated to Script report
|
2013-12-02 20:12:18 +05:30 |
|
Anand Doshi
|
56a3165ac8
|
[minor] stock ledger report as script report
Issue #1121
|
2013-12-02 12:49:02 +05:30 |
|
Nabin Hait
|
aab81bb8c5
|
Merge pull request #1119 from akhileshdarjee/supplier-report
[report] item-wise consumption in buying module
|
2013-11-29 03:54:38 -08:00 |
|
Akhilesh Darjee
|
be948b8b40
|
[fix] [minor] supplier wise sales analytics report totals added
|
2013-11-29 16:37:07 +05:30 |
|
Akhilesh Darjee
|
b1269b4a07
|
[report] item-wise consumption renamed to supplier-wise sales analytics
|
2013-11-29 16:08:26 +05:30 |
|
Akhilesh Darjee
|
4fb848d3c4
|
[report] item-wise consumption in buying module
|
2013-11-29 15:15:34 +05:30 |
|
Anand Doshi
|
da07ed0ae8
|
[minor] demo and item
|
2013-11-29 14:53:56 +05:30 |
|
Nabin Hait
|
b3036042da
|
[fix] [minor] serial no fix for status update
|
2013-11-27 18:22:54 +05:30 |
|
Nabin Hait
|
752bdbacaf
|
Merge branch '1310' of github.com:webnotes/erpnext
|
2013-11-27 17:31:04 +05:30 |
|
Nabin Hait
|
a8386c1283
|
[fix] [minor] serial no fix for status update
|
2013-11-27 17:28:27 +05:30 |
|
Nabin Hait
|
a353618ffe
|
[fix] [minor] fixed merging issue
|
2013-11-27 11:24:08 +05:30 |
|
Nabin Hait
|
e3eafd94ff
|
Merge pull request #1100 from akhileshdarjee/master
[fix] [minor] patch for fixing report columns in defaults
|
2013-11-26 21:26:08 -08:00 |
|
Anand Doshi
|
e229c2c667
|
[minor] [patch] p01_cleanup
|
2013-11-26 23:13:05 +05:30 |
|
Akhilesh Darjee
|
63dc45536d
|
[fix] [minor] delivery note print hide fixed
|
2013-11-26 18:33:28 +05:30 |
|
Nabin Hait
|
5033ef03cf
|
[fix] [minor] merge conflict
|
2013-11-26 16:04:53 +05:30 |
|
Nabin Hait
|
ac9bcf714d
|
Merge pull request #1097 from akhileshdarjee/master
[fix] fiscal year fix in setup wizard
|
2013-11-26 01:57:17 -08:00 |
|
Nabin Hait
|
131939a742
|
[fix] [minor] rename and merge for customer and supplier
|
2013-11-26 15:03:51 +05:30 |
|
Akhilesh Darjee
|
b0a1b3ab47
|
[fix] [minor] test cases fixes
|
2013-11-26 14:45:27 +05:30 |
|
Nabin Hait
|
9f51ee4a84
|
[fix] [minor] serial no status update fix
|
2013-11-24 16:03:40 +05:30 |
|
Nabin Hait
|
4ccb2edbfd
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-11-22 18:10:46 +05:30 |
|
Nabin Hait
|
451b01cfe4
|
[fix] [minor] print hide for purchase net and grand total
|
2013-11-22 17:17:35 +05:30 |
|
Nabin Hait
|
1b8c444a20
|
[cleanup] [minor] update serial no status, sales and purchase info
|
2013-11-21 23:18:29 +05:30 |
|
Anand Doshi
|
0c8fd3408c
|
[minor] [website] fix in container
|
2013-11-21 14:58:59 +05:30 |
|
Nabin Hait
|
8eb0c61649
|
[minor] merge conflict fixed
|
2013-11-21 12:28:50 +05:30 |
|
Nabin Hait
|
e5a1a84d8d
|
Merge pull request #1078 from akhileshdarjee/1310
[fix] [minor] send sms fixed for purchase module
|
2013-11-20 22:27:18 -08:00 |
|
Akhilesh Darjee
|
0ec4bdfcb8
|
[fix] [minor] send sms fixed for purchase module
|
2013-11-21 11:55:54 +05:30 |
|
Nabin Hait
|
458b30b5d3
|
Merge branch '1310' of github.com:webnotes/erpnext into 1310
|
2013-11-20 13:51:16 +05:30 |
|
Akhilesh Darjee
|
20f93546eb
|
[fix] [minor] all variance related reports fixed
|
2013-11-20 13:25:04 +05:30 |
|
Nabin Hait
|
46220f9fab
|
Merge branch '1310' of github.com:webnotes/erpnext into 1310
|
2013-11-20 13:14:39 +05:30 |
|
Nabin Hait
|
ca471f41a1
|
[fix] Rename and merge rewrite
|
2013-11-20 13:14:12 +05:30 |
|
Rushabh Mehta
|
ad45e31356
|
[copyright] added Contributors
|
2013-11-20 13:00:28 +05:30 |
|
Rushabh Mehta
|
ebdddf3fb6
|
[website] [sitemap] cleanup
|
2013-11-19 14:20:52 +05:30 |
|
Akhilesh Darjee
|
5a1a22e907
|
[fix] [minor] product search to search on textbox keypress
|
2013-11-19 12:26:46 +05:30 |
|
Akhilesh Darjee
|
510a73a0de
|
[fix] [minor] product search box fixed
|
2013-11-18 15:29:36 +05:30 |
|
Rushabh Mehta
|
04cc5155f7
|
Added Notification Control for caching notifications probably causing the freezing problem
|
2013-11-18 13:23:20 +05:30 |
|
Akhilesh Darjee
|
6ca0548231
|
[fix] [minor] stock related reports fixed for serialized item
|
2013-11-18 12:16:48 +05:30 |
|
Anand Doshi
|
0c26f8116d
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
accounts/doctype/account/account.py
controllers/accounts_controller.py
patches/patch_list.py
selling/doctype/sales_common/sales_common.py
stock/doctype/purchase_receipt/purchase_receipt.py
|
2013-11-15 19:12:09 +05:30 |
|
Nabin Hait
|
e505fbea54
|
[fix] [minor] stock balance report for serialized item
|
2013-11-15 13:38:23 +05:30 |
|
Nabin Hait
|
e83069cb32
|
[fix] update future gl entries for stock
|
2013-11-14 18:40:08 +05:30 |
|
Anand Doshi
|
89844f803d
|
[minor] check permission for editable web page
|
2013-11-13 17:34:21 +05:30 |
|
Anand Doshi
|
4a67d36735
|
[minor] removed remark field from auto material request
|
2013-11-13 17:34:21 +05:30 |
|
Rushabh Mehta
|
4f642e7670
|
[cleanup] Fixed title bars, toolbars in all pages, added default background
|
2013-11-13 16:58:18 +05:30 |
|
Rushabh Mehta
|
515636f24c
|
Merge branch 'master' of github.com:webnotes/erpnext into cleanup
|
2013-11-08 16:28:12 +05:30 |
|
Rushabh Mehta
|
7d8b189c8f
|
[cleanup] UI Fixes
|
2013-11-08 16:27:18 +05:30 |
|
Anand Doshi
|
ed1679a1c5
|
Merge branch '1310' of github.com:webnotes/erpnext
|
2013-11-07 20:49:13 +05:30 |
|
Akhilesh Darjee
|
e3af1eaf47
|
[fix] fixed landed cost wizard for cancel_pr()
|
2013-11-06 16:59:38 +05:30 |
|
Rushabh Mehta
|
a063b4d50e
|
[cleanup] UI Fixes, minor
|
2013-11-06 11:29:47 +05:30 |
|
Anand Doshi
|
b03f870441
|
Merge branch '1310' of github.com:webnotes/erpnext
|
2013-11-04 15:22:50 +05:30 |
|
Anand Doshi
|
3673a25176
|
[minor] fixes after item price move
|
2013-11-04 15:14:57 +05:30 |
|
Anand Doshi
|
2ced381976
|
[minor] fixes in test cases and demo
|
2013-11-04 14:37:29 +05:30 |
|
Anand Doshi
|
daaa14c079
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
setup/doctype/setup_control/setup_control.py
stock/doctype/stock_entry/stock_entry.py
utilities/demo/demo_docs/Price_List.csv
|
2013-11-04 13:14:39 +05:30 |
|
Rushabh Mehta
|
f7b203de2d
|
[cleanup] UI Fixes
|
2013-11-03 20:37:49 +05:30 |
|
Rushabh Mehta
|
ef5845589d
|
[cleanup] [minor] finishing styles, labels, descriptions
|
2013-11-02 14:47:11 +05:30 |
|
Akhilesh Darjee
|
e158cea77a
|
[cleanup] [minor] replaced for territory to applicable territory
|
2013-10-31 19:50:51 +05:30 |
|
Rushabh Mehta
|
bed14d7fa4
|
Merge branch 'master' of github.com:webnotes/erpnext into cleanup
|
2013-10-31 15:16:05 +05:30 |
|
Akhilesh Darjee
|
0b39e95011
|
[cleanup] moved for territory, price list and item price doctype from setup to stock
|
2013-10-31 12:35:52 +05:30 |
|
Anand Doshi
|
fec52b5a8f
|
[minor] fixed stock entry and demo
|
2013-10-28 19:59:45 +05:30 |
|
Nabin Hait
|
a5bd3dd207
|
[fix] [minor] update finished goods against production order
|
2013-10-28 19:59:43 +05:30 |
|
Rushabh Mehta
|
069672e197
|
[minor] cleanup start
|
2013-10-28 18:21:07 +05:30 |
|
Nabin Hait
|
bd071b9543
|
[fix] [minor] update finished goods against production order
|
2013-10-25 15:39:17 +05:30 |
|
Pratik Vyas
|
297041ed3e
|
Merge remote-tracking branch 'upstream/wsgi' into HEAD
Conflicts:
public/js/complete_setup.js
setup/doctype/setup_control/setup_control.py
|
2013-10-25 14:07:48 +05:30 |
|
Nabin Hait
|
3898777c9f
|
[minor] validation message in serial no
|
2013-10-24 17:36:02 +05:30 |
|
Nabin Hait
|
ca8ad210d2
|
Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n
|
2013-10-24 11:40:32 +05:30 |
|
Nabin Hait
|
3eb901f47d
|
[merge] merged with master
|
2013-10-24 11:21:11 +05:30 |
|
Akhilesh Darjee
|
97e55710da
|
[fix] [minor] get_items function fix
|
2013-10-23 15:22:22 +05:30 |
|
Akhilesh Darjee
|
2cdeb3bb7a
|
[fix] [minor] if difference account blank then fetch from company
|
2013-10-23 14:46:07 +05:30 |
|