Commit Graph

5925 Commits

Author SHA1 Message Date
Nabin Hait
02bc8bfe7e Merge branch 'master' of github.com:webnotes/erpnext 2013-05-02 11:39:43 +05:30
Rushabh Mehta
ecb36f2cb0 [purchase] [validation] validate warehouse belongs to company if set 2013-05-02 11:34:37 +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
447008b045 Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	patches/april_2013/p05_update_file_data.py
2013-05-01 14:48:16 +05:30
Anand Doshi
e97b07e43f [backup manager] [fix] manage mysql connection 2013-05-01 14:12:19 +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
4120ffefa1 [project] [query] removed debug 2013-05-01 12:14:57 +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
Rushabh Mehta
3ddc524361 [form] [comments] fixed 2013-04-30 16:50:48 +05:30
Anand Doshi
d7ad13a8a7 [price list] [country] specify country for a price list 2013-04-29 19:38:34 +05:30
Anand Doshi
fe9c1eb5df [support ticket] clear assign to on closing ticket 2013-04-29 16:36:59 +05:30
Anand Doshi
fe5fb33cc2 [patch] [file data] fix 2013-04-29 15:27:57 +05:30
Anand Doshi
28eae6e9ff [patch] [file data] fix 2013-04-29 15:25:52 +05:30
Anand Doshi
bbc6cfac25 Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	patches/patch_list.py
2013-04-29 15:23:30 +05:30
Anand Doshi
eda17eb20a [patch] [fiel data] new patch p07_update_file_data_2 2013-04-29 15:21:30 +05:30
Nabin Hait
7ee7eae3ae [item][validation] some validation only after saving 2013-04-29 15:10:39 +05:30
Nabin Hait
7b596d8d88 fixed conflict 2013-04-29 14:37:38 +05:30
Nabin Hait
345c8fbfa2 [patch] rebuild sales browser 2013-04-29 14:35:11 +05:30
Anand Doshi
7bd7c8769e [patch] [file data] files in update file data patch 2013-04-29 14:22:04 +05:30
Anand Doshi
123f59dc89 [patches] [file data] fixes in file data patch 2013-04-29 14:21:42 +05:30
Anand Doshi
e5a36a287f [patch] [file data] patch for custom fields with name file_list 2013-04-29 14:12:27 +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
Anand Doshi
4b6f83ef18 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-29 12:52:10 +05:30
Anand Doshi
ce3296fc87 [rename tool] [fix] condition to validate that content exists in a row of the uploaded file 2013-04-29 12:28:19 +05:30
Nabin Hait
99883420e7 [general ledger][fixes] for against_account value 2013-04-29 12:17:05 +05:30
Nabin Hait
7597330cb6 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-29 11:46:42 +05:30
Nabin Hait
e81b0e2d66 [stock ageing][fixes] for serialized items 2013-04-29 11:45:22 +05:30
Anand Doshi
4cbeda1ec7 [patch] [fix] commented out export_to_files call in p05_update_file_data patch 2013-04-29 10:48:45 +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
319e0f43da [latest updates] added default cost center and update manager 2013-04-29 08:53:12 +05:30
Nabin Hait
6198c28fd3 validation for stock and nonstock items in purchase cycle 2013-04-26 17:29:05 +05:30
Nabin Hait
d58d1b5a18 validation for stock and nonstock items in purchase cycle 2013-04-26 17:25:44 +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
6124247765 [bom] set fetched values at server side 2013-04-26 16:29:06 +05:30
Nabin Hait
04c1f94b4e [DN][usability] copy cost center in each row 2013-04-26 16:27:51 +05:30
Rushabh Mehta
e0ec7b0330 Merge branch 'master' into responsive 2013-04-26 15:41:20 +05:30
Nabin Hait
205f7ce620 validation for stock and nonstock items in purchase cycle 2013-04-26 13:35:06 +05:30
Rushabh Mehta
9c0ccdef26 Merge branch 'master' into responsive 2013-04-26 13:20:39 +05:30
Nabin Hait
794c098e55 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-26 10:49:52 +05:30
Rushabh Mehta
cdc9e2cd6f [patch] [file data] reset permissions 2013-04-25 11:06:17 +05:30
Rushabh Mehta
b7193461bc Merge branch 'master' into edge 2013-04-25 10:57:19 +05:30
Rushabh Mehta
d9ad2e0271 [master database] [patched] updated patched master.sql.gz 2013-04-25 10:31:36 +05:30
Anand Doshi
1ae95518f1 Merge branch 'master' into edge 2013-04-24 18:54:11 +05:30
Anand Doshi
181bcd015d [bom] [fixes] fixes in bom 2013-04-24 18:52:41 +05:30