Nabin Hait
|
a279d78496
|
[minor] [fix]
|
2013-07-15 13:04:33 +05:30 |
|
Anand Doshi
|
9b4961400a
|
[minor] [fix] get queries
|
2013-07-11 19:13:58 +05:30 |
|
Anand Doshi
|
34736c8d87
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
|
2013-07-11 18:29:32 +05:30 |
|
Anand Doshi
|
946e0de0cf
|
[minor] [fix]
|
2013-07-11 18:26:00 +05:30 |
|
Nabin Hait
|
cfecd2bc16
|
[fix] [cleanup] fixes while testing and code cleanup
|
2013-07-11 17:49:18 +05:30 |
|
Rushabh Mehta
|
df92a553cb
|
[style] Added Icons to Pages
|
2013-07-11 14:50:43 +05:30 |
|
Anand Doshi
|
63d844b2d2
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/quotation/quotation.py
utilities/transaction_base.py
|
2013-07-10 20:55:15 +05:30 |
|
Anand Doshi
|
2ac0a83bd8
|
[webshop] Place Order - submits Quotation, creates Customer if required, creates and submits Sales Order
|
2013-07-10 20:49:44 +05:30 |
|
Rushabh Mehta
|
982ad35fd2
|
[cleanup] Removed Warehouse Type
|
2013-07-10 18:39:06 +05:30 |
|
Nabin Hait
|
6e68e0e5d8
|
[fix] validate with prev doc
|
2013-07-10 15:33:29 +05:30 |
|
Rushabh Mehta
|
3429b609a7
|
[feature] [grid] Allow Grid viewable columns to be selected via 'In List View'
|
2013-07-10 15:03:37 +05:30 |
|
Nabin Hait
|
253de859b4
|
[fixes] for testcases
|
2013-07-09 11:36:00 +05:30 |
|
Nabin Hait
|
2bd37771ca
|
validate with prevdoc
|
2013-07-08 19:00:29 +05:30 |
|
Rushabh Mehta
|
11d688a536
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 15:14:15 +05:30 |
|
Rushabh Mehta
|
3a3c2710d1
|
[icon] added in doctype
|
2013-07-05 15:13:31 +05:30 |
|
Anand Doshi
|
ef8d3bcb77
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 12:57:41 +05:30 |
|
Anand Doshi
|
901773a139
|
[fresh install] [fix] replace allow roles with explicit has_permission checks for doctype py files
|
2013-07-05 12:57:03 +05:30 |
|
Rushabh Mehta
|
54352c7140
|
[form cleanup]
|
2013-07-05 12:43:59 +05:30 |
|
Anand Doshi
|
99100a4135
|
[webshop] shopping cart settings, update price list, taxes and shipping rule on change of address, apply defaults on creation of fresh quotation
|
2013-07-04 17:13:53 +05:30 |
|
Anand Doshi
|
15db6c4659
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.py
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
buying/doctype/supplier_quotation/supplier_quotation.js
patches/patch_list.py
|
2013-07-02 11:50:32 +05:30 |
|
Anand Doshi
|
2023012b0e
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
utilities/doctype/address/address.txt
|
2013-07-02 11:43:54 +05:30 |
|
Anand Doshi
|
edbf3e1e19
|
[webshop] [addresses] address selector, my addresses list
|
2013-07-02 11:40:16 +05:30 |
|
Rushabh Mehta
|
d420401ba3
|
[moduleview] added top bar
|
2013-07-01 17:15:23 +05:30 |
|
Nabin Hait
|
ac24d0fa98
|
[fixes] ignore single doctypes in chekcing linked documents
|
2013-07-01 14:03:08 +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 |
|
Nabin Hait
|
b164edc16f
|
[fix] cleanup data
|
2013-06-28 13:03:39 +05:30 |
|
Anand Doshi
|
aa0ccf8223
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-17 13:46:55 +05:30 |
|
Anand Doshi
|
b5fd788131
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
projects/doctype/project/project.py
utilities/transaction_base.py
|
2013-06-17 12:55:05 +05:30 |
|
Anand Doshi
|
11d311376e
|
[event] [fix] commonified delete_events method, which is executed before auto-creation of events. Fixed delete issue
|
2013-06-17 12:51:36 +05:30 |
|
Rushabh Mehta
|
64c2764b56
|
[translations/build] deleted translation files (to be built on demand)
|
2013-06-17 11:56:41 +05:30 |
|
Rushabh Mehta
|
37982a6a1f
|
[contact/address] fixed auto setting closes #475 (erpnext)
|
2013-06-14 13:29:20 +05:30 |
|
Anand Doshi
|
060d9248d3
|
[fixes] buying/selling price lists, communication and website settings
|
2013-06-12 17:40:36 +05:30 |
|
Anand Doshi
|
27e6f13b5d
|
[cleanup] deprecated search criteria, amendment_date, cancel_reason
|
2013-06-11 16:23:18 +05:30 |
|
Rushabh Mehta
|
aa069565de
|
[docs] added for support module
|
2013-06-11 10:53:03 +05:30 |
|
Rushabh Mehta
|
c2e20dcf7c
|
[docs] added README.md files for website, utilities
|
2013-06-11 10:43:20 +05:30 |
|
Rushabh Mehta
|
a40c60ea3e
|
[cleanup] removed Trash Control, SMS Receiver, Profile Control, GL Mapper, GL Mapper Detail
|
2013-06-11 10:43:00 +05:30 |
|
Anand Doshi
|
097ac352d6
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-10 15:38:31 +05:30 |
|
Anand Doshi
|
670199b9c6
|
[patch] [fix] event for project, oppty, lead
|
2013-06-10 15:38:01 +05:30 |
|
Anand Doshi
|
7e2010a649
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/patch_list.py
projects/doctype/project/project.py
utilities/transaction_base.py
|
2013-06-10 15:25:07 +05:30 |
|
Anand Doshi
|
e53a81dcea
|
[event] [lead, opportunity, project] [fix] create events
|
2013-06-10 15:15:40 +05:30 |
|
Nabin Hait
|
c6548b64c2
|
[fixes][merge conflict]
|
2013-06-05 12:53:53 +05:30 |
|
Nabin Hait
|
0feebc1a67
|
[status updater] managed by controllers and commonified for sales and purchase
|
2013-06-03 16:45:38 +05:30 |
|
Anand Doshi
|
e961af40fc
|
[transaction] [fix] fix in purchase transactions
|
2013-05-31 14:30:46 +05:30 |
|
Anand Doshi
|
5d74c82c06
|
Merge branch 'webshop' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/quotation/quotation.js
|
2013-05-28 17:46:50 +05:30 |
|
Anand Doshi
|
923d41dfd2
|
[selling/buying] [fixes] fixes in client side code, server side code, print formats
|
2013-05-28 17:23:36 +05:30 |
|
Anand Doshi
|
fc77718a3d
|
[selling/buying] [fixes] updated js files of various doctypes related to selling/g/buying
|
2013-05-27 19:29:07 +05:30 |
|
Anand Doshi
|
5dfba486a6
|
[note] [fix] strip invalid characters from title and set it as the name of the note
|
2013-05-27 12:25:28 +05:30 |
|
Rushabh Mehta
|
43c51b63c4
|
[form] added print email buttons, fixes to editor, note
|
2013-05-24 16:52:21 +05:30 |
|
Rushabh Mehta
|
9c5f4fe165
|
[knowledge base] removed and added patch to move to notes
|
2013-05-24 16:33:10 +05:30 |
|
Rushabh Mehta
|
126f2c62f2
|
[merge] merge with master
|
2013-05-24 16:09:13 +05:30 |
|
Rushabh Mehta
|
9b10e362f7
|
[form/list] ui fixes, [note] new table to merge question + answer
|
2013-05-24 16:00:56 +05:30 |
|
Rushabh Mehta
|
4a2f0f8c36
|
[js-libs] upgraded to latest bootstrap and font-awesome
|
2013-05-22 11:57:05 +05:30 |
|
Anand Doshi
|
f309613a7d
|
[selling] [calculations] client side calculations, cleanup, patch fixes
|
2013-05-21 19:35:06 +05:30 |
|
Anand Doshi
|
1dde46aff0
|
[buying, selling] [refactor] get item details
|
2013-05-15 21:15:57 +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 |
|
Rushabh Mehta
|
f514998011
|
merge
|
2013-05-09 11:42:35 +05:30 |
|
Rushabh Mehta
|
d3e00995db
|
[conflicts] [merged]
|
2013-05-02 16:02:59 +05:30 |
|
Anand Doshi
|
2aa9724c6a
|
Merge branch 'master' into pos_fetch
|
2013-05-01 13:07:42 +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 |
|
Anand Doshi
|
edc5f2edd0
|
[sales invoice] [fetching] fetch pos values and customer address contact values
|
2013-04-26 17:21:49 +05:30 |
|
Rushabh Mehta
|
cc32b65b66
|
[toolbars] [design] commonified into common toolbar
|
2013-04-19 13:01:32 +05:30 |
|
Rushabh Mehta
|
d6c8235fb5
|
[style] [upgrade] moved to bootstrap 3
|
2013-04-18 17:43:21 +05:30 |
|
Rushabh Mehta
|
f61b680576
|
[style] moving to 100% bootstrap css, started form / appframe headers
|
2013-04-16 15:45:05 +05:30 |
|
Rushabh Mehta
|
ac118c8822
|
[cleanup] started responsive layouts and removed tinymce
|
2013-04-15 17:02:20 +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
|
6de5eb466c
|
role added in some pages
|
2013-04-09 11:52:18 +05:30 |
|
Nabin Hait
|
8022a439a8
|
role added in some pages
|
2013-04-09 11:49:42 +05:30 |
|
Rushabh Mehta
|
4b9a3ed8a0
|
[knowledge base] added all permissions
|
2013-04-09 10:27:06 +05:30 |
|
Rushabh Mehta
|
cfa663e337
|
[message] [fix] rewire to core
|
2013-04-04 10:02:08 +05:30 |
|
Rushabh Mehta
|
27c4079ff9
|
[framework] [cleanup] desktop, todo, messages, modules setup moved to framework
|
2013-04-03 15:21:44 +05:30 |
|
Nabin Hait
|
1e3fc88940
|
[quotation][improvement] when made from lead
|
2013-04-02 18:13:20 +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
|
acec0227c5
|
fixes in stock entry
|
2013-03-26 12:33:43 +05:30 |
|
Anand Doshi
|
ee3d5cc621
|
added validate posting time method
|
2013-03-13 12:58:54 +05:30 |
|
Nabin Hait
|
bffbc18b2d
|
fixes in cleanup data
|
2013-03-12 10:41:21 +05:30 |
|
Anand Doshi
|
b7af3d033e
|
changed field contact_no to phone in lead details of transaction base
|
2013-03-07 12:17:52 +05:30 |
|
Anand Doshi
|
80f7637ae6
|
added print width in txts of istable type doctypes
|
2013-03-07 11:37:33 +05:30 |
|
Nabin Hait
|
87b9cd5ba1
|
use get_global_default instead of control panel
|
2013-03-06 13:15:08 +05:30 |
|
Rushabh Mehta
|
07287e8b93
|
removed colour fields from txt files
|
2013-03-05 14:19:48 +05:30 |
|
Rushabh Mehta
|
213b180060
|
merge, update bean validations
|
2013-03-01 19:09:06 +05:30 |
|
Anand Doshi
|
3e157ec2ea
|
show pin code after state instead of after city in address display
|
2013-03-01 17:55:37 +05:30 |
|
Rushabh Mehta
|
b21eb9ac09
|
added time log batch
|
2013-02-28 18:42:46 +05:30 |
|
billyfordson
|
9b352309c6
|
Adding German translation
|
2013-02-27 17:36:23 +01:00 |
|
Nabin Hait
|
bdd8fcf7d4
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-25 16:49:33 +05:30 |
|
Nabin Hait
|
3be594a7ed
|
fixes in sms control
|
2013-02-25 16:48:44 +05:30 |
|
Anand Doshi
|
b60aef5595
|
added report button in todo page
|
2013-02-25 15:22:20 +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
|
0ad995460c
|
fixed tags in kb
|
2013-02-22 10:34:22 +05:30 |
|
Rushabh Mehta
|
f41dd39286
|
added language
|
2013-02-21 16:57:54 +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 |
|
Rushabh Mehta
|
bf4ef36341
|
removed calendar and fix
|
2013-02-16 10:44:51 +05:30 |
|
Anand Doshi
|
9cde1bbb0e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-15 18:29:22 +05:30 |
|
Anand Doshi
|
0bf801af62
|
email to leave approver and employee
|
2013-02-15 18:27:05 +05:30 |
|
Rushabh Mehta
|
1a9f0848b3
|
added calendar view
|
2013-02-15 12:09:05 +05:30 |
|
Rushabh Mehta
|
6227527cdb
|
added leave applications and block lists to calendar
|
2013-02-14 20:42:33 +05:30 |
|
Rushabh Mehta
|
b496756696
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-14 17:35:32 +05:30 |
|
Rushabh Mehta
|
5eb37647cf
|
added new calendar and renamed holiday block list
|
2013-02-14 17:34:51 +05:30 |
|
Anand Doshi
|
13dc9f3b1f
|
shifted get_url to startup
|
2013-02-13 23:42:48 +05:30 |
|
Rushabh Mehta
|
4b9827a5fc
|
upgraded test_runner, now can run multiple tests
|
2013-02-12 19:20:39 +05:30 |
|
Rushabh Mehta
|
176829e53c
|
added status to Contact and fix bug in communication pull
|
2013-02-11 14:54:30 +05:30 |
|
Rushabh Mehta
|
60135df6fd
|
updated language
|
2013-02-11 11:44:12 +05:30 |
|
Nabin Hait
|
a76a0687ef
|
get_query continued
|
2013-02-08 14:04:13 +05:30 |
|
Rushabh Mehta
|
4f8dfd69f9
|
messages.py use begin/commit for messages
|
2013-02-03 22:42:05 +05:30 |
|
Nabin Hait
|
53595c6521
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-30 12:49:44 +05:30 |
|
Nabin Hait
|
bf495c9a6d
|
GL Control rewrite and many other cleanup using inheritence
|
2013-01-30 12:49:08 +05:30 |
|
Rushabh Mehta
|
08da1a0a3d
|
setting list_views
|
2013-01-29 17:53:29 +05:30 |
|
Rushabh Mehta
|
cda5d42a65
|
updated languages
|
2013-01-28 14:21:40 +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
|
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
|
908d09d058
|
added spanish
|
2013-01-24 15:55:30 +05:30 |
|
Nabin Hait
|
291e8c2545
|
removed landed cost master
|
2013-01-23 16:06:44 +05:30 |
|
Rushabh Mehta
|
cd4a854a28
|
converted currency to float and removed level 1 permissions
|
2013-01-22 15:10:25 +05:30 |
|
Rushabh Mehta
|
bb9968491b
|
added report permissions to txt files
|
2013-01-21 14:22:07 +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 |
|
Rushabh Mehta
|
80721518e3
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-17 18:23:07 +05:30 |
|
Anand Doshi
|
9d9aec1ed4
|
shifted get_company_currency from transaction base to setup/utils.py
|
2013-01-17 15:44:57 +05:30 |
|
Anand Doshi
|
03fa78597d
|
Merge branch 'master' into purchase_price_list
|
2013-01-17 10:58:41 +05:30 |
|
Rushabh Mehta
|
6f9915cd17
|
install from txt files, part 1
|
2013-01-16 17:48:17 +05:30 |
|
Nabin Hait
|
d11e9d6619
|
removed time_to_ampm and time_to_hhmm function
|
2013-01-16 16:51:58 +05:30 |
|
Anand Doshi
|
756dca719b
|
refactored purchase cycle's get item details and update item details functions and started with purchase price list
|
2013-01-15 18:39:21 +05:30 |
|
Rushabh Mehta
|
523aec499a
|
bootstrapped language and added 'hi'
|
2013-01-07 15:39:54 +05:30 |
|
Rushabh Mehta
|
78a0c20305
|
new permission manager
|
2013-01-01 19:51:35 +05:30 |
|
Anand Doshi
|
f9a3c8fcdc
|
added status validation
|
2012-12-28 19:42:49 +05:30 |
|
Rushabh Mehta
|
d616413caa
|
added contact us
|
2012-12-27 18:40:42 +05:30 |
|
Rushabh Mehta
|
1b1517155b
|
added about us page and settings
|
2012-12-27 16:50:24 +05:30 |
|
Rushabh Mehta
|
5f1d57ecb7
|
address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner
|
2012-12-27 14:05:02 +05:30 |
|
Anand Doshi
|
da2d82cf6d
|
fixes in sms control
|
2012-12-25 18:45:35 +05:30 |
|
Anand Doshi
|
f5d90abe92
|
addchild will never save added doc
|
2012-12-24 17:02:38 +05:30 |
|
Rushabh Mehta
|
d3c9fb6b3b
|
changed desktop modules now using font-awesome instead of noun project fonts
|
2012-12-21 18:27:40 +05:30 |
|
Anand Doshi
|
879ec66ea3
|
Merge branch 'production' of github.com:webnotes/erpnext into production
Conflicts:
accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
buying/doctype/purchase_order_item/purchase_order_item.txt
buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
patches/patch_list.py
|
2012-12-19 22:28:00 +05:30 |
|
Rushabh Mehta
|
8ebf1b86f8
|
added disabled in Report and no_sync fields in import_merge
|
2012-12-19 15:34:00 +05:30 |
|
Nabin Hait
|
4ecc785aab
|
fixed conflict
|
2012-12-19 12:18:15 +05:30 |
|
Rushabh Mehta
|
647e0d1164
|
updates to product_page (search) and kb fix
|
2012-12-18 14:47:54 +05:30 |
|
Nabin Hait
|
5f175dfd00
|
Merge branch 'master' into production
|
2012-12-18 13:49:07 +05:30 |
|
Rushabh Mehta
|
ee472b0926
|
upgraded to bootstrap 2.2
|
2012-12-18 11:47:13 +05:30 |
|
Nabin Hait
|
f8de5b9878
|
merged with master
|
2012-12-14 10:43:56 +05:30 |
|
Nabin Hait
|
df011dbfa5
|
deleted unwanted control doctype and pages
|
2012-12-14 10:42:09 +05:30 |
|
Nabin Hait
|
22c3f63edd
|
small fixes: sms, quotation messages etc
|
2012-12-13 15:09:42 +05:30 |
|
Rushabh Mehta
|
291449b6fb
|
refactored javascript models
|
2012-12-13 12:53:21 +05:30 |
|
Rushabh Mehta
|
9e12af4b7c
|
updated recipients email in communication
|
2012-12-12 16:13:29 +05:30 |
|
Rushabh Mehta
|
686022f777
|
fixes to recent patch and removed company_control, home_control, webforms, wip_monitor
|
2012-12-12 15:25:51 +05:30 |
|
Nabin Hait
|
be356b8692
|
Merge branch 'master' of github.com:webnotes/erpnext into production
|
2012-12-12 12:58:22 +05:30 |
|