Nabin Hait
|
68431e9cb3
|
restored 'use multi level bom' in production order
|
2012-12-24 18:47:18 +05:30 |
|
Nabin Hait
|
00db863994
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-23 09:57:36 +05:30 |
|
Nabin Hait
|
2848bea64e
|
fixed company and fiscal year options in attendance doctype
|
2012-12-23 09:45:02 +05:30 |
|
Rushabh Mehta
|
6f65de15ae
|
appframe fixes
|
2012-12-22 13:50:35 +05:30 |
|
Rushabh Mehta
|
ff153490fe
|
desktop items fix
|
2012-12-22 07:42:04 +05:30 |
|
Rushabh Mehta
|
7ac16faf6b
|
fixes to new desktop
|
2012-12-21 22:49:10 +05:30 |
|
Rushabh Mehta
|
1ee582fd3e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-21 21:40:50 +05:30 |
|
Rushabh Mehta
|
5ade7ca570
|
fixes to new desktop
|
2012-12-21 21:40:19 +05:30 |
|
Anand Doshi
|
acc36be87f
|
patch to fix deleted contact and addresses
|
2012-12-21 20:57:03 +05:30 |
|
Rushabh Mehta
|
db94cf16b2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-21 18:28:10 +05:30 |
|
Rushabh Mehta
|
d3c9fb6b3b
|
changed desktop modules now using font-awesome instead of noun project fonts
|
2012-12-21 18:27:40 +05:30 |
|
Anand Doshi
|
c3e485b705
|
fixed remove from locals
|
2012-12-21 16:02:36 +05:30 |
|
Nabin Hait
|
625713e2eb
|
fixed message in stock entry
|
2012-12-21 15:21:39 +05:30 |
|
Rushabh Mehta
|
380d7c6a53
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-21 15:01:08 +05:30 |
|
Rushabh Mehta
|
946e6d4a46
|
desktop icons now use font-awesome
|
2012-12-21 15:00:29 +05:30 |
|
Nabin Hait
|
dff6ed880b
|
cleanup for stock entry - remove production order from locals
|
2012-12-21 14:42:00 +05:30 |
|
Nabin Hait
|
3765430c99
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-21 14:14:40 +05:30 |
|
Nabin Hait
|
079f5e0773
|
For Material Transfer against Production Order, fetch quantity pending to be transferred for each item.
|
2012-12-21 14:14:07 +05:30 |
|
Rushabh Mehta
|
d49ca03335
|
added '+' button to file selector and rounded corners
|
2012-12-21 12:31:45 +05:30 |
|
Nabin Hait
|
ab573ce0c7
|
fixes in website
|
2012-12-21 11:01:31 +05:30 |
|
Rushabh Mehta
|
0c71218988
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-21 10:54:43 +05:30 |
|
Rushabh Mehta
|
60cc0cc173
|
top bar fix
|
2012-12-21 10:52:26 +05:30 |
|
Anand Doshi
|
be8af5b7ed
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-20 18:34:09 +05:30 |
|
Anand Doshi
|
d566a10f55
|
validate warehouses for manufacture/repack only if bom is used
|
2012-12-20 18:33:04 +05:30 |
|
Rushabh Mehta
|
88a4c44cfa
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-20 17:12:59 +05:30 |
|
Rushabh Mehta
|
fc19f25c88
|
updates to item, item_group and website
|
2012-12-20 17:11:51 +05:30 |
|
Anand Doshi
|
2353b90e7a
|
fixed production order patch
|
2012-12-20 17:08:57 +05:30 |
|
Anand Doshi
|
69f855ebfb
|
changed production to manufacturing in reload doc
|
2012-12-20 17:06:44 +05:30 |
|
Anand Doshi
|
8ac9e687bd
|
fix in patch
|
2012-12-20 16:53:33 +05:30 |
|
Anand Doshi
|
401f954cc7
|
hide naming series in production order
|
2012-12-20 16:15:24 +05:30 |
|
Nabin Hait
|
2880a55a01
|
production order naming series patch
|
2012-12-20 16:00:27 +05:30 |
|
Nabin Hait
|
b5d23ee554
|
hide display of from/to warehouse based on purpose
|
2012-12-20 15:33:59 +05:30 |
|
Nabin Hait
|
f33831abe4
|
Merge branch 'master' into production
|
2012-12-20 14:31:26 +05:30 |
|
Nabin Hait
|
457b0b8648
|
fixes in sales/purchase register
|
2012-12-20 14:29:53 +05:30 |
|
Anand Doshi
|
6c92a56cae
|
changed description in production order, syntax fix in stock entry.py
|
2012-12-20 13:57:43 +05:30 |
|
Anand Doshi
|
ab5cf08c14
|
Merge branch 'master' of github.com:webnotes/erpnext into production
|
2012-12-20 12:42:53 +05:30 |
|
Anand Doshi
|
1107d50a59
|
reload stock entry before running custom fields patch
|
2012-12-20 12:42:16 +05:30 |
|
Anand Doshi
|
def65c671d
|
show manufacturing small icon
|
2012-12-20 12:18:24 +05:30 |
|
Rushabh Mehta
|
608a751b57
|
import merge, task list label
|
2012-12-20 11:08:11 +05:30 |
|
Rushabh Mehta
|
be7fe472b6
|
import merge, remove Core
|
2012-12-20 11:01:09 +05:30 |
|
Rushabh Mehta
|
5569321d15
|
fixed z-index and renamed all-app.js to all-app.min.js
|
2012-12-20 10:37:37 +05:30 |
|
Anand Doshi
|
879ec66ea3
|
Merge branch 'production' of github.com:webnotes/erpnext into production
Conflicts:
accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
buying/doctype/purchase_order_item/purchase_order_item.txt
buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
patches/patch_list.py
|
2012-12-19 22:28:00 +05:30 |
|
Nabin Hait
|
6435437e5b
|
updates in manufacturing module
|
2012-12-19 19:33:41 +05:30 |
|
Rushabh Mehta
|
1ba4bd4485
|
added webclient.py and some misc fixes
|
2012-12-19 17:05:51 +05:30 |
|
Rushabh Mehta
|
8ebf1b86f8
|
added disabled in Report and no_sync fields in import_merge
|
2012-12-19 15:34:00 +05:30 |
|
Rushabh Mehta
|
15430f87ca
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-19 12:46:41 +05:30 |
|
Rushabh Mehta
|
40ca2c681a
|
removed next_contact in quotation, fixed regex to convert relative links to absolute
|
2012-12-19 12:46:03 +05:30 |
|
Nabin Hait
|
4ecc785aab
|
fixed conflict
|
2012-12-19 12:18:15 +05:30 |
|
Anand Doshi
|
ab28978755
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-19 12:02:46 +05:30 |
|
Anand Doshi
|
f1854b1c2f
|
removed discount from print hide in purchase cycle
|
2012-12-19 12:01:48 +05:30 |
|