Nabin Hait
|
139aa71666
|
Fixed conflict while merging with master
|
2013-12-31 16:09:22 +05:30 |
|
Akhilesh Darjee
|
829eda47a8
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount
|
2013-12-30 12:31:07 +05:30 |
|
Anand Doshi
|
0663ec4a9c
|
Merge fixes: removed patches, removed Warehouse User
|
2013-12-27 18:00:28 +05:30 |
|
Akhilesh Darjee
|
d203aea7c2
|
[flat discount] flat discount implemented on sales cycle
|
2013-12-27 17:49:57 +05:30 |
|
Anand Doshi
|
8e332ffd16
|
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
|
2013-12-26 19:12:51 +05:30 |
|
Rushabh Mehta
|
caa4380d49
|
Merge with 3.3.8
|
2013-12-26 11:07:58 +05:30 |
|
Rushabh Mehta
|
54047780fc
|
Merge with 3.3.8
|
2013-12-26 11:07:46 +05:30 |
|
Rushabh Mehta
|
df200f305b
|
Redesigned templates. Now all templates must be inside templates/pages templates/generators
|
2013-12-25 15:19:22 +05:30 |
|
Rushabh Mehta
|
2b08985e16
|
Translations redesigned webnotes/wnframework#351
|
2013-12-19 18:27:48 +05:30 |
|
Rushabh Mehta
|
c652a6254f
|
Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351
|
2013-12-16 12:48:38 +05:30 |
|
Rushabh Mehta
|
6de403f2be
|
added manifest, hooks and fixed requires webnotes/wnframework#351
|
2013-12-13 14:10:14 +05:30 |
|
Rushabh Mehta
|
1f84799f2d
|
install, web serving, session booting webnotes/wnframework#351
|
2013-12-12 19:12:19 +05:30 |
|
Rushabh Mehta
|
d2dd83c3a3
|
fixed template loader webnotes/wnframework#351
|
2013-12-12 13:57:58 +05:30 |
|
Rushabh Mehta
|
39bb8e2ed4
|
step 0: install
|
2013-12-11 15:32:14 +05:30 |
|
Rushabh Mehta
|
afea58b7a1
|
moved modules inside erpnext folder
|
2013-12-11 10:43:52 +05:30 |
|
Rushabh Mehta
|
2fa2f7178d
|
moved directory structure
|
2012-09-24 19:13:42 +05:30 |
|
Rushabh Mehta
|
09d84b6575
|
Stock Ageing & release of Analytics
|
2012-09-21 19:46:24 +05:30 |
|
Rushabh Mehta
|
f200c5296d
|
added sales analytics
|
2012-09-21 15:19:40 +05:30 |
|
Rushabh Mehta
|
6ca8054d55
|
added stock analytics
|
2012-09-20 19:03:14 +05:30 |
|
Anand Doshi
|
c63f0518d7
|
removed zoom from grid report
|
2012-09-20 12:08:47 +05:30 |
|
Anand Doshi
|
09d686f7f6
|
zoom for stock ledger report
|
2012-09-19 19:06:38 +05:30 |
|
Rushabh Mehta
|
40a3b46d61
|
Added code for plot zoom
|
2012-09-19 17:13:10 +05:30 |
|
Rushabh Mehta
|
b803cbab3d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-09-19 16:48:30 +05:30 |
|
Rushabh Mehta
|
5b5bc97c50
|
separated tooltip text in plot
|
2012-09-19 16:47:43 +05:30 |
|
Rushabh Mehta
|
4573515899
|
added graphs in stock ledger and general ledger
|
2012-09-19 16:41:19 +05:30 |
|
Anand Doshi
|
bb6d06f64a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-09-19 12:18:18 +05:30 |
|
Anand Doshi
|
cdd5cfefd5
|
make item code read-only after saving
|
2012-09-19 12:17:41 +05:30 |
|
Rushabh Mehta
|
823c021e9c
|
added index patch and updated general_ledger
|
2012-09-19 12:01:01 +05:30 |
|
Rushabh Mehta
|
eb8673ecc6
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-18 18:52:38 +05:30 |
|
Rushabh Mehta
|
2ad0d424a9
|
Stock Ledger Report
|
2012-09-18 18:52:05 +05:30 |
|
Nabin Hait
|
9a90c89b3f
|
removed duplicate function from sales invoice
|
2012-09-18 13:37:27 +05:30 |
|
Anand Doshi
|
6450b12881
|
fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form
|
2012-09-17 11:34:24 +05:30 |
|
Rushabh Mehta
|
b40e93733c
|
merge with master
|
2012-09-14 11:29:52 +05:30 |
|
Nabin Hait
|
ebc3b6a68d
|
stock ledger added
|
2012-09-14 11:25:57 +05:30 |
|
Rushabh Mehta
|
c6369046a1
|
merge
|
2012-09-14 11:09:46 +05:30 |
|
Rushabh Mehta
|
bf65507939
|
added watch, check progress
|
2012-09-14 11:08:53 +05:30 |
|
Anand Doshi
|
e08249f3d5
|
allow multisort with selectable sort order
|
2012-09-13 15:39:34 +05:30 |
|
Anand Doshi
|
99e5ac3452
|
multi sort for stock ledger search criteria
|
2012-09-13 15:24:19 +05:30 |
|
Anand Doshi
|
ae64c46671
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-10 15:46:52 +05:30 |
|
Anand Doshi
|
ff6754ccf4
|
fix in bin query
|
2012-09-10 15:46:38 +05:30 |
|
Anand Doshi
|
3b3a42303d
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-10 15:14:16 +05:30 |
|
Anand Doshi
|
bb2bb03bcc
|
fix in bin reorder item condition
|
2012-09-10 15:13:22 +05:30 |
|
Anand Doshi
|
1971ca9ecb
|
renamed Report to report
|
2012-09-10 11:40:06 +05:30 |
|
Anand Doshi
|
10f4ae814c
|
renamed Report name to small case name
|
2012-09-10 11:34:51 +05:30 |
|
Anand Doshi
|
0dab087be1
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
public/js/all-app.js
|
2012-09-10 11:31:18 +05:30 |
|
Nabin Hait
|
56419e0d79
|
Stock ledger report new version
|
2012-09-07 12:11:41 +05:30 |
|
Anand Doshi
|
f03e3bb06b
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-06 07:55:19 +05:30 |
|
Anand Doshi
|
e642805882
|
changed date displayed in transaction listing from modified date to transaction/posting date
|
2012-09-03 13:32:25 +05:30 |
|
Anand Doshi
|
5fc48f566f
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
|
2012-08-17 11:48:34 +05:30 |
|
Nabin Hait
|
0170b2b4bc
|
default purchase taxes and charges master will be automatically fetched in pur transactions
|
2012-08-17 11:00:15 +05:30 |
|
Nabin Hait
|
e343393d73
|
add/drop index if index key not exists / exists
|
2012-08-07 10:53:52 +05:30 |
|
Anand Doshi
|
a4f6529801
|
in item's update page name, if item name is null, create page name with only the name
|
2012-08-06 13:42:19 +05:30 |
|
Anand Doshi
|
1c2b192be6
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
|
2012-08-06 13:36:19 +05:30 |
|
Nabin Hait
|
337fef0859
|
call item on_update from UOM Replace Utility
|
2012-08-06 13:33:32 +05:30 |
|
Anand Doshi
|
e64d900322
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
|
2012-08-06 13:23:16 +05:30 |
|
Nabin Hait
|
fd03762445
|
call item on_update from UOM Replace Utility
|
2012-08-06 13:18:32 +05:30 |
|
Rushabh Mehta
|
49dc5da0dc
|
refactor unicode changes and merge with master with refactored email
|
2012-08-03 16:02:24 +05:30 |
|
Rushabh Mehta
|
f0018b5e05
|
added unsubscribed fields in Lead and Contact and cleaned up sendmail function
|
2012-08-02 18:03:12 +05:30 |
|
Anand Doshi
|
59d37c4bcb
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/hr/doctype/expense_claim/expense_claim.js
erpnext/patches/patch_list.py
|
2012-07-31 17:30:49 +05:30 |
|
Nabin Hait
|
f9360ce562
|
filter on actual qty in stock level report
|
2012-07-31 17:27:11 +05:30 |
|
Nabin Hait
|
d614a6ea38
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-31 14:12:41 +05:30 |
|
Nabin Hait
|
8d97290c06
|
updated bin permission
|
2012-07-31 14:12:23 +05:30 |
|
Anand Doshi
|
fd684ec247
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-31 13:58:16 +05:30 |
|
Anand Doshi
|
29c8b3b487
|
bug fix: strip serial no field before validation to check truthy value
|
2012-07-31 13:57:06 +05:30 |
|
Nabin Hait
|
76697a5c3b
|
added filter on item group and brand
|
2012-07-31 12:07:40 +05:30 |
|
Anand Doshi
|
396628e7ea
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/patches/patch_list.py
|
2012-07-27 14:45:24 +05:30 |
|
Nabin Hait
|
f5b3a44da1
|
SO and DN mandatory only for stock item if made mandatory in global defaults
|
2012-07-27 10:54:18 +05:30 |
|
Rushabh Mehta
|
0fa628bf86
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/patches/patch_list.py
public/js/report-legacy.js
|
2012-07-26 15:46:13 +02:00 |
|
Nabin Hait
|
74b30c15ea
|
Update erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
|
2012-07-25 18:14:46 +05:30 |
|
Anand Doshi
|
7118086658
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-07-23 11:28:10 +05:30 |
|
Anand Doshi
|
76ec66dd65
|
fixes for unicode
|
2012-07-20 18:11:30 +05:30 |
|
Nabin Hait
|
93e82b8742
|
error fixed in landed cost wizard
|
2012-07-20 10:40:14 +05:30 |
|
Anand Doshi
|
1703cc89b4
|
fixes for unicode
|
2012-07-19 20:31:56 +05:30 |
|
Anand Doshi
|
486f9dfcec
|
added unicode_literals import at start of each file
|
2012-07-19 13:40:31 +05:30 |
|
Anand Doshi
|
5756630efb
|
Merge branch 'master' of github.com:webnotes/erpnext into dev
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
public/js/all-app.js
|
2012-07-18 20:31:37 +05:30 |
|
Anand Doshi
|
249659d673
|
Changed file names from listview.js to doctype_name_list.js
|
2012-07-18 20:25:58 +05:30 |
|
Anand Doshi
|
f2f5c94c41
|
Default Currency specification for Customer and Supplier
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
|
2012-07-18 20:13:52 +05:30 |
|
Anand Doshi
|
a60266d780
|
fix in doclistview group by logic
|
2012-07-18 15:43:43 +05:30 |
|
Nabin Hait
|
41c922d200
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-18 13:19:32 +05:30 |
|
Nabin Hait
|
510eda353a
|
packing list issue fixed
|
2012-07-18 13:19:01 +05:30 |
|
Anand Doshi
|
04fd09c639
|
Merge branch 'master' of github.com:webnotes/erpnext into dev
|
2012-07-17 13:33:57 +05:30 |
|
Anand Doshi
|
4612e696b0
|
mark stock entry as is_submittable
|
2012-07-17 13:33:41 +05:30 |
|
Nabin Hait
|
a25ebe3dbf
|
Conversion rate fieldtype set as float (from currency)
|
2012-07-16 16:34:28 +05:30 |
|
Rushabh Mehta
|
2eef40bf1e
|
get_field > wn.meta.get_docfield
|
2012-07-16 14:16:57 +05:30 |
|
Anand Doshi
|
c97f780940
|
Merge branch 'master' into dev
Conflicts:
erpnext/patches/patch_list.py
erpnext/startup/js/complete_setup.js
erpnext/stock/doctype/item/item.txt
public/css/all-app.css
public/js/all-app.js
public/js/all-web.js
|
2012-07-12 22:16:19 +05:30 |
|
Anand Doshi
|
51146c07c3
|
cleaner web cache code
|
2012-07-12 18:41:12 +05:30 |
|
Rushabh Mehta
|
8cbbab2e75
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-12 18:01:31 +05:30 |
|
Rushabh Mehta
|
357fb2640b
|
sales bom fixes and mandatory in table fields
|
2012-07-12 18:00:21 +05:30 |
|
Rushabh Mehta
|
4feae61b62
|
fixes to taxes and charges master and naming_series
|
2012-07-12 16:01:20 +05:30 |
|
Nabin Hait
|
70db682a9a
|
fixed conflict in setup control
|
2012-07-12 11:47:40 +05:30 |
|
Rushabh Mehta
|
b9fabf8e16
|
sales bom cleanup
|
2012-07-11 19:18:50 +05:30 |
|
Anand Doshi
|
8c7e76ba44
|
RSS for blog
Comment addition into blog page's dom
|
2012-07-11 18:40:57 +05:30 |
|
Anand Doshi
|
1522f5d76b
|
Merge branch 'master' of github.com:webnotes/erpnext into cms2
|
2012-07-11 14:27:22 +05:30 |
|
Rushabh Mehta
|
e57267f79a
|
added patch for account and cleanups to breadcrumbs and msgprint
|
2012-07-11 13:18:58 +05:30 |
|
Nabin Hait
|
cfc6bb1d6c
|
consider warehouse, serial no and batch no from packing list for sales bom item and populate packing list only for sales bom items
|
2012-07-11 13:14:52 +05:30 |
|
Nabin Hait
|
0a38e4528b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-07-10 10:28:21 +05:30 |
|
Nabin Hait
|
1b310c26ce
|
removed depricated commenting style
|
2012-07-10 10:27:58 +05:30 |
|
Anand Doshi
|
e47def842d
|
Improvements in product page and its listing
Login page rendered via a template
|
2012-07-09 15:56:12 +05:30 |
|
Anand Doshi
|
c6fce634cf
|
added app frame to todo list
|
2012-07-09 12:34:02 +05:30 |
|
Anand Doshi
|
95a822c701
|
Fetch Customer's Item Code in Sales Transaction
|
2012-07-09 11:09:07 +05:30 |
|
Anand Doshi
|
1731786a61
|
Merge branch 'master' of github.com:webnotes/erpnext into cms2
|
2012-07-03 15:51:11 +05:30 |
|
Nabin Hait
|
594d63ab5d
|
serial no fix
|
2012-07-03 12:24:18 +05:30 |
|
Anand Doshi
|
e9a21cbb85
|
show child table values in doclistview
|
2012-06-29 18:09:04 +05:30 |
|
Anand Doshi
|
efc055241a
|
Merge branch 'master' into dev
|
2012-06-29 12:25:02 +05:30 |
|
Anand Doshi
|
08faf5bb7f
|
added field descriptions for packing slip
|
2012-06-29 12:24:35 +05:30 |
|
Anand Doshi
|
bd025a6cdf
|
added field descriptions for packing slip
|
2012-06-29 12:23:44 +05:30 |
|
Anand Doshi
|
e301e8a6c1
|
Merge branch 'master' into dev
Conflicts:
erpnext/buying/doctype/quality_inspection/quality_inspection.py
|
2012-06-28 18:40:57 +05:30 |
|
Nabin Hait
|
2c2a17f138
|
pull available qty in so and DN in selection of item
|
2012-06-27 15:14:58 +05:30 |
|
Anand Doshi
|
d4425cc57d
|
Merge branch 'master' into dev
Conflicts:
erpnext/support/doctype/maintenance_visit/maintenance_visit.py
|
2012-06-27 14:13:34 +05:30 |
|
Nabin Hait
|
7ce737be3d
|
Issue fixed in stock reconciliation
|
2012-06-27 11:33:05 +05:30 |
|
Nabin Hait
|
b8108c68e9
|
Issue fixed in stock reconciliation
|
2012-06-27 11:16:28 +05:30 |
|
Anand Doshi
|
10bcf5ea25
|
blog listing + started with products page and listing
|
2012-06-26 18:54:10 +05:30 |
|
Anand Doshi
|
81fa802e09
|
Merge branch 'master' into dev
|
2012-06-25 20:06:54 +05:30 |
|
Anand Doshi
|
8ae5ba9abf
|
fixes related to --> clear locals and then sync locals when whole doclist is passed
|
2012-06-25 20:05:35 +05:30 |
|
Nabin Hait
|
a5e972dd89
|
reserved warehouse in so and delivery warehouse in dn can be different
|
2012-06-25 18:06:37 +05:30 |
|
Nabin Hait
|
72a6ec8cb3
|
SO search query in DN: currency check removed
|
2012-06-25 10:39:38 +05:30 |
|
Rushabh Mehta
|
4c56275d26
|
appframe is now heading
|
2012-06-14 11:05:09 +05:30 |
|
Nabin Hait
|
4676891cbf
|
error fixed in reorder item email notification
|
2012-06-12 15:04:38 +05:30 |
|
Nabin Hait
|
d8fd8cfe1b
|
error fixed in reorder item email notification
|
2012-06-12 14:30:57 +05:30 |
|
Nabin Hait
|
ea8ff071cb
|
error fixed in reorder item email notification
|
2012-06-12 14:23:48 +05:30 |
|
Nabin Hait
|
9b0178acae
|
error fixed in reorder item email notification
|
2012-06-12 14:16:21 +05:30 |
|
Nabin Hait
|
2e3579a4eb
|
Item Barcode implemented
|
2012-06-07 19:09:17 +05:30 |
|
Nabin Hait
|
e91d8ccc5c
|
Custom query for item in serial no
|
2012-06-04 10:47:44 +05:30 |
|
Nabin Hait
|
1835ee6c8b
|
issue fixed
|
2012-05-31 12:28:07 +05:30 |
|
Nabin Hait
|
0908b2709b
|
fixed conflict
|
2012-05-31 11:49:37 +05:30 |
|
Nabin Hait
|
5c1de3a639
|
fixed conflict
|
2012-05-31 11:47:09 +05:30 |
|
Nabin Hait
|
353bc313a6
|
Link to Sales/accounts browser fixed
|
2012-05-31 11:43:14 +05:30 |
|
Anand Doshi
|
2ac77beb50
|
fix in packing list issue
|
2012-05-29 11:29:52 +05:30 |
|
Anand Doshi
|
9327bb9585
|
fix in tag viewing in doclistview
|
2012-05-23 15:12:22 +05:30 |
|
Anand Doshi
|
cb909d518c
|
Merge branch 'shf_rename'
|
2012-05-21 18:44:19 +05:30 |
|
Anand Doshi
|
2c4cd08844
|
more listviews
|
2012-05-21 18:40:53 +05:30 |
|
Anand Doshi
|
1aae261490
|
delete button in doclistview
|
2012-05-21 14:31:03 +05:30 |
|
Anand Doshi
|
fd3b19defa
|
Merge branch 'shf_rename'
|
2012-05-18 18:08:44 +05:30 |
|
Anand Doshi
|
67a2e0123c
|
moved po number and po date to basic info section of delivery note
|
2012-05-18 18:08:28 +05:30 |
|
Anand Doshi
|
00175612ac
|
Merge branch 'shf_rename'
Conflicts:
erpnext/stock/doctype/item/listview.js
|
2012-05-18 16:50:35 +05:30 |
|
Anand Doshi
|
d49da9bff1
|
new listviews
|
2012-05-18 16:49:36 +05:30 |
|
Anand Doshi
|
d643d367ca
|
Merge branch 'shf_rename'
Conflicts:
public/js/all-app.js
public/js/all-web.js
|
2012-05-18 11:52:31 +05:30 |
|
Anand Doshi
|
fc9145425d
|
Fixes in Print Formats - discount in description
|
2012-05-17 18:11:54 +05:30 |
|
Anand Doshi
|
1bba28a723
|
Merge branch 'shf_rename'
Conflicts:
erpnext/patches/patch_list.py
|
2012-05-15 18:22:55 +05:30 |
|
Nabin Hait
|
f044526b92
|
json error fixed in stock entry
|
2012-05-15 15:29:47 +05:30 |
|
Nabin Hait
|
901e92d8fa
|
rejected qty issue fixed
|
2012-05-15 13:40:26 +05:30 |
|
Nabin Hait
|
ed02a85184
|
fixed issue
|
2012-05-15 12:15:19 +05:30 |
|
Rushabh Mehta
|
deeae62b18
|
merge js/css
|
2012-05-14 15:03:17 +05:30 |
|
Anand Doshi
|
4a3d3d75de
|
Merge branch 'shf_rename'
Conflicts:
erpnext/patches/patch_list.py
|
2012-05-14 12:53:29 +05:30 |
|
Rushabh Mehta
|
0eb790a0ae
|
cleaned up imports, doc
|
2012-05-11 15:53:37 +05:30 |
|
Nabin Hait
|
956eeb1361
|
fetch defaults after mapping from prev document
|
2012-05-11 14:45:02 +05:30 |
|
Nabin Hait
|
ef85c4e556
|
posting time fixes in stock ledger entry
|
2012-05-10 17:48:34 +05:30 |
|
Nabin Hait
|
6fb498ebcd
|
changed field position of net total(import)
|
2012-05-10 14:03:39 +05:30 |
|
Anand Doshi
|
bf68e04d2f
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
erpnext/patches/patch_list.py
|
2012-05-10 12:40:58 +05:30 |
|
Nabin Hait
|
08f4cb7f6a
|
stock reco fix in valuation and cancellation
|
2012-05-10 12:13:47 +05:30 |
|
Anand Doshi
|
df8b4ab9b1
|
Merge branch 'cms'
|
2012-05-10 10:21:29 +05:30 |
|
Rushabh Mehta
|
078867c411
|
fixes to listview
|
2012-05-09 16:15:51 +05:30 |
|
Nabin Hait
|
68f9ad31ae
|
serialized inventory fixes : serial no for sales bom child item and rejected qty
|
2012-05-09 15:26:27 +05:30 |
|
Nabin Hait
|
6d6ca4bdb8
|
mapper fix
|
2012-05-08 11:51:35 +05:30 |
|
Nabin Hait
|
c22bd05bb5
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-07 17:35:45 +05:30 |
|
Nabin Hait
|
5375627bca
|
stock reco issue fixed
|
2012-05-07 17:35:15 +05:30 |
|
Anand Doshi
|
a00852ce19
|
fix in purchase receipt - show challan no for indian customers
|
2012-05-07 16:59:28 +05:30 |
|
Nabin Hait
|
875ccac151
|
stock reco cancellation issue fxed
|
2012-05-04 18:48:30 +05:30 |
|
Anand Doshi
|
bc1d74dbfe
|
fix in landed cost master query
|
2012-05-04 13:13:44 +05:30 |
|
Anand Doshi
|
837baee1b4
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-04 13:05:36 +05:30 |
|
Anand Doshi
|
cc1583de88
|
fix in landed cost master
|
2012-05-04 13:04:40 +05:30 |
|
Nabin Hait
|
ff81c37689
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-04 11:46:38 +05:30 |
|
Nabin Hait
|
0fb4eeb5bb
|
cancellation issue fixed in stock reco
|
2012-05-04 11:46:07 +05:30 |
|
Rushabh Mehta
|
22cd09beb3
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-05-04 10:02:51 +05:30 |
|
Rushabh Mehta
|
5a774db021
|
delivery, not and sales_bom
|
2012-05-04 10:02:09 +05:30 |
|
Nabin Hait
|
a67f706c92
|
options did not updated in stock entry
|
2012-05-03 18:09:15 +05:30 |
|
Nabin Hait
|
32826a8cf1
|
fixes in customerwise price list
|
2012-05-03 13:10:34 +05:30 |
|
Rushabh Mehta
|
28bb342f96
|
list view for purchase receipt
|
2012-05-03 10:41:19 +05:30 |
|
Rushabh Mehta
|
3d0c9ba22d
|
added listview for stock entry, listview templates
|
2012-05-03 10:35:51 +05:30 |
|
Rushabh Mehta
|
182569feb0
|
shipping address on top for delivery note
|
2012-05-03 10:28:23 +05:30 |
|
Rushabh Mehta
|
acd0769098
|
list in listview and sales order fix
|
2012-05-03 10:20:38 +05:30 |
|
Nabin Hait
|
00ba2ce8b4
|
fixes in sales and pur return
|
2012-05-02 16:04:42 +05:30 |
|
Nabin Hait
|
ab96d12086
|
fixes in customerwise price list
|
2012-05-02 12:19:33 +05:30 |
|
Nabin Hait
|
796505a83e
|
field arrangement in purchase and stock cycle
|
2012-05-01 16:26:16 +05:30 |
|
Nabin Hait
|
57d7c815d2
|
field arrangement in sales cycle
|
2012-05-01 12:35:12 +05:30 |
|
Nabin Hait
|
926f46f04a
|
Fixed conflict while merging with master
|
2012-05-01 11:51:08 +05:30 |
|
Nabin Hait
|
d58da50f50
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-05-01 11:37:45 +05:30 |
|
Nabin Hait
|
2ade43a647
|
field arrangement in sales cycle
|
2012-05-01 11:37:13 +05:30 |
|
Nabin Hait
|
228d03ec01
|
posting time fix
|
2012-04-30 16:59:39 +05:30 |
|
Rushabh Mehta
|
542acf6757
|
website, product and grid bugfix
|
2012-04-30 14:23:12 +05:30 |
|
Rushabh Mehta
|
a4be4d3390
|
website, product and grid bugfix
|
2012-04-30 14:22:02 +05:30 |
|
Nabin Hait
|
d4c5a9e2c4
|
fixes in bin
|
2012-04-30 11:50:34 +05:30 |
|
Nabin Hait
|
3e8f35c09e
|
fixes in bin
|
2012-04-30 11:47:45 +05:30 |
|
Nabin Hait
|
fc51f995c8
|
fixes in bin
|
2012-04-30 11:43:16 +05:30 |
|
Nabin Hait
|
201f8ca821
|
fixed conflict in sales bom using ours
|
2012-04-27 14:03:06 +05:30 |
|
Nabin Hait
|
b931f37735
|
fixed conflict using ours
|
2012-04-27 13:59:39 +05:30 |
|
Nabin Hait
|
0d1daa8875
|
fld order change
|
2012-04-27 13:56:58 +05:30 |
|
Nabin Hait
|
de975ff307
|
fixed filtering issue in gs
|
2012-04-27 13:53:20 +05:30 |
|
Nabin Hait
|
762056aaa8
|
sales bom amendment issue fixed
|
2012-04-27 11:06:12 +05:30 |
|
Nabin Hait
|
b9d3ade2f4
|
sales bom issue fixed
|
2012-04-27 11:04:11 +05:30 |
|
Nabin Hait
|
a6b7886175
|
resolved conflict while merging with master
|
2012-04-26 13:02:36 +05:30 |
|
Nabin Hait
|
50c799880a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-26 12:47:30 +05:30 |
|
Nabin Hait
|
5a6e641565
|
fixed batch issue
|
2012-04-26 11:11:34 +05:30 |
|
Nabin Hait
|
aa577ed82e
|
serial no fixes: sle creation through import data
|
2012-04-25 18:25:13 +05:30 |
|
Nabin Hait
|
ed7de5fee2
|
posting time format validation
|
2012-04-25 15:07:46 +05:30 |
|
Nabin Hait
|
4626b27038
|
updated sales bom document
|
2012-04-24 15:17:56 +05:30 |
|
Nabin Hait
|
d98ca01082
|
fixed wrong serial no qty validation
|
2012-04-24 14:07:04 +05:30 |
|
Nabin Hait
|
663e971557
|
Make next document button hide/unhide
|
2012-04-24 11:39:54 +05:30 |
|
Nabin Hait
|
4c9525139d
|
Error fixed in stock ledger netry batch related
|
2012-04-24 10:38:37 +05:30 |
|
Nabin Hait
|
f19bb52b2a
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-20 13:59:22 +05:30 |
|
Nabin Hait
|
f7c506d69e
|
fixed conflict while merging with master branch
|
2012-04-20 13:58:43 +05:30 |
|
Nabin Hait
|
e72ae2a19b
|
fixed conflict
|
2012-04-20 13:41:09 +05:30 |
|
Anand Doshi
|
9e0221c58e
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-20 11:22:38 +05:30 |
|
Anand Doshi
|
b8660fb51c
|
fixes in production, porjects, packing slip
|
2012-04-20 11:21:47 +05:30 |
|
Nabin Hait
|
b9984c8995
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-20 10:25:33 +05:30 |
|
Nabin Hait
|
239e79038f
|
Customer/customer group wise price list
|
2012-04-20 10:25:03 +05:30 |
|
Rushabh Mehta
|
a11bc07a7f
|
new report builder - todo: sort, save
|
2012-04-19 17:48:57 +05:30 |
|
Anand Doshi
|
b50a7a5ff9
|
Fix in rate fetching on get item details, when using inclusive rate
|
2012-04-19 12:00:49 +05:30 |
|
Nabin Hait
|
6da191de03
|
negative stock fixes
|
2012-04-18 16:18:20 +05:30 |
|
Nabin Hait
|
7afc2124a6
|
allow negative qty feature
|
2012-04-18 12:04:20 +05:30 |
|
Anand Doshi
|
24e18569d9
|
fixes in install docs for roles
|
2012-04-17 11:45:35 +05:30 |
|
Anand Doshi
|
45a4edc9c9
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
css/all-app.css
version.num
|
2012-04-17 11:19:15 +05:30 |
|
Nabin Hait
|
fe127c216c
|
fixed issue in stock
|
2012-04-16 16:01:02 +05:30 |
|
Nabin Hait
|
6f89f1eb86
|
fixes in sales cycle
|
2012-04-16 14:44:47 +05:30 |
|
Rushabh Mehta
|
cabfc65fe0
|
lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py)
|
2012-04-14 16:08:45 +05:30 |
|
Anand Doshi
|
a0f6a3eab7
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-13 15:34:27 +05:30 |
|
Nabin Hait
|
f3348c5136
|
Merge branch 'master' into shf_rename
|
2012-04-13 14:41:56 +05:30 |
|
Nabin Hait
|
781a3c9b1f
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-13 14:41:45 +05:30 |
|
Nabin Hait
|
82c53871c7
|
fixes in se js
|
2012-04-13 14:39:04 +05:30 |
|
Nabin Hait
|
1c9061eff6
|
fixed conflict using theirs
|
2012-04-13 14:24:35 +05:30 |
|
Nabin Hait
|
6c615d9527
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-13 14:14:39 +05:30 |
|
Nabin Hait
|
b09b3bc253
|
all fields visible if any other custom purpose in stock entry
|
2012-04-13 14:13:02 +05:30 |
|
Anand Doshi
|
b3ab90a01a
|
field changes in sp return tool
|
2012-04-13 12:38:34 +05:30 |
|
Nabin Hait
|
b176e94b92
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-13 11:53:35 +05:30 |
|
Nabin Hait
|
e77164955b
|
removed repair fn, fixes in reports
|
2012-04-13 11:53:06 +05:30 |
|
Rushabh Mehta
|
97ae17eaf7
|
merge
|
2012-04-13 11:42:56 +05:30 |
|
Rushabh Mehta
|
f1264a7f76
|
listing, module pages in appframe
|
2012-04-13 11:41:43 +05:30 |
|
Anand Doshi
|
83808267d5
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-13 11:40:38 +05:30 |
|
Anand Doshi
|
1c2ac00a82
|
fixes in sales cycle
|
2012-04-13 11:38:01 +05:30 |
|
Anand Doshi
|
f31fc22ef0
|
fixes in doctype
|
2012-04-13 11:37:19 +05:30 |
|
Nabin Hait
|
a73b2965aa
|
cleanup and fixes
|
2012-04-13 11:02:26 +05:30 |
|
Anand Doshi
|
2424387651
|
fixes after sync testing
|
2012-04-10 19:14:37 +05:30 |
|
Nabin Hait
|
0a8a487230
|
Update erpnext/stock/doctype/item/item.js
|
2012-04-10 16:50:23 +05:30 |
|
Anand Doshi
|
82042f1cff
|
fixes after sync
|
2012-04-06 17:54:17 +05:30 |
|
Anand Doshi
|
7e0479bc4c
|
cleanup of search criteria
|
2012-04-05 18:27:56 +05:30 |
|
Anand Doshi
|
fa0cd89a7c
|
change from labels to fieldname in cur_frm.cscript
|
2012-04-05 13:03:35 +05:30 |
|
Anand Doshi
|
5112b5b6b8
|
rerun of rename_dt
|
2012-04-02 19:12:29 +05:30 |
|
Rushabh Mehta
|
c7f1e5a54a
|
patch fixes
|
2012-04-02 14:24:35 +05:30 |
|
Rushabh Mehta
|
5475a3ca66
|
patch fixes
|
2012-04-02 14:06:46 +05:30 |
|
Anand Doshi
|
0442bc5d63
|
fix in patch list
|
2012-04-02 13:09:20 +05:30 |
|
Anand Doshi
|
c88ae2be4d
|
rename dt second cut
|
2012-03-30 18:18:36 +05:30 |
|
Anand Doshi
|
fedfd89e4a
|
rename dt first cut
|
2012-03-30 12:29:06 +05:30 |
|
Anand Doshi
|
37fb9c8f27
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename
Conflicts:
version.num
|
2012-03-29 15:35:08 +05:30 |
|
Anand Doshi
|
7ff696fb12
|
Merge branch 'renamedt' into shf_rename
Conflicts:
erpnext/patches/patch_list.py
|
2012-03-29 15:31:17 +05:30 |
|
Anand Doshi
|
fddb782a82
|
Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt
|
2012-03-29 15:28:16 +05:30 |
|
Anand Doshi
|
0442b4e207
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-29 15:22:15 +05:30 |
|
Anand Doshi
|
66722dfe69
|
some buying listviews
|
2012-03-29 15:20:35 +05:30 |
|
Nabin Hait
|
dc8ce0190d
|
Merge branch 'master' into renamedt
|
2012-03-29 11:53:02 +05:30 |
|
Rushabh Mehta
|
635f359a71
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-28 15:18:28 +02:00 |
|
Rushabh Mehta
|
43d64c6116
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-28 15:17:59 +02:00 |
|