Rushabh Mehta
|
36af6a02ad
|
[grid reports] now show by wn.route_options
|
2013-07-01 14:35:57 +05:30 |
|
Nabin Hait
|
ac24d0fa98
|
[fixes] ignore single doctypes in chekcing linked documents
|
2013-07-01 14:03:08 +05:30 |
|
Rushabh Mehta
|
affba2fd99
|
[master.sql.gz] removed. use --install_fresh
|
2013-07-01 13:00:00 +05:30 |
|
Rushabh Mehta
|
e0117896d4
|
[print] fix wnframework #192, fix in journal voucher
|
2013-07-01 12:59:22 +05:30 |
|
Nabin Hait
|
fdbfe1c274
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-01 12:20:19 +05:30 |
|
Nabin Hait
|
b5e58ffa26
|
[rename with merge] updated on_rename function for item, warehouse, al tree type documents
|
2013-07-01 12:20:00 +05:30 |
|
Rushabh Mehta
|
1bcc19e019
|
[item] default warehouse is selected with item
|
2013-07-01 11:46:07 +05:30 |
|
Rushabh Mehta
|
b3f947aca6
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-01 09:36:39 +05:30 |
|
Rushabh Mehta
|
8706ca9445
|
[journal voucher] [added opening entry] [cleanups]
|
2013-07-01 09:36:03 +05:30 |
|
Anand Doshi
|
169cfafe13
|
[customer] [fix] link customer in lead's address when creating customer from lead
|
2013-06-29 17:24:27 +05:30 |
|
Anand Doshi
|
4bef02e46a
|
[minor] removed debug
|
2013-06-28 19:21:44 +05:30 |
|
Anand Doshi
|
971f30a12b
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-28 19:19:04 +05:30 |
|
Anand Doshi
|
8f9f8a43c7
|
[lead] [address] store lead address in Address doctype, with link field=lead
|
2013-06-28 19:18:33 +05:30 |
|
Anand Doshi
|
b78a4e0f80
|
[Newsletter] [fix] in create missing leads
|
2013-06-28 19:17:55 +05:30 |
|
Nabin Hait
|
869913c96b
|
[fixes] setup control
|
2013-06-28 15:00:24 +05:30 |
|
Nabin Hait
|
a18f3e812d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-06-28 13:05:19 +05:30 |
|
Nabin Hait
|
b164edc16f
|
[fix] cleanup data
|
2013-06-28 13:03:39 +05:30 |
|
Rushabh Mehta
|
03e9a4ea11
|
[company] [setup] added on_doctype_update to add indexes, renamed make_obj to make_controller
|
2013-06-28 12:49:28 +05:30 |
|
Nabin Hait
|
0fd1d88710
|
Merge pull request #537 from saurabh6790/master
[Trend Reports] Cleanup
|
2013-06-27 23:17:50 -07:00 |
|
Saurabh
|
d6cc5cd08f
|
[Trends Teports] cleanup
|
2013-06-28 10:09:46 +05:30 |
|
Nabin Hait
|
d122bf51cb
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-06-27 12:22:12 +05:30 |
|
Nabin Hait
|
c35dd968af
|
[fix] invoice with zero values
|
2013-06-27 12:21:34 +05:30 |
|
Anand Doshi
|
b8ea244b9f
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-27 12:17:59 +05:30 |
|
Anand Doshi
|
77cd10b10a
|
[selling] added shipping rule link besides taxes master link field
|
2013-06-27 12:17:34 +05:30 |
|
Rushabh Mehta
|
e5dfc6c440
|
[grid] [bom] fixes erpnext #514, #515, wnframework #187
|
2013-06-27 11:45:47 +05:30 |
|
Nabin Hait
|
16805cff85
|
Merge pull request #534 from akhileshdarjee/master
[Fix]SMS Center & Purchase Register
|
2013-06-26 22:40:43 -07:00 |
|
Akhilesh Darjee
|
f1845cf7c9
|
Removed errprint from purchase register
|
2013-06-27 11:06:11 +05:30 |
|
Akhilesh Darjee
|
16c06dc713
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-27 11:02:22 +05:30 |
|
Akhilesh Darjee
|
f47617c6e6
|
[Fix] Purchase Register
|
2013-06-27 11:01:36 +05:30 |
|
Nabin Hait
|
4924a9f764
|
[fix] payment reconciliation tool
|
2013-06-27 11:01:14 +05:30 |
|
Rushabh Mehta
|
e6d986adea
|
[import] fixes
|
2013-06-27 10:54:49 +05:30 |
|
Rushabh Mehta
|
dd548eeac3
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-27 09:50:04 +05:30 |
|
Rushabh Mehta
|
65d12926fd
|
[setup] bug fixes
|
2013-06-26 22:31:22 +05:30 |
|
Akhilesh Darjee
|
89bd216a0c
|
[Fix] SMS Center
|
2013-06-26 18:28:54 +05:30 |
|
Anand Doshi
|
f7c4d1e807
|
[setup home] moved SMS Settings link to Tools section
|
2013-06-26 17:33:59 +05:30 |
|
Rushabh Mehta
|
5381bdd730
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-26 17:21:03 +05:30 |
|
Rushabh Mehta
|
2f7e1abd0f
|
[setup] new page + minor fixes
|
2013-06-26 17:20:12 +05:30 |
|
Anand Doshi
|
922bb1af46
|
[shipping rule] validations and test cases
|
2013-06-26 17:14:40 +05:30 |
|
Nabin Hait
|
1a8054994e
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-06-26 14:30:03 +05:30 |
|
Anand Doshi
|
70902da4da
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/december_2012/deprecate_tds.py
patches/june_2012/reports_list_permission.py
selling/doctype/sales_bom/locale/_messages_doc.json
selling/doctype/sales_bom/locale/ar-doc.json
selling/doctype/sales_bom/locale/de-doc.json
selling/doctype/sales_bom/locale/es-doc.json
selling/doctype/sales_bom/locale/fr-doc.json
selling/doctype/sales_bom/locale/hi-doc.json
selling/doctype/sales_bom/locale/hr-doc.json
selling/doctype/sales_bom/locale/nl-doc.json
selling/doctype/sales_bom/locale/pt-BR-doc.json
selling/doctype/sales_bom/locale/pt-doc.json
selling/doctype/sales_bom/locale/sr-doc.json
selling/doctype/sales_bom/locale/ta-doc.json
selling/doctype/sales_bom/locale/th-doc.json
selling/doctype/sales_bom_item/locale/_messages_doc.json
selling/doctype/sales_bom_item/locale/ar-doc.json
selling/doctype/sales_bom_item/locale/de-doc.json
selling/doctype/sales_bom_item/locale/es-doc.json
selling/doctype/sales_bom_item/locale/fr-doc.json
selling/doctype/sales_bom_item/locale/hi-doc.json
selling/doctype/sales_bom_item/locale/hr-doc.json
selling/doctype/sales_bom_item/locale/nl-doc.json
selling/doctype/sales_bom_item/locale/pt-BR-doc.json
selling/doctype/sales_bom_item/locale/pt-doc.json
selling/doctype/sales_bom_item/locale/sr-doc.json
selling/doctype/sales_bom_item/locale/ta-doc.json
selling/doctype/sales_bom_item/locale/th-doc.json
|
2013-06-26 14:07:29 +05:30 |
|
Anand Doshi
|
8bef70cceb
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-26 13:53:17 +05:30 |
|
Anand Doshi
|
bd7218979e
|
[shipping rule] added doctypes shipping rule and shipping rule conditions
|
2013-06-26 13:53:01 +05:30 |
|
Nabin Hait
|
e26acffcfe
|
[report] available qty for packing items
|
2013-06-26 13:47:11 +05:30 |
|
Anand Doshi
|
510a45bfb4
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-06-26 12:06:34 +05:30 |
|
Anand Doshi
|
b802050cd4
|
[grid report] round currency values
|
2013-06-26 12:05:37 +05:30 |
|
Nabin Hait
|
329a3df260
|
Merge pull request #530 from akhileshdarjee/master
[Report] Added rounded_total & outstanding_amount to Sales & Purchase Register
|
2013-06-25 23:29:24 -07:00 |
|
Nabin Hait
|
645d3441ef
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-06-26 11:33:25 +05:30 |
|
Akhilesh Darjee
|
4c819edf24
|
[Report] Added rounded_total & outstanding_amount to Sales & Purchase Register
|
2013-06-26 11:28:53 +05:30 |
|
Rushabh Mehta
|
f49f82083f
|
[chart of accounts] added from openerp (remove empty children)
|
2013-06-26 10:10:05 +05:30 |
|
Rushabh Mehta
|
db038fcb5c
|
[chart of accounts] added from openerp
|
2013-06-26 02:14:40 +05:30 |
|