Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,861 Commits 3 Branches 0 Tags 1 GiB
3be9e909d1
Commit Graph

760 Commits

Author SHA1 Message Date
Anand Doshi
215c901a0d [fix] [minor] recreate gl entries when using auto inventory accounting to fix bug introduced due to commit - 5dd6b1d082 2013-09-02 15:38:53 +05:30
Nabin Hait
d56da20fad [patch] [minor] to fix fiscal_years based on start date - only for single account 2013-08-30 16:02:22 +05:30
Nabin Hait
7a0daeb01a [patch] [minor] to fix fiscal_years based on start date - only for single account 2013-08-30 15:58:47 +05:30
Anand Doshi
26c3240b67 [fix] [patch] [minor] make notes 2013-08-23 12:21:52 +05:30
Anand Doshi
65f5c58e51 [fix] [minor] webshop fixes after bootstrap 3 2013-08-21 19:36:23 +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
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
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
176f3afd14 [fix] [minor] fixes in POS Invoice print format 2013-08-16 16:17:34 +05:30
Rushabh Mehta
6e252d64aa Merge branch 'master' of github.com:webnotes/erpnext 2013-08-16 10:04:45 +05:30
Nabin Hait
f32a4643e5 [fix] [minor] reload shopping_cart_price_list 2013-08-15 14:39:12 +05:30
Nabin Hait
3ead4a6e08 [fix] [minor] reload event on birthday patch 2013-08-15 14:30:46 +05:30
Anand Doshi
894341be72 [fix] [minor] price list rename patch 2013-08-14 19:24:36 +05:30
Rushabh Mehta
170be3b717 [minor] merge master 2013-08-14 18:41:42 +05:30
Rushabh Mehta
62030e05cc [Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master 2013-08-14 18:39:27 +05:30
Anand Doshi
0b6fa018d6 [fix] [minor] create birthday event only for active employees, else delete it 2013-08-14 10:54:16 +05:30
Anand Doshi
05a340e764 [fix] [minor] fixes after merging akhilesh's changes 2013-08-12 20:01:55 +05:30
Anand Doshi
9e59aff54e Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master 
Conflicts:
	accounts/doctype/pos_setting/pos_setting.txt
	patches/patch_list.py
 2013-08-12 20:00:33 +05:30
Anand Doshi
f066f7166b [minor] [fix] [patch] rename price list 2013-08-12 12:29:36 +05:30
Rushabh Mehta
4a404e9299 [price list] Separated Default Price List for Selling and Buying and changed fieldnames 2013-08-09 18:11:35 +05:30
Rushabh Mehta
0b9954059c [cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip) 2013-08-09 15:30:11 +05:30
Akhilesh Darjee
44b2e23eba [fix] pos settings - replace customer account with customer 2013-08-09 12:43:57 +05:30
Anand Doshi
9113f259bb [fix] [minor] [patch] commit after update qty 2013-08-07 15:19:32 +05:30
Anand Doshi
5e4e5d78df [minor] [fix] bring back onload_post_render in transaction.js - ref: a9b1c09166 2013-08-06 17:23:44 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
e79d57ca19 [salary slip] total no. of working days calculation [issue] webnotes/erpnext#285 2013-08-02 19:31:41 +05:30
Anand Doshi
25647c4375 Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	patches/patch_list.py
 2013-07-29 13:31:00 +05:30
Nabin Hait
90d74d4bfa [minor] sales invoice to delivery note mapping and prevdoc validation 2013-07-29 13:27:18 +05:30
Anand Doshi
ef0ab5d9aa [patch] [minor] set price list currency, where only one currency is used for item price 2013-07-29 13:06:50 +05:30
Anand Doshi
86537edd10 [fix] [patch] [minor] custom print format net total export patch 2013-07-26 11:34:16 +05:30
Anand Doshi
2b1d33f178 [minor] [cleanup] [issue] webnotes/erpnext#438 - change user_type Partner to Website User 2013-07-25 17:17:47 +05:30
Anand Doshi
c30988b8a4 [minor] [fix] [patch] change item wise tax 2013-07-25 13:50:51 +05:30
Anand Doshi
4a352310c5 [minor] [fix] remove website.pyc 2013-07-23 17:54:16 +05:30
Anand Doshi
d81c320a32 [minor] [patch] replace doc.net_total/doc.conversion_rate with doc.net_total_export in custom print formats 2013-07-22 15:57:31 +05:30
Anand Doshi
59544ff542 [minor] [patch] [fix] commit after each repost in p07_repost_billed_amt_in_sales_cycle.py 2013-07-19 16:25:32 +05:30
Anand Doshi
0d009f3db0 [minor] [fix] [patch] cost center company 2013-07-19 16:11:21 +05:30
Nabin Hait
67e6c80437 [fix] [minor] validate same sales rate patch 2013-07-18 13:25:47 +05:30
Nabin Hait
60d9a5e2ee [patch] repost billed amt in sales cycle, based on export amount instead of amount in base currency 2013-07-18 13:15:41 +05:30
Nabin Hait
2e652e8294 [fix] [minor] same sales rate throughour sales cycle 2013-07-18 12:30:30 +05:30
Nabin Hait
14f42664ec Merge branch 'master' of github.com:webnotes/erpnext 2013-07-18 12:28:56 +05:30
Nabin Hait
5b43b3dca5 merged with slow branch 2013-07-18 12:28:09 +05:30
Anand Doshi
4daf3dd8a8 [minor] [fix] reload doctype and docfield twice 2013-07-17 18:06:02 +05:30
Anand Doshi
cc04a17030 [minor] show brand html in toolbar 2013-07-17 14:15:26 +05:30
Anand Doshi
6537f3d25f [minor] [fix] reload core doctypes before patches 2013-07-17 13:22:04 +05:30
Anand Doshi
1ba072fa9b [fix] [patch] check in_list_view for Custom DocTypes 2013-07-17 12:41:19 +05:30
Anand Doshi
55da1ff98a [fix] [patch] check in_list_view for Custom DocTypes 2013-07-17 12:36:07 +05:30