Commit Graph

6805 Commits

Author SHA1 Message Date
Rushabh Mehta
1c0f32ce45 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-23 13:16:51 +05:30
Rushabh Mehta
16a62fa4be [pos] [cleanup] 2013-08-23 13:16:22 +05:30
Anand Doshi
a91c95f0fe [fix] [minor] recalculate on removing row 2013-08-23 13:00:47 +05:30
Anand Doshi
1e4fb689fc [fix] [minor] trigger grid_fieldname_remove function on removing grid row 2013-08-23 12:56:33 +05:30
Anand Doshi
26c3240b67 [fix] [patch] [minor] make notes 2013-08-23 12:21:52 +05:30
Rushabh Mehta
d491012009 Merge pull request #781 from akhileshdarjee/master
[pos] pos view first commit
2013-08-22 22:21:29 -07:00
Akhilesh Darjee
d6aa4bff7f [pos] pos view first commit 2013-08-22 17:26:43 +05:30
Nabin Hait
52396144f0 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-22 15:43:33 +05:30
Nabin Hait
d5b01a1ddc [fix] [minor] removed reserved warehouse from no_copy in sales order item 2013-08-22 15:43:18 +05:30
Rushabh Mehta
622c98d6f4 [demo] [minor] Added accounts, moved JV creation to server-side 2013-08-22 15:17:58 +05:30
Nabin Hait
80a2f70bad Merge branch 'master' of github.com:webnotes/erpnext 2013-08-22 10:49:13 +05:30
Nabin Hait
328fc095a0 [fix] [minor] fixes in item merging 2013-08-22 10:48:41 +05:30
Nabin Hait
77343391f5 [fix] [minor] changed validation message 2013-08-22 10:45:41 +05:30
Anand Doshi
65f5c58e51 [fix] [minor] webshop fixes after bootstrap 3 2013-08-21 19:36:23 +05:30
Rushabh Mehta
bbc2d11d10 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-21 17:48:40 +05:30
Rushabh Mehta
cce21d11fa [major] upgrade to bootstrap 3 2013-08-21 17:48:08 +05:30
Nabin Hait
040d1f3a0e [minor] imported cstr in selling_controller 2013-08-21 17:04:33 +05:30
Nabin Hait
e98ab7a2f4 [fix] [minor] fixes in updating warranty period of serial no 2013-08-21 16:56:12 +05:30
Anand Doshi
4cfb779d93 [fix] [permissions] Serial No - Read, Write permission for Accounts User 2013-08-21 13:37:55 +05:30
Anand Doshi
4284024acc [fix] [patch] fixes bad stock entries due to a bug introduced in commit c46d044efe 2013-08-21 12:27:26 +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
fe14f69e71 [fix] [patch] [minor] sle for deleted stock entry detail 2013-08-20 20:06:14 +05:30
Nabin Hait
eb9194f66d [fix] [minor] remove fix patch 2013-08-20 18:10:44 +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
Anand Doshi
f83cf5890e [fix] [minor] setup serial no editor if serial no field exists 2013-08-20 15:36:10 +05:30
Rushabh Mehta
490115e1c6 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-20 15:19:18 +05:30
Rushabh Mehta
20a109452a [buying] [manufacturing] Added new Reports and fixes for demo 2013-08-20 15:18:42 +05:30
Nabin Hait
ada70994dc [minor] install script allowed for linuxmint, a ubuntu distribution 2013-08-20 10:58:07 +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
Nabin Hait
c46d044efe [fix] [minor] [stock entry] call get_items even if item exists and on saved document 2013-08-17 12:38:23 +05:30
Nabin Hait
176f3afd14 [fix] [minor] fixes in POS Invoice print format 2013-08-16 16:17:34 +05:30
Nabin Hait
a0379d01b1 [fix] [minor] fixes in italian translation 2013-08-16 15:25:41 +05:30
Nabin Hait
3ccd07cc72 [fix] [minor] paid amount should be zero if not pos invoice 2013-08-16 15:21:25 +05:30
Nabin Hait
d49bac6cff Merge branch 'master' of github.com:webnotes/erpnext 2013-08-16 15:15:40 +05:30
Nabin Hait
21cf403b57 [fix] [minor] paid amount should be zero if not pos invoice 2013-08-16 15:15:16 +05:30
Rushabh Mehta
62aa5d2662 [merge] [conflicts] 2013-08-16 14:31:03 +05:30
Rushabh Mehta
0b491b46d3 [lang] [minor] 2013-08-16 14:28:47 +05:30
Rushabh Mehta
7124982bbd [translation] [minor] 2013-08-16 14:15:06 +05:30
Rushabh Mehta
61e54d4d92 Merge branch 'master' into serial_no 2013-08-16 14:07:48 +05:30
Rushabh Mehta
3423a73009 [serial no] Allow creation only of Warehouse is not set, [translation] Italian 2013-08-16 13:03:34 +05:30