Commit Graph

956 Commits

Author SHA1 Message Date
Nabin Hait
c43d58ac79 Delete Property Setters for Custom Fields, and set them inside Custom Field 2014-01-13 17:55:24 +05:30
Nabin Hait
55387aa931 Fixed conflict 2014-01-10 16:31:48 +05:30
Nabin Hait
03463ef73b Move related property setters to custom field property 2014-01-10 16:28:41 +05:30
Anand Doshi
102b417b52 Fix: Typo on patch 2014-01-09 11:39:10 +05:30
Akhilesh Darjee
029f698c65 patch for item price and price list 2014-01-07 19:43:35 +05:30
Akhilesh Darjee
806017c92a Price List and Item Price : Validfor Buying and Selling as separate check box 2014-01-07 18:37:38 +05:30
Akhilesh Darjee
25a4bd02f4 [fix] [minor] update item_name and description in item price 2013-12-24 11:32:57 +05:30
Pratik Vyas
104deeebb5 reload packed item in patch, for migration from slow branch 2013-12-19 19:16:00 +05:30
Pratik Vyas
fe6409debf fix company email digest patch 2013-12-19 11:41:10 +05:30
Nabin Hait
60ec0128a2 Merge pull request #1205 from akhileshdarjee/master
[fix] [issue] webnotes/erpnext#1191 - set expected delivery date in production order
2013-12-18 20:03:36 -08:00
Akhilesh Darjee
2d0e31b479 [fix] [minor] merge conflict fixed 2013-12-18 13:32:37 +05:30
Akhilesh Darjee
2678ed181a [fix] [issue] webnotes/erpnext#1191 - set expected delivery date in production order 2013-12-18 13:28:40 +05:30
Anand Doshi
1fce0b1f79 [fix] scheduler error email digest 2013-12-18 13:22:18 +05:30
Anand Doshi
0b1a8e13fd [patch] Email Digest 2013-12-18 07:53:49 +05:30
Nabin Hait
ceb940ec17 [reports] [minor] patch to delete old report files 2013-12-17 17:53:05 +05:30
Nabin Hait
592d27e7f1 [reports] general ledger: grid report to script report 2013-12-17 16:20:11 +05:30
Nabin Hait
8b7da55617 Merge branch 'develop' of github.com:webnotes/erpnext into reports 2013-12-17 16:10:06 +05:30
Nabin Hait
ea4f66791e Merge branch 'develop' of github.com:webnotes/erpnext into reports 2013-12-16 15:18:34 +05:30
Anand Doshi
b0636edaf7 [minor] [scheduler] send scheduler errors as email digest 2013-12-16 13:56:03 +05:30
Pratik Vyas
d701e83961 [minor] make slow branch migratable to master 2013-12-05 18:05:07 +05:30
Nabin Hait
690c75fa0d [report] migrated stock level report to script report and renamed to Stock Projected Qty 2013-12-04 19:16:32 +05:30
Nabin Hait
462401c4df [minor] fixed conflict 2013-12-04 17:26:22 +05:30
Nabin Hait
9b0a6d426c [patch] [minor] deleted old stock ledger and stock ageing page 2013-12-04 17:18:05 +05:30
Nabin Hait
bc6df5c71b [patch] [minor] deleted old stock ledger and stock ageing page 2013-12-04 16:42:23 +05:30
Akhilesh Darjee
7e37b00d0a [fix] [minor] merge conflict fixed 2013-12-02 18:02:45 +05:30
Akhilesh Darjee
9c0569ee2d [report] payment collection with ageing and payment made with ageing merged to payment period based on invoice date 2013-12-02 17:58:23 +05:30
Nabin Hait
3027241150 Merge pull request #1136 from anandpdoshi/migrate-grid-reports
[minor] stock ledger report as script report
2013-12-02 00:57:23 -08:00
Anand Doshi
56a3165ac8 [minor] stock ledger report as script report
Issue #1121
2013-12-02 12:49:02 +05:30
Pratik Vyas
7e8f98368a [fix] allow lot of queries in update comments patch 2013-11-29 19:57:38 +05:30
Anand Doshi
39896233fa [minor] patch list 2013-11-29 16:41:09 +05:30
Anand Doshi
cfd33d2a1d [docs] removed from repository 2013-11-27 19:01:31 +05:30
Nabin Hait
ceda0d772e [fix] [minor] fixes in patch 2013-11-27 11:02:50 +05:30
Nabin Hait
e3eafd94ff Merge pull request #1100 from akhileshdarjee/master
[fix] [minor] patch for fixing report columns in defaults
2013-11-26 21:26:08 -08:00
Nabin Hait
6a3f0a8b0f [fix] [minor] naming series patch fix 2013-11-26 17:59:11 +05:30
Akhilesh Darjee
259208187c [fix] [minor] patch for fixing report columns in defaults 2013-11-26 16:35:50 +05:30
Akhilesh Darjee
60ae96d588 [fix] [minor] merge conflict fixed 2013-11-26 11:21:07 +05:30
Akhilesh Darjee
ec0da0b177 [fix] [setup_wizard] fiscal year fix for setup wizard 2013-11-25 19:51:18 +05:30
Nabin Hait
4ccb2edbfd Merge branch 'master' of github.com:webnotes/erpnext 2013-11-22 18:10:46 +05:30
Anand Doshi
ef114773a6 [minor] [website] brand_html 2013-11-22 13:25:58 +05:30
Rushabh Mehta
ef80282388 [minor] fix whitespace in patch_list 2013-11-22 13:14:12 +05:30
Rushabh Mehta
bc7358a12e [comment] [minor] added patch to update 2013-11-22 12:22:41 +05:30
Nabin Hait
8eb0c61649 [minor] merge conflict fixed 2013-11-21 12:28:50 +05:30
Rushabh Mehta
ad45e31356 [copyright] added Contributors 2013-11-20 13:00:28 +05:30
Anand Doshi
c3c38d38f0 [minor] [fix] style settings 2013-11-20 12:09:21 +05:30
Anand Doshi
aa14f03f5c [minor] [fix] website sitemap reload 2013-11-20 11:51:42 +05:30
Rushabh Mehta
4e67b109f3 [website sitemap] [minor] fix and added patch 2013-11-19 16:39:54 +05:30
Rushabh Mehta
04cc5155f7 Added Notification Control for caching notifications probably causing the freezing problem 2013-11-18 13:23:20 +05:30
Anand Doshi
2b71380f1f [minor] [patch] update reqd fields in reports 2013-11-16 12:33:34 +05:30
Nabin Hait
d42c3e0f48 [fix] [minor] fixes in patch 2013-11-15 23:38:09 +05:30
Anand Doshi
0c26f8116d Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
	accounts/doctype/account/account.py
	controllers/accounts_controller.py
	patches/patch_list.py
	selling/doctype/sales_common/sales_common.py
	stock/doctype/purchase_receipt/purchase_receipt.py
2013-11-15 19:12:09 +05:30