Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,598 Commits 3 Branches 0 Tags 1 GiB
7da01d6007
Commit Graph

609 Commits

Author SHA1 Message Date
Anand Doshi
763e4c93bc added permission checking to show add child, edit and view ledger links 
in chart of accounts
 2012-08-23 18:34:04 +05:30
Anand Doshi
297f37da03 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-22 14:59:14 +05:30
Nabin Hait
fd3f24f4be customer name should come in recurring invoice print format instead of customer id 2012-08-20 11:43:55 +05:30
Anand Doshi
5fc48f566f Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
 2012-08-17 11:48:34 +05:30
Nabin Hait
0170b2b4bc default purchase taxes and charges master will be automatically fetched in pur transactions 2012-08-17 11:00:15 +05:30
Nabin Hait
7e555e9f78 Update erpnext/accounts/doctype/cost_center/cost_center.py 2012-08-14 16:42:30 +05:30
Nabin Hait
f039c8b58f get_query for invoice in c-form 2012-08-14 15:38:17 +05:30
Anand Doshi
241437995f Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/setup/doctype/company/company.txt
 2012-08-10 12:58:48 +05:30
Nabin Hait
4d0cba8249 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-09 16:24:47 +05:30
Nabin Hait
cd4918736a error fixed in account browser 2012-08-09 16:24:20 +05:30
Anand Doshi
63fee973d7 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-09 11:34:47 +05:30
Anand Doshi
c4df355edc removed msgprint in get_pos_details of sales invoice 2012-08-09 11:33:56 +05:30
Rushabh Mehta
49dc5da0dc refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:24 +05:30
Nabin Hait
8292691470 stock repost patch 2012-08-03 08:39:17 +05:30
Anand Doshi
396628e7ea Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
 2012-07-27 14:45:24 +05:30
Nabin Hait
4572182939 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-27 10:54:43 +05:30
Nabin Hait
3d72da568d SO and DN mandatory only for stock item if made mandatory in global defaults 2012-07-27 10:51:51 +05:30
Rushabh Mehta
0fa628bf86 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
	public/js/report-legacy.js
 2012-07-26 15:46:13 +02:00
Anand Doshi
80b8393338 fixes in email validation for recurring invoice 2012-07-26 19:01:16 +05:30
Nabin Hait
e8ff96565c validate notification_email_ids in recurring invoice and if user is administrator set email id from profile 2012-07-24 10:59:31 +05:30
Nabin Hait
e9a62d1236 reload trial balance report 2012-07-23 11:46:37 +05:30
Anand Doshi
7118086658 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-07-23 11:28:10 +05:30
Nabin Hait
454e268109 Recurring Invoice repititive mail sending issue fixed 2012-07-20 17:17:32 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb Merge branch 'master' of github.com:webnotes/erpnext into dev 
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
	public/js/all-app.js
 2012-07-18 20:31:37 +05:30
Anand Doshi
249659d673 Changed file names from listview.js to doctype_name_list.js 2012-07-18 20:25:58 +05:30
Anand Doshi
f2f5c94c41 Default Currency specification for Customer and Supplier 
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
 2012-07-18 20:13:52 +05:30
Nabin Hait
a25ebe3dbf Conversion rate fieldtype set as float (from currency) 2012-07-16 16:34:28 +05:30
Rushabh Mehta
2eef40bf1e get_field > wn.meta.get_docfield 2012-07-16 14:16:57 +05:30
Rushabh Mehta
8cbbab2e75 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-12 18:01:31 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30
Nabin Hait
70db682a9a fixed conflict in setup control 2012-07-12 11:47:40 +05:30
Rushabh Mehta
5faf37f312 item group cleanup 2012-07-12 11:33:00 +05:30
Rushabh Mehta
cda9732f51 price list cleanup 2012-07-11 17:29:46 +05:30
Rushabh Mehta
3a0f191658 cleaned up fiscal_year, currency and added select-all + help in doclistview 2012-07-11 16:35:39 +05:30
Nabin Hait
3b0f5dddea fiscal_year_closed and abbr removed from code 2012-07-11 15:14:06 +05:30
Rushabh Mehta
9acf463427 budget distribution cleanup and formatting of markdown 2012-07-11 14:39:33 +05:30
Rushabh Mehta
e3dd54c220 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 13:19:36 +05:30
Rushabh Mehta
e57267f79a added patch for account and cleanups to breadcrumbs and msgprint 2012-07-11 13:18:58 +05:30
Nabin Hait
21fdff01e2 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 13:16:38 +05:30
Nabin Hait
9e5059f6b9 packing list introduced in pos invoice 2012-07-11 13:15:57 +05:30
Anand Doshi
e2cddd4e78 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 12:09:41 +05:30
Nabin Hait
e4e78b469a Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 11:54:08 +05:30
Rushabh Mehta
bf96499c0e account cleanup, added toggle_fields in cur_frm 2012-07-11 09:51:18 +05:30
Rushabh Mehta
d6814dde29 account cleanup started 2012-07-10 18:38:59 +05:30
Nabin Hait
c296764cfe repost button removed from closing entry voucher 2012-07-10 18:25:59 +05:30
Nabin Hait
04aa191869 freezed account allowed in closing entry 2012-07-10 18:18:03 +05:30
Rushabh Mehta
5281e350fb cost center cleanup 2012-07-10 18:16:09 +05:30
Nabin Hait
29d7641206 fixed issue in period closing voucher: consider freezed account for closing 2012-07-10 18:12:00 +05:30
Rushabh Mehta
1ee2a5ac12 cost center cleanup + grid css 2012-07-10 17:22:20 +05:30
Nabin Hait
0aec0e1a63 repost balance button removed from period closing voucher 2012-07-10 14:24:45 +05:30
Nabin Hait
7c0b893b1f mandatory validation in cost center 2012-07-10 14:18:35 +05:30
Nabin Hait
969622dcef mandatory validation in cost center 2012-07-10 14:11:01 +05:30
Anand Doshi
95a822c701 Fetch Customer's Item Code in Sales Transaction 2012-07-09 11:09:07 +05:30
Anand Doshi
8c90f12967 changed label of included in print rate to Is this Tax included in Basic Rate? 2012-07-04 13:30:13 +05:30
Anand Doshi
c4cae8d561 Merge branch 'master' into dev 2012-06-29 19:07:29 +05:30
Anand Doshi
54b7235705 formatted money in chart of accounts tree 2012-06-29 19:07:20 +05:30
Anand Doshi
365e0c5f13 Merge branch 'master' into dev 2012-06-29 19:04:10 +05:30
Anand Doshi
351352670e formatted money in chart of accounts tree 2012-06-29 19:03:59 +05:30
Anand Doshi
d4425cc57d Merge branch 'master' into dev 
Conflicts:
	erpnext/support/doctype/maintenance_visit/maintenance_visit.py
 2012-06-27 14:13:34 +05:30
Nabin Hait
b81aa88091 Lease agreement link removed from account home page 2012-06-27 12:00:24 +05:30
Anand Doshi
81fa802e09 Merge branch 'master' into dev 2012-06-25 20:06:54 +05:30
Anand Doshi
8ae5ba9abf fixes related to --> clear locals and then sync locals when whole doclist is passed 2012-06-25 20:05:35 +05:30
Nabin Hait
8b14617dce run view ledger report through set_route 2012-06-25 13:15:59 +05:30
Nabin Hait
33dcbc096a error fixed in cost center wise expense report 2012-06-22 14:34:46 +05:30
Nabin Hait
bceec1cbef error fixed in cost center wise expense report 2012-06-22 14:32:56 +05:30
Nabin Hait
1f5a58eed7 listview of sales invoice 2012-06-22 14:19:06 +05:30
Nabin Hait
486718250e listview of purchase invoice and deletion of supplier 2012-06-22 14:14:04 +05:30
Nabin Hait
318eab813c delete customer account on deletion of customer record 2012-06-22 13:35:13 +05:30
Nabin Hait
0480153042 error fixed in sales register 2012-06-19 18:07:03 +05:30
Nabin Hait
11de3ec952 fixed error in purchase register 2012-06-19 18:03:31 +05:30
Nabin Hait
28447e84c2 Update master 2012-06-18 11:03:51 +05:30
Nabin Hait
8eadf09e99 recurring invoice : quarterly, half-yearly and yearly 2012-06-17 21:48:33 +05:30
Rushabh Mehta
4c56275d26 appframe is now heading 2012-06-14 11:05:09 +05:30
Nabin Hait
8afa88b906 fixed utf8 error in multi ledger export 2012-06-11 17:48:40 +05:30
Nabin Hait
856442e33b taxes query changes 2012-06-08 12:13:00 +05:30
Nabin Hait
2e3579a4eb Item Barcode implemented 2012-06-07 19:09:17 +05:30
Nabin Hait
91034af0dc Get Query changes for tax account: allowed account type income/expense 2012-06-07 12:12:08 +05:30
Nabin Hait
252a7a189b Account type=Income/Expense allowed in income/expense account searching in sales/pur invoice 2012-06-05 15:27:12 +05:30
Nabin Hait
6c34e1411f Flexible invoice period in recurring invoice 2012-06-04 16:21:25 +05:30
Nabin Hait
bc8e9d7a34 Flexible invoice period in recurring invoice 2012-06-04 16:18:38 +05:30
Nabin Hait
6ea87a42a8 convert to group/ledger button hide/unhide issue fixed 2012-06-04 14:04:36 +05:30
Nabin Hait
aaab084a12 uom field added in pur invoice item table 2012-06-04 12:10:43 +05:30
Nabin Hait
d2301f9569 uom field added in pur invoice item table 2012-06-04 12:07:45 +05:30
Nabin Hait
765298bc63 uom field added in pur invoice item table 2012-06-04 12:02:56 +05:30
Nabin Hait
e44ebb1ec7 removed available qty validation in pos 2012-05-31 15:22:05 +05:30
Nabin Hait
fe678fd638 balance area only for accounts not for cost center 2012-05-31 13:32:45 +05:30
Nabin Hait
0908b2709b fixed conflict 2012-05-31 11:49:37 +05:30
Nabin Hait
5c1de3a639 fixed conflict 2012-05-31 11:47:09 +05:30
Nabin Hait
353bc313a6 Link to Sales/accounts browser fixed 2012-05-31 11:43:14 +05:30
Anand Doshi
3b091418ec allow zero payment in POS Invoice, when cash/bank account is not specified 2012-05-28 18:08:02 +05:30
Anand Doshi
9327bb9585 fix in tag viewing in doclistview 2012-05-23 15:12:22 +05:30
Nabin Hait
86df78aabc fixed conflict 2012-05-23 11:33:28 +05:30
Nabin Hait
df9f8a363e Balance on chart of accounts 2012-05-22 16:54:46 +05:30
Nabin Hait
b695f73293 Maintain same rate throughout pur cycle: in global defaults, by default set true 2012-05-22 14:53:40 +05:30
Nabin Hait
86375f089a Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-21 15:48:21 +05:30
Nabin Hait
ee2201cc68 forced export limit increased to 2000 2012-05-21 15:13:57 +05:30
Anand Doshi
1aae261490 delete button in doclistview 2012-05-21 14:31:03 +05:30
Nabin Hait
d9742a6a58 on_trash modified for item group, territory, customer group, and sales person 2012-05-21 13:33:09 +05:30
Nabin Hait
c68635d70a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-18 18:37:28 +05:30
Nabin Hait
3b8d4776a2 company validation 2012-05-18 18:36:56 +05:30
Anand Doshi
00175612ac Merge branch 'shf_rename' 
Conflicts:
	erpnext/stock/doctype/item/listview.js
 2012-05-18 16:50:35 +05:30
Anand Doshi
d49da9bff1 new listviews 2012-05-18 16:49:36 +05:30
Anand Doshi
d643d367ca Merge branch 'shf_rename' 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-05-18 11:52:31 +05:30
Anand Doshi
fc9145425d Fixes in Print Formats - discount in description 2012-05-17 18:11:54 +05:30
Anand Doshi
c7e26873c0 Merge branch 'shf_rename' 2012-05-17 15:28:54 +05:30
Anand Doshi
dad93ce8a3 fix in payment reconciliation 2012-05-17 15:28:38 +05:30
Anand Doshi
ae4fc41e61 Merge branch 'shf_rename' 2012-05-16 14:35:15 +05:30
Nabin Hait
7b87a7ec74 fixed pos settings 2012-05-16 14:07:02 +05:30
Anand Doshi
c51c0d38d7 Merge branch 'shf_rename' 2012-05-16 12:28:14 +05:30
Nabin Hait
86dec8da7a naming series issue fixed in pos settings 2012-05-16 12:20:21 +05:30
Anand Doshi
f295591168 Merge branch 'shf_rename' 2012-05-14 18:03:45 +05:30
Rushabh Mehta
deeae62b18 merge js/css 2012-05-14 15:03:17 +05:30
Nabin Hait
a13b435163 invoice period in print format if recurring invoice 2012-05-14 14:11:56 +05:30
Anand Doshi
07af8f6247 fix in last purchase rate 2012-05-14 13:02:31 +05:30
Anand Doshi
4a3d3d75de Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-14 12:53:29 +05:30
Anand Doshi
cec150b487 fixes in last purchase rate 2012-05-11 18:13:53 +05:30
Rushabh Mehta
0eb790a0ae cleaned up imports, doc 2012-05-11 15:53:37 +05:30
Nabin Hait
956eeb1361 fetch defaults after mapping from prev document 2012-05-11 14:45:02 +05:30
Anand Doshi
df74d30cf1 fix in listview of journal voucher 2012-05-10 19:19:31 +05:30
Anand Doshi
02c0eaf99a don't show currency in journal voucher's listview 2012-05-10 18:48:15 +05:30
Nabin Hait
6fb498ebcd changed field position of net total(import) 2012-05-10 14:03:39 +05:30
Anand Doshi
df8b4ab9b1 Merge branch 'cms' 2012-05-10 10:21:29 +05:30
Rushabh Mehta
078867c411 fixes to listview 2012-05-09 16:15:51 +05:30
Nabin Hait
68f9ad31ae serialized inventory fixes : serial no for sales bom child item and rejected qty 2012-05-09 15:26:27 +05:30
Rushabh Mehta
e45042e011 merge 2012-05-09 12:22:50 +05:30
Nabin Hait
a6b8e84f09 removed whong depends on value 2012-05-08 17:18:40 +05:30
Rushabh Mehta
c22d9e03e7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into cms 2012-05-08 11:02:58 +05:30
Rushabh Mehta
a920943e43 new cms with public folder 2012-05-07 18:00:57 +05:30
Nabin Hait
5f4ca56fd1 Fixes related to renamedt 2012-05-07 11:59:23 +05:30
Nabin Hait
8cf9934b93 Trend analyzer issue fixed 2012-05-04 12:52:56 +05:30
Nabin Hait
978a1e0e46 field rearranged in sales invoice 2012-05-04 11:57:55 +05:30
Rushabh Mehta
7f5791ba1e jv, search fix 2012-05-04 10:10:30 +05:30
Nabin Hait
32826a8cf1 fixes in customerwise price list 2012-05-03 13:10:34 +05:30
Rushabh Mehta
acd0769098 list in listview and sales order fix 2012-05-03 10:20:38 +05:30
Rushabh Mehta
d5e1031f42 floating logo on left 2012-05-02 17:44:59 +05:30
Nabin Hait
ab96d12086 fixes in customerwise price list 2012-05-02 12:19:33 +05:30
Nabin Hait
07c3b399f6 field arrngement fix 2012-05-02 10:00:03 +05:30
Nabin Hait
722bbd8ef0 JV fix 2012-05-01 16:36:51 +05:30
Nabin Hait
796505a83e field arrangement in purchase and stock cycle 2012-05-01 16:26:16 +05:30
Nabin Hait
57d7c815d2 field arrangement in sales cycle 2012-05-01 12:35:12 +05:30
Nabin Hait
926f46f04a Fixed conflict while merging with master 2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-01 11:37:45 +05:30
Nabin Hait
1e335f3272 fixes in validattion of debit to account with customer in sales invoice 2012-05-01 10:53:50 +05:30
Nabin Hait
41c62727c7 fixes in validattion of debit to account with customer in sales invoice 2012-05-01 10:45:47 +05:30
Rushabh Mehta
79a664b4dc cleaned up lead, opportunity, jv 2012-04-30 16:12:03 +05:30
Nabin Hait
0d1daa8875 fld order change 2012-04-27 13:56:58 +05:30
Nabin Hait
a6b7886175 resolved conflict while merging with master 2012-04-26 13:02:36 +05:30
Nabin Hait
50c799880a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-26 12:47:30 +05:30
Nabin Hait
04a276c934 Error fixed in gl netry when negative entry and cancel event 2012-04-25 16:08:45 +05:30
Nabin Hait
8f9a953931 Update erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.py 2012-04-23 19:00:39 +05:30
Nabin Hait
e848300958 patch list modified 2012-04-23 18:24:22 +05:30
Nabin Hait
2bbb086b10 Update erpnext/accounts/doctype/rv_detail/rv_detail.txt 2012-04-23 17:57:18 +05:30
Nabin Hait
b743bb6c10 ledger bal export format changed 2012-04-23 14:03:07 +05:30
Nabin Hait
51834a45a7 purchase invoice with write off feature 2012-04-23 12:47:12 +05:30
Nabin Hait
f7c506d69e fixed conflict while merging with master branch 2012-04-20 13:58:43 +05:30
Nabin Hait
e72ae2a19b fixed conflict 2012-04-20 13:41:09 +05:30
Nabin Hait
0788570ce7 automatically write off feature in sales invoice 2012-04-20 13:31:05 +05:30
Nabin Hait
239e79038f Customer/customer group wise price list 2012-04-20 10:25:03 +05:30
Anand Doshi
f642168a26 hr home: changed Allocate Leaves --> Leave Allocation Tool 2012-04-18 18:35:30 +05:30
Anand Doshi
385380125b fixes in customize form, naming series form loading 2012-04-18 16:04:02 +05:30
Nabin Hait
5da9d56047 removed voucher date filter 2012-04-17 18:05:58 +05:30
Anand Doshi
44f16eaefa Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 13:00:01 +05:30
Anand Doshi
b9e9197e5f fix in doclistview - check if _user_tags exists before rendering 2012-04-17 12:59:18 +05:30
Rushabh Mehta
38bdf6c5e7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 12:41:04 +05:30
Rushabh Mehta
2146fd17e7 new sales_browser 2012-04-17 12:40:37 +05:30
Anand Doshi
24e18569d9 fixes in install docs for roles 2012-04-17 11:45:35 +05:30
Anand Doshi
45a4edc9c9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	css/all-app.css
	version.num
 2012-04-17 11:19:15 +05:30
Rushabh Mehta
71085592a4 fixed account_browser 2012-04-16 18:36:46 +05:30
Rushabh Mehta
6820dbf72d framework build 2012-04-16 13:33:14 +05:30
Rushabh Mehta
f465b4fa76 merge 2012-04-13 19:06:05 +05:30
Rushabh Mehta
850c928a02 started rewrite of accounts browser 2012-04-13 19:04:55 +05:30
Anand Doshi
a202f00dc0 fixes in accounts 2012-04-13 16:03:27 +05:30
Nabin Hait
1c9061eff6 fixed conflict using theirs 2012-04-13 14:24:35 +05:30
Nabin Hait
6c615d9527 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:14:39 +05:30
Anand Doshi
3abe9bd018 fixes in fieldnames and hide unnecessary fields in jv 2012-04-13 12:36:44 +05:30
Anand Doshi
b641ed2a1e Added doc_type to JV Print Formats 2012-04-13 12:27:56 +05:30
Rushabh Mehta
d76146372e merge 2012-04-13 12:01:23 +05:30
Rushabh Mehta
97ae17eaf7 merge 2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76 listing, module pages in appframe 2012-04-13 11:41:43 +05:30
Anand Doshi
83808267d5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:40:38 +05:30
Anand Doshi
1c2ac00a82 fixes in sales cycle 2012-04-13 11:38:01 +05:30
Anand Doshi
f31fc22ef0 fixes in doctype 2012-04-13 11:37:19 +05:30
Nabin Hait
a73b2965aa cleanup and fixes 2012-04-13 11:02:26 +05:30
Anand Doshi
25bc68c7b2 fix in field names 2012-04-12 14:08:43 +05:30
Anand Doshi
654f6bfa85 fixes 2012-04-12 12:15:35 +05:30
Anand Doshi
9e6af24269 fixes in button function calling 2012-04-11 19:07:02 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Nabin Hait
af094b9daf ledger balance export report in new format 2012-04-10 18:07:36 +05:30
Anand Doshi
9afb57ffb2 Syntax error fix in c_form.txt 2012-04-09 12:23:36 +05:30
Anand Doshi
87a2c5cc69 Merge branch 'master' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	erpnext/accounts/doctype/c_form/c_form.txt
	erpnext/patches/patch_list.py
	erpnext/setup/doctype/permission_control/permission_control.py
 2012-04-09 12:14:53 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Nabin Hait
7da6ebc9af Attachment option and total invoiced amt added in c-form 2012-04-06 17:30:53 +05:30
Nabin Hait
05e4fc6eb6 Chart of account/cc link only for accounts user and account manager role in account home page 2012-04-06 15:19:02 +05:30
Anand Doshi
7e0479bc4c cleanup of search criteria 2012-04-05 18:27:56 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Rushabh Mehta
c7f1e5a54a patch fixes 2012-04-02 14:24:35 +05:30
Rushabh Mehta
5475a3ca66 patch fixes 2012-04-02 14:06:46 +05:30
Anand Doshi
0442bc5d63 fix in patch list 2012-04-02 13:09:20 +05:30
Anand Doshi
c88ae2be4d rename dt second cut 2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
37fb9c8f27 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	version.num
 2012-03-29 15:35:08 +05:30
Anand Doshi
7ff696fb12 Merge branch 'renamedt' into shf_rename 
Conflicts:
	erpnext/patches/patch_list.py
 2012-03-29 15:31:17 +05:30
Anand Doshi
fddb782a82 Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt 2012-03-29 15:28:16 +05:30
Nabin Hait
dc8ce0190d Merge branch 'master' into renamedt 2012-03-29 11:53:02 +05:30
Anand Doshi
9767f79845 fix in Sales Order-Receivable Voucher Mapper 2012-03-28 19:25:29 +05:30
Rushabh Mehta
635f359a71 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:18:28 +02:00
Rushabh Mehta
43d64c6116 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:17:59 +02:00
Anand Doshi
2f74d2e7bd Merge branch 'master' of github.com:webnotes/erpnext 2012-03-28 18:34:50 +05:30
Anand Doshi
779a365420 fix in print hide of amount in words 2012-03-28 18:31:26 +05:30
Anand Doshi
18ffd2a1b8 Merge branch 'master' into handlerupdate 2012-03-28 17:56:33 +05:30
Anand Doshi
c9456c18dc listviews 2012-03-28 17:48:30 +05:30
Rushabh Mehta
0dfa140b7d Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 10:42:20 +02:00
Nabin Hait
e6340f26c2 mapper fix in DN_RV 2012-03-28 14:11:31 +05:30
Rushabh Mehta
bb769c5461 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 08:04:17 +02:00
Nabin Hait
6ed0450dba reload mapper for checking ref value 2012-03-28 11:32:44 +05:30
Anand Doshi
2513e50dc4 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge 
Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
 2012-03-27 19:37:10 +05:30
Anand Doshi
a30fbd004e merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
Nabin Hait
a0a3ca3178 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-27 17:09:03 +05:30
Anand Doshi
3107096890 Merge branch 'master' of github.com:webnotes/erpnext into shf_merge 2012-03-27 15:02:38 +05:30
Rushabh Mehta
91c79305e8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 12:11:22 +02:00
Nabin Hait
854935f12c added docstatus in item get_query in PV 2012-03-26 15:40:56 +05:30
Anand Doshi
c009450ef0 fix in item addition - details fetching 2012-03-26 14:17:30 +05:30
Anand Doshi
5f9501d4d8 Merge branch 'sync_file_db' into shf_merge 
Conflicts:
	erpnext/projects/doctype/project/project.txt
 2012-03-23 14:51:35 +05:30
Nabin Hait
f88326ba3f sync ref db 2012-03-22 15:07:05 +05:30
Rushabh Mehta
27cf13b541 merge 2012-03-22 11:37:56 +05:30
Rushabh Mehta
3f46696db2 removed slider ui 2012-03-22 11:37:08 +05:30
Nabin Hait
f676824791 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 17:08:35 +05:30
Rushabh Mehta
2d229b423e Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 12:28:42 +01:00
Nabin Hait
d551281cbe cdt not defined fixed 2012-03-21 16:57:08 +05:30
Nabin Hait
0ad2ef2111 sync with respect to file 2012-03-21 15:02:39 +05:30
Nabin Hait
e8da15cb5b sync ref file 2012-03-21 12:45:14 +05:30
Rushabh Mehta
f74ef4c64b Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 07:18:41 +01:00
Rushabh Mehta
a665c1f60d stylefixes and listviews 2012-03-21 11:47:58 +05:30
Rushabh Mehta
dad4e3ebac Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 07:17:28 +01:00
Nabin Hait
5f04061291 changes in recurring invoice print format 2012-03-21 11:47:00 +05:30
Rushabh Mehta
454c6ac716 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 05:42:31 +01:00
Rushabh Mehta
437c1b512c listview update and form fix 2012-03-20 18:45:28 +05:30
Nabin Hait
ba62cf3b5a Merge branch 'master' of github.com:webnotes/erpnext 2012-03-20 17:40:16 +05:30
Nabin Hait
39c26f4580 billing period in recurring sales invoice mail 2012-03-20 17:39:48 +05:30
Nabin Hait
ceb9f41f15 lead organization fld added in quotation for printing: patch 2012-03-20 17:04:32 +05:30
Anand Doshi
d05aad6474 fix in POS invoice 2012-03-20 12:33:02 +05:30
Anand Doshi
4f5e92a06c Merge branch 'master' of github.com:webnotes/erpnext 2012-03-20 12:17:50 +05:30
Anand Doshi
3401086d66 POS Invoice fix 2012-03-20 12:07:18 +05:30
Rushabh Mehta
d48417c93b slide navigation fixes 2012-03-19 18:42:13 +05:30
Rushabh Mehta
ffe9d358e8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 12:40:07 +01:00
Nabin Hait
65ad3b1a0f Update erpnext/accounts/search_criteria/trial_balance/trial_balance.py 2012-03-19 17:09:14 +05:30
Rushabh Mehta
6498cee998 fixed conflict 2012-03-19 09:01:16 +01:00
Nabin Hait
b6cd3316c4 error fixed in lease receipts client wise 2012-03-19 13:27:06 +05:30