Commit Graph

732 Commits

Author SHA1 Message Date
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
Anand Doshi
a1299dd652 [minor] fixed patch 2013-07-16 20:56:38 +05:30
Nabin Hait
6a3b951352 [accounts] [feature] optional checkbox for same rate validation in sales cycle 2013-07-16 18:34:35 +05:30
Anand Doshi
17aa1337bc [minor] fixed patch 2013-07-16 15:22:55 +05:30
Anand Doshi
e47963305d [minor] fixed patch 2013-07-16 15:18:18 +05:30
Anand Doshi
c2b9ce1def [minor] fixed patch 2013-07-16 15:15:02 +05:30
Anand Doshi
526a60b517 [minor] fixed patch 2013-07-16 15:14:13 +05:30
Anand Doshi
447068aefe [minor] fixed patch 2013-07-16 15:11:55 +05:30
Anand Doshi
2d71a51a08 [minor] fixed patch 2013-07-16 13:06:14 +05:30
Anand Doshi
38bef0e4c9 [patch] merge duplicate leads based on email id 2013-07-16 12:59:23 +05:30
Anand Doshi
9f9877a447 [minor] [patch] save style settings post release of responsive ui 2013-07-16 11:35:24 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Rushabh Mehta
e62a85afcf [patch] [minor] removed patch 2013-07-10 20:44:13 +05:30
Saurabh
86408c3d44 queries to server side 2013-07-10 14:00:37 +05:30
Anand Doshi
1357c0b2df [cleanup] #402 changed fieldname company_name to company in Cost Center 2013-07-09 15:45:38 +05:30
Nabin Hait
fd33b2b718 [patch] copy customer_address to shipping_address in delivery note 2013-07-09 11:42:38 +05:30
Nabin Hait
2bd37771ca validate with prevdoc 2013-07-08 19:00:29 +05:30
Anand Doshi
111ae7d6cd Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	patches/patch_list.py
2013-07-08 11:57:40 +05:30
Anand Doshi
690c2f5ffe [patch] [fix] delete report 2013-07-08 11:55:50 +05:30
Anand Doshi
0f21b324c9 Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	patches/patch_list.py
2013-07-08 11:53:35 +05:30
Nabin Hait
70eda07bcf [report] deleted duplicate report 2013-07-08 11:33:09 +05:30
Rushabh Mehta
a2a1ec765b [mappers] cleanup, remove dt_map, map_doclist and other such functions 2013-07-08 11:08:27 +05:30
Nabin Hait
ed23cca9d3 [mapper] removed old mapper from files and database 2013-07-07 19:11:52 +05:30
Nabin Hait
650501526f [merge] fixed conflict 2013-07-07 11:38:10 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +05:30
Nabin Hait
0c526be667 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-05 11:27:54 +05:30
Nabin Hait
3525481823 [patch] restore defaults 2013-07-05 11:27:26 +05:30
Nabin Hait
fa8d69c7ca Update patch_list.py 2013-07-04 15:02:23 +05:30
Nabin Hait
bce622d723 Update patch_list.py 2013-07-04 14:40:21 +05:30