Commit Graph

715 Commits

Author SHA1 Message Date
Anand Doshi
83de391efc Merge branch 'akhileshdarjee-master' into website-wip 2013-09-17 16:09:15 +05:30
Anand Doshi
619ed5e949 [fix] [minor] [website] 2013-09-17 13:46:50 +05:30
Anand Doshi
ad0b05060a Merge branch 'master' of github.com:webnotes/erpnext into website-wip 2013-09-17 11:00:24 +05:30
Nabin Hait
42573bcc90 [fix] [minor] fixed order of execution 2013-09-17 10:38:04 +05:30
Anand Doshi
155d985cd4 Merge branch 'master' of github.com:webnotes/erpnext into website-wip
Conflicts:
	patches/patch_list.py
2013-09-12 17:03:21 +05:30
Akhilesh Darjee
b9c12eff17 [fix] [minor] merge conflict fixed 2013-09-12 14:02:37 +05:30
Nabin Hait
6656acff52 [minor] [fix] set stock uom in stock ledger entry through stock reconciliation 2013-09-12 11:46:09 +05:30
Anand Doshi
fb109aded0 [website] [minor] moving to framework 2013-09-11 18:58:20 +05:30
Anand Doshi
0748cb7d18 [website] [minor] moving to framework 2013-09-11 15:31:58 +05:30
Akhilesh Darjee
c3ec72c991 [fix] [minor] merge conflict fixed 2013-09-11 14:49:38 +05:30
Akhilesh Darjee
db59ffb76d [usability] item price moved to price list 2013-09-11 13:05:24 +05:30
Anand Doshi
b0d996ffb1 [website] [minor] moving to framework 2013-09-10 18:29:39 +05:30
Anand Doshi
330dae90cb [website] [minor] moving to framework 2013-09-10 13:46:28 +05:30
Rushabh Mehta
7c2312a74c [website] [minor] moving to framework 2013-09-10 12:51:52 +05:30
Rushabh Mehta
bdb846f665 [website] [minor] moving to framework 2013-09-09 17:31:19 +05:30
Rushabh Mehta
e865de01ee [website] [minor] moving to framework 2013-09-09 12:32:35 +05:30
Rushabh Mehta
c59c4e0699 [website] [minor] moving to framework 2013-09-09 12:17:45 +05:30
Rushabh Mehta
46089dbc97 [website] [minor] moving website helper methods to doctypes 2013-09-09 11:32:24 +05:30
Nabin Hait
a0871cfe6a [fix] [minor] Fixes for uom validation of item 2013-09-06 16:26:07 +05:30
Nabin Hait
034380b004 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-06 14:06:12 +05:30
Nabin Hait
78fde78405 [fix] [minor] changed uom replace utility message 2013-09-06 14:05:47 +05:30
Anand Doshi
a3f6fda0df [fix] Hide Make Delivery Note button, if Sales Invoice is made from Delivery Note. Hide Make Invoice Button, if Delivery Note is made from Sales Invoice 2013-09-06 13:37:52 +05:30
Nabin Hait
e33d0be32c [fix] [minor] changed uom replace utility message 2013-09-06 13:23:33 +05:30
Nabin Hait
ce4be997ab Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 17:38:52 +05:30
Nabin Hait
63b5ef7ecf [fix] [minor] is_pos zero when mapping 2013-09-05 17:38:24 +05:30
Akhilesh Darjee
2ea7a241a3 [fix] purchase receipt test cases 2013-09-05 16:28:45 +05:30
Anand Doshi
ea55734df5 [fix] [minor] delivered items to be billed 2013-09-05 12:41:16 +05:30
Nabin Hait
2851bc0514 [minor] [tetscases] for serialized item 2013-09-04 13:02:58 +05:30
Nabin Hait
3e34a6d0e1 [fix] [minor] serial no status update for material transfer 2013-09-04 12:54:33 +05:30
Nabin Hait
3b152ba6c7 [fix] [minor] make bank voucher from expense claim and serial no status 2013-09-03 23:19:08 +05:30
Nabin Hait
94c90bdbf9 [fix] [minor] buying amount for sales bom item 2013-08-30 22:48:19 +05:30
Nabin Hait
da1e503f3d [fix] [minor] removed sample item field from item 2013-08-30 16:24:44 +05:30
Rushabh Mehta
a65253b5d5 [stock] [minor] Added Warehouse User check in Sales Order 2013-08-27 10:32:56 +05:30
Anand Doshi
cf343174a4 [fix] removed purchase order no from purchase list view, since it does not show purchase receipt when the form doesn't have any purchase receipt items 2013-08-23 19:53:41 +05:30
Nabin Hait
328fc095a0 [fix] [minor] fixes in item merging 2013-08-22 10:48:41 +05:30
Anand Doshi
4cfb779d93 [fix] [permissions] Serial No - Read, Write permission for Accounts User 2013-08-21 13:37:55 +05:30
Nabin Hait
72c9aa083a Merge branch 'master' of github.com:webnotes/erpnext 2013-08-21 11:29:35 +05:30
Nabin Hait
945aff1468 [fix] [minor] fiscal year deleted from serial no 2013-08-21 11:28:45 +05:30
Rushabh Mehta
8331bbfc92 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-21 11:21:01 +05:30
Rushabh Mehta
82e54c8293 [minor] fix to purchase receipt button, make_demo 2013-08-21 11:19:15 +05:30
Nabin Hait
691096d8b1 [fix] [minor] duplicate stock entry against production order 2013-08-21 11:07:24 +05:30
Nabin Hait
7bd850a133 [patch] [minor] fix sle against cancelled stock entry for production 2013-08-20 17:40:26 +05:30
Nabin Hait
4aeee45530 [fix] [minor] get items from bom on material transfer against production order 2013-08-20 17:09:05 +05:30
Nabin Hait
bd0277f4d2 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-20 16:13:43 +05:30
Nabin Hait
a7a919d721 [fix] [minor] set warranty expiry date on serial no from delivery note 2013-08-20 16:13:23 +05:30
Rushabh Mehta
20a109452a [buying] [manufacturing] Added new Reports and fixes for demo 2013-08-20 15:18:42 +05:30
Rushabh Mehta
d8982d4af4 [serial no] [minor] fix - set Available status after insert on creation 2013-08-19 22:00:25 +05:30
Anand Doshi
b02fba9c77 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-19 20:03:51 +05:30
Anand Doshi
2e31e097fa [fix] [minor] _round function - implement round halfs to nearest even number 2013-08-19 19:58:23 +05:30
Nabin Hait
76273ebfbc [merge] [minor] Fixed conflict while merging serial_no branch with master 2013-08-19 16:26:13 +05:30