Commit Graph

631 Commits

Author SHA1 Message Date
Nabin Hait
6ac6858571 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-09 16:56:59 +05:30
Nabin Hait
e1b2ae5739 [fixes] float precision for pur invoice 2013-05-09 16:56:19 +05:30
Anand Doshi
ef06a4b349 [autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype 2013-05-09 15:13:47 +05:30
Anand Doshi
bddd5d9b0c [rename] [fix] merge should be passed to on_rename method of controller for further processing 2013-05-09 12:45:18 +05:30
Anand Doshi
c414175a44 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-05-08 11:45:32 +05:30
Nabin Hait
f7bdf8e05a [fixes][jv] set clearance date as null on saving document 2013-05-07 16:48:55 +05:30
Nabin Hait
04f888fa52 [fixes] item_code non-mandatory in item if naming_series 2013-05-07 16:03:10 +05:30
Nabin Hait
620576080a [fixes][currency symbol] fieldtype in report 2013-05-07 12:03:33 +05:30
Nabin Hait
a55723bea2 [report] sales partners commission 2013-05-06 12:46:07 +05:30
Anand Doshi
4cea651a36 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-05-06 11:36:51 +05:30
Nabin Hait
e23d2a35c4 [fixes] sales/purchase register 2013-05-06 11:08:21 +05:30
Anand Doshi
2a9735a2f1 [pos setting] [permission] removed system manager permission 2013-05-03 14:48:13 +05:30
Anand Doshi
0f5f584651 [stock entry] [test] fixes in test cases 2013-05-03 14:34:12 +05:30
Anand Doshi
d2b8b83e20 [sales invoice] [fetching] fetch customer info, pos settings and item details if not fetched 2013-05-03 13:22:41 +05:30
Anand Doshi
855cf8db21 Merge branch 'pos_fetch' 2013-05-03 11:23:01 +05:30
Nabin Hait
4d7a1c1f35 [script report] payments made with ageing 2013-05-02 15:19:00 +05:30
Nabin Hait
d7889cd5d5 [script report] payment collection with ageing 2013-05-02 12:14:59 +05:30
Nabin Hait
02bc8bfe7e Merge branch 'master' of github.com:webnotes/erpnext 2013-05-02 11:39:43 +05:30
Nabin Hait
81bbfba0cc [hr] allowed rename in earning and deduction type 2013-05-02 11:27:25 +05:30
Nabin Hait
006d074b26 [script report] collection report 2013-05-01 15:05:29 +05:30
Anand Doshi
2aa9724c6a Merge branch 'master' into pos_fetch 2013-05-01 13:07:42 +05:30
Nabin Hait
e388465e17 [script report] bank clearance summary 2013-05-01 12:23:07 +05:30
Anand Doshi
672cb0c02b Merge branch 'master' of github.com:webnotes/erpnext 2013-05-01 12:04:03 +05:30
Anand Doshi
91e4c14470 [fixes] [__islocal] use doc.fields.get('__islocal') instead of doc.__islocal 2013-05-01 12:00:44 +05:30
Nabin Hait
76646fb279 [script report] bank reconciliation statement in new style 2013-05-01 11:23:44 +05:30
Nabin Hait
84e2af2212 [report] add total row 2013-04-30 18:08:43 +05:30
Nabin Hait
98cfe688a8 [script report] purchase register in new style 2013-04-30 17:22:43 +05:30
Anand Doshi
457cd7d1f4 [gl entry] [validation] company match validation should be done only for is_cancelled = No 2013-04-29 13:01:44 +05:30
Nabin Hait
99883420e7 [general ledger][fixes] for against_account value 2013-04-29 12:17:05 +05:30
Anand Doshi
c9897ff533 Merge branch 'edge'
Conflicts:
	home/page/latest_updates/latest_updates.js
2013-04-29 10:42:21 +05:30
Anand Doshi
edc5f2edd0 [sales invoice] [fetching] fetch pos values and customer address contact values 2013-04-26 17:21:49 +05:30
Nabin Hait
205f7ce620 validation for stock and nonstock items in purchase cycle 2013-04-26 13:35:06 +05:30
Nabin Hait
5c2cb74e7a [script report] sales register migrated into new script report 2013-04-24 15:46:09 +05:30
Anand Doshi
a63b9e7762 Merge branch 'master' into edge 2013-04-23 16:29:33 +05:30
Nabin Hait
b2972dca98 [script report] accounts payable migrated to new style 2013-04-23 15:53:33 +05:30
Nabin Hait
ebd514442a [script report] accounts payable migrated to new style 2013-04-23 15:36:26 +05:30
Anand Doshi
dc0f2d2422 Merge branch 'master' into edge
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
2013-04-23 12:42:18 +05:30
Anand Doshi
6b66811aec Merge branch 'master' into edge 2013-04-22 13:59:59 +05:30
Nabin Hait
79269e9382 fixed conflict 2013-04-22 13:17:24 +05:30
Nabin Hait
e7366f763b [report] accounts receivable migrated into new style 2013-04-22 13:14:52 +05:30
Anand Doshi
faab3c4cf2 [listview] [label] show appropriate tooltip for bar graph 2013-04-22 12:20:09 +05:30
Nabin Hait
f19822b041 fixes in sales/purchase invoice list view 2013-04-22 12:01:01 +05:30
Anand Doshi
90dad5c5b5 Merge branch 'master' into edge 2013-04-19 11:43:16 +05:30
Nabin Hait
bbd8dddd56 allowed rename for mode of payment 2013-04-19 11:01:03 +05:30
Anand Doshi
8f92607dc4 [gl entry] [validation] validate if cost center belongs to given company 2013-04-18 16:21:01 +05:30
Anand Doshi
5717fe3aba [cost center] [default value] default cost center for each company, auto set default cost center for various transactions during creation 2013-04-17 18:02:52 +05:30
Anand Doshi
c6aecb3f97 Merge branch 'master' into edge
Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
2013-04-16 21:32:06 +05:30
Anand Doshi
b094ae7f23 [general ledger] [fix] renamed function 2013-04-12 20:19:10 +05:30
Anand Doshi
36ecbbd9e8 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-04-12 15:41:31 +05:30
Nabin Hait
d246de8417 [fixes][account][packing slip] 2013-04-11 15:31:41 +05:30