Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,347 Commits 3 Branches 0 Tags 1 GiB
157b6856c4
Commit Graph

416 Commits

Author SHA1 Message Date
Anand Doshi
ed7cf1bced [backup manager] [fixes] fixes in dropbox and google drive 2013-04-23 14:23:03 +05:30
Anand Doshi
a536eef393 Merge branch 'master' into edge 2013-04-23 13:10:55 +05:30
Anand Doshi
76d7ec51fb [backup manager] [fixes] fix in dropbox folder path 2013-04-23 13:05:40 +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
890265928b [backup manager] [error handling] on error, send complete traceback as email 2013-04-23 12:30:38 +05:30
Rushabh Mehta
4c3419bee0 Merge branch 'master' into edge 2013-04-22 14:03:31 +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
2b349d38d9 Merge branch 'master' into edge 2013-04-17 15:10:47 +05:30
Anand Doshi
d484b380ad [email digest] [sender] sender should be the automail id specified in Email Settings 2013-04-17 15:10:08 +05:30
Anand Doshi
e776742f5d [company] [cleanup] on_rename method 2013-04-17 13:19:35 +05:30
Rushabh Mehta
0c1611219e [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 13:54:13 +05:30
Rushabh Mehta
33075e1f69 [files] [patch] dropped file_list property and moved links to 2013-04-10 11:08:50 +05:30
Nabin Hait
2b61f6142a fixed conflict 2013-04-08 12:44:57 +05:30
Nabin Hait
a477d41843 [aii] some fixes 2013-04-08 12:39:11 +05:30
Rushabh Mehta
cfa663e337 [message] [fix] rewire to core 2013-04-04 10:02:08 +05:30
Rushabh Mehta
d8cf1d74ba Merge branch 'master' into edge 2013-04-03 16:39:02 +05:30
Rushabh Mehta
27c4079ff9 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:44 +05:30
Rushabh Mehta
5c12765313 [merge] 2013-04-02 10:51:11 +05:30
Rushabh Mehta
9db1a68d89 [website] [cleanup] moved website generic utils to framework 2013-04-02 10:41:37 +05:30
Anand Doshi
bdedd555ca [setup] [update manager] renamed update-this-app page to update-manager 2013-04-01 16:51:33 +05:30
Anand Doshi
72b28807d2 [setup] [feature] Update Manager for self hosted applications based on wnframework 2013-04-01 16:40:19 +05:30
Rushabh Mehta
6d61024e9e Merge branch 'master' of github.com:webnotes/erpnext 2013-04-01 15:05:13 +05:30
Rushabh Mehta
9f43fc50ad [website] [product list] image clickable 2013-04-01 12:12:47 +05:30
Nabin Hait
787c02ee42 aii fixes 2013-03-29 16:42:33 +05:30
Nabin Hait
acecb94a0f patch: update item tax rate in json format 2013-03-29 10:48:41 +05:30
Rushabh Mehta
7ab3267886 updated item group limit to 100 2013-03-28 17:09:23 +05:30
Nabin Hait
41fe3567bb fixed conflict and aii check in global defaults 2013-03-28 15:54:11 +05:30
Anand Doshi
9d601d593d removed in dialog from activity type 2013-03-28 11:49:00 +05:30
Rushabh Mehta
06e3ef055b Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 12:47:51 +05:30
Rushabh Mehta
4731fb999c [feature] [fix] utilities/rename tool upgraded to upload multiple items 2013-03-26 12:47:19 +05:30
Anand Doshi
fc33ef6bfb fixes in purchase invoice 2013-03-26 12:13:14 +05:30
Nabin Hait
82be7dc301 fixed conflict 2013-03-25 18:30:15 +05:30
Nabin Hait
557d858d89 aii: patches and default values fetching 2013-03-25 18:28:16 +05:30
Rushabh Mehta
74506e96d3 [profile/email] [feature] added option not to send print as email body. fix in profile delete 2013-03-25 17:52:14 +05:30
Rushabh Mehta
df8b652402 [accounts] [feature] added default_cash_account in company and gets set in Journal Voucher 2013-03-25 15:44:36 +05:30
Rushabh Mehta
c5570c6341 added warehouse company validation, if warehouse is added to company 2013-03-25 15:21:24 +05:30
Nabin Hait
0931642c3a fixes in backup_dropbox 2013-03-25 11:54:42 +05:30
Nabin Hait
690fefe9c1 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-25 11:07:38 +05:30
Nabin Hait
0fc2454384 aii: patches and fine tuning 2013-03-25 11:06:00 +05:30
Anand Doshi
44e35ab231 removed unnecessary imports from backup manager files 2013-03-22 18:47:52 +05:30
Anand Doshi
aeed499d12 Merge branch 'master' into edge 
Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py
 2013-03-22 18:43:47 +05:30
Rushabh Mehta
af578d73ef merge 2013-03-21 17:40:08 +05:30
Rushabh Mehta
bed19ac4d3 added website pages for orders, tickets and added sales invoice print format 2013-03-21 17:12:25 +05:30
Akhilesh Darjee
4e7a58608f google drive redirect url fixed. 2013-03-20 16:33:02 +05:30
Akhilesh Darjee
ba9ecaeef7 backup dropbox and googledrive problems fixed. 2013-03-20 13:47:17 +05:30
Akhilesh Darjee
3abf67cf5e dropbox and googledrive problems fixed 2013-03-20 13:25:28 +05:30
Akhilesh Darjee
3433f11abe Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-20 12:50:57 +05:30
Nabin Hait
aa6f939b86 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-20 11:43:47 +05:30
Akhilesh Darjee
4ff94e389e dropbox chunked uploader fixed. 2013-03-20 11:20:47 +05:30
Akhilesh Darjee
09957b61c8 Dropbox upload chunked fixed. 2013-03-20 10:21:51 +05:30
Nabin Hait
8803df04cc aii: get_query for default account in company 2013-03-19 18:53:00 +05:30
Anand Doshi
9bddd83604 fix in global defaults 2013-03-19 18:40:35 +05:30
Nabin Hait
364f08a171 fixed conflict 2013-03-19 18:29:05 +05:30
Nabin Hait
80abad2ee0 aii: default account from company 2013-03-19 18:18:52 +05:30
Nabin Hait
d98e511c8b deafult account creation in company 2013-03-19 12:45:02 +05:30
Nabin Hait
e68103be30 fixes in reorder level and company 2013-03-19 12:34:47 +05:30
Nabin Hait
928355ad9a Merge branch 'master' of github.com:webnotes/erpnext 2013-03-19 12:02:13 +05:30
Nabin Hait
89a94d8135 aii: stock reconciliation with test case 2013-03-19 12:01:46 +05:30
Rushabh Mehta
a54cb247c4 webshop login, logout 2013-03-19 11:12:22 +05:30
Anand Doshi
f11e2f8f6f Merge branch 'master' of github.com:webnotes/erpnext into sales_purchase_return 
Conflicts:
	patches/patch_list.py
 2013-03-18 17:42:08 +05:30
Rushabh Mehta
edf639b607 fixed backup/gdrive 2013-03-18 12:48:34 +05:30
Akhilesh Darjee
b0f0e7a82f added backup_googledrive.py in backup_manager 2013-03-18 11:15:44 +05:30
Akhilesh Darjee
d3a30d84df Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-15 16:23:59 +05:30
Akhilesh Darjee
479af526b0 Backup commited. 2013-03-15 16:17:31 +05:30
Anand Doshi
23d742693a Merge branch 'master' into sales_purchase_return 2013-03-13 14:01:34 +05:30
Anand Doshi
71bed3116f working on merging sales purchase return into stock entry 2013-03-13 12:57:04 +05:30
Rushabh Mehta
6a4c468219 fix in about 2013-03-12 14:59:46 +05:30
Rushabh Mehta
11b1fb811f fixes to about us 2013-03-12 14:28:29 +05:30
Nabin Hait
8c7234f270 aii: gl_entries for sales invoice 2013-03-11 16:32:33 +05:30
webnotes
08bd677664 Commit all these files. 2013-03-11 10:43:33 +05:30
Rushabh Mehta
177226616a fix to blog and wnf backup does not backup files 2013-03-08 11:56:52 +05:30
Rushabh Mehta
b6eed77526 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-07 12:26:15 +05:30
Rushabh Mehta
202508410c completed dropbox backup in backup manager 2013-03-07 12:25:21 +05:30
Anand Doshi
80f7637ae6 added print width in txts of istable type doctypes 2013-03-07 11:37:33 +05:30
Rushabh Mehta
8ff938a377 backup manager (wip) 2013-03-06 11:20:56 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Anand Doshi
91484391ce invalidate cache if 'show in website' is unchecked for item and item group 2013-03-04 14:28:38 +05:30
Rushabh Mehta
213b180060 merge, update bean validations 2013-03-01 19:09:06 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
Nabin Hait
380f555a8c fixes in price list currency 2013-02-28 18:41:49 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Anand Doshi
4a7248ee0b commonified some purchase code, added test case for auto inventory accounting for purchase invoice 2013-02-27 18:10:30 +05:30
Anand Doshi
a1d4b78fbe started with Auto Inventory Accounting - test case for purchase receipt 2013-02-26 18:09:47 +05:30
Rushabh Mehta
29786e38df added get_value, fixed appframe from Single 2013-02-26 14:27:03 +05:30
Anand Doshi
bdf4bcc2ed Merge branch 'master' of github.com:webnotes/erpnext 2013-02-25 13:14:09 +05:30
Anand Doshi
98e78e7ccb fixes in email digest 2013-02-25 13:13:04 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
9e02949821 updated language and separated slickgrid files 2013-02-25 11:05:27 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Anand Doshi
135a4ccabd changed modified of global defaults.txt after merge conflict 2013-02-21 11:10:36 +05:30
Anand Doshi
59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge 
Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt
 2013-02-21 11:09:43 +05:30
Rushabh Mehta
833b0f12d5 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 09:48:35 +05:30
Nabin Hait
6f1a5ec209 Disable rounded total feature 2013-02-20 16:25:05 +05:30
Anand Doshi
7ce7d7cad4 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-20 16:08:43 +05:30
Rushabh Mehta
87e4801946 website settings social icons 2013-02-20 15:02:21 +05:30
Nabin Hait
0e5ea316cc fixes in naming series 2013-02-19 16:14:27 +05:30
Rushabh Mehta
5117d9c266 refactored defaults, bin material request wip 2013-02-19 15:27:31 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Rushabh Mehta
c06ce25470 updated translations 2013-02-18 14:24:05 +05:30
Anand Doshi
236cc173ad rename Purchase Request to Material Request 2013-02-18 13:49:15 +05:30
Anand Doshi
d6f97c26e0 show todo and calendar as unorder list 2013-02-16 15:50:57 +05:30
Anand Doshi
d628916a2c email digest for todo and calendar 2013-02-16 14:51:25 +05:30
Anand Doshi
e74a1f2b85 fixes in outstanding amount calculation on cancellation of payment entry 2013-02-14 13:38:12 +05:30
Rushabh Mehta
eaf3de4605 added test runner 2013-02-13 11:59:17 +05:30
Rushabh Mehta
4b9827a5fc upgraded test_runner, now can run multiple tests 2013-02-12 19:20:39 +05:30
Rushabh Mehta
af222dc6b2 updated language 2013-02-11 11:49:18 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Anand Doshi
6209046772 added some test records 2013-02-07 19:47:34 +05:30
Anand Doshi
613cb6a9f9 bug fix in clear unallocated advances 2013-02-06 17:33:46 +05:30
Rushabh Mehta
c2563effbf added test case for leave_application 2013-02-05 23:25:37 +05:30
Rushabh Mehta
4e95bb59a0 added test_runner 2013-02-05 19:20:51 +05:30
Nabin Hait
fb3fd6e3e5 deprecated gl_control and some rewrites 2013-01-30 19:16:13 +05:30
Rushabh Mehta
08da1a0a3d setting list_views 2013-01-29 17:53:29 +05:30
Rushabh Mehta
4dbc813741 removing listviews and added hide_currency_symbol in global defaults 2013-01-28 15:11:18 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Rushabh Mehta
7b563f7569 added translation files 2013-01-28 11:19:03 +05:30
Rushabh Mehta
671538ff8c fixes to currency number formatting - will pick first from currency master and also made explict options for number formatting 2013-01-28 10:42:32 +05:30
Anand Doshi
44077d22cc fixes related to currency and po price list 2013-01-27 17:02:49 +05:30
Rushabh Mehta
83e08362bd nsm bug in customer_group and removed abbr in Cost Center 2013-01-25 15:11:26 +05:30
Nabin Hait
bf8c5033fe Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 12:12:45 +05:30
Nabin Hait
5ce1c668b5 removed default_currency_fraction and default_currency_format from global defaults 2013-01-25 12:06:57 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Rushabh Mehta
4e01011669 added language to pages 2013-01-24 19:31:55 +05:30
Rushabh Mehta
317177afd2 updated languages 2013-01-24 18:18:39 +05:30
Rushabh Mehta
ad14943c3f added arabic 2013-01-24 17:37:43 +05:30
Rushabh Mehta
4c17718b4c added portuguese 2013-01-24 16:31:23 +05:30
Rushabh Mehta
877a1a9274 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-24 15:56:15 +05:30
Rushabh Mehta
908d09d058 added spanish 2013-01-24 15:55:30 +05:30
Rushabh Mehta
27254d9440 added spanish 2013-01-24 15:55:08 +05:30
Nabin Hait
195d579361 check customer/customer_group with same name while creating customer_group/customer 2013-01-24 15:07:24 +05:30
Nabin Hait
8cf90f18f0 check item/item group with same name while creating item group/item 2013-01-24 14:58:21 +05:30
Rushabh Mehta
880a7034c8 global default for currency display 2013-01-24 13:55:44 +05:30
Rushabh Mehta
a90943ff19 added masking for currency fields 2013-01-24 11:59:37 +05:30
Rushabh Mehta
9c77a25cd3 merge 2013-01-23 19:44:35 +05:30
Rushabh Mehta
597d470e63 added format_currency and added options to all currency fields 2013-01-23 19:39:51 +05:30
Nabin Hait
291e8c2545 removed landed cost master 2013-01-23 16:06:44 +05:30
Rushabh Mehta
6382a42dbe more fixes to perms, floats and default enabled / disabled in search 2013-01-23 10:09:28 +05:30
Rushabh Mehta
cd4a854a28 converted currency to float and removed level 1 permissions 2013-01-22 15:10:25 +05:30
Nabin Hait
5b4c294b40 commonified in_words function 2013-01-22 11:12:02 +05:30
Anand Doshi
fc36e57233 fixes in setup control and website contact helper 2013-01-21 19:02:58 +05:30
Nabin Hait
d3b625035c fixes in total_in_words 2013-01-21 17:24:31 +05:30
Rushabh Mehta
a1e8e07fde added number format to global defaults 2013-01-21 16:39:24 +05:30
Rushabh Mehta
4e03ce2107 added number formatter 2013-01-21 16:28:37 +05:30
Rushabh Mehta
bb9968491b added report permissions to txt files 2013-01-21 14:22:07 +05:30
Rushabh Mehta
861b3d6092 merge 2013-01-21 10:23:21 +05:30
Rushabh Mehta
f5b04cff8b added number format, sent country info in boot, link options not extracted from cache 2013-01-21 10:14:10 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list 
Conflicts:
	accounts/doctype/gl_control/gl_control.py
 2013-01-17 20:31:41 +05:30
Anand Doshi
f8f0c0d089 updates in purchase cycle's price list 2013-01-17 20:20:56 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Anand Doshi
9d9aec1ed4 shifted get_company_currency from transaction base to setup/utils.py 2013-01-17 15:44:57 +05:30