Nabin Hait
|
13b93ebed8
|
pricing rule: fixes in testcase
|
2014-02-28 15:04:05 +05:30 |
|
Nabin Hait
|
3319170805
|
pricing rule: condition for tree-type docs
|
2014-02-28 13:04:19 +05:30 |
|
Nabin Hait
|
ed5f423e65
|
pricing rule: condition for tree-type docs
|
2014-02-28 13:04:19 +05:30 |
|
Nabin Hait
|
311079a311
|
Patch: copy customer discount to pricing rule
|
2014-02-28 13:04:19 +05:30 |
|
Nabin Hait
|
08222150f2
|
Pricing Rule fixes and reference field in all item table
|
2014-02-28 13:02:00 +05:30 |
|
Nabin Hait
|
7e8e8ba714
|
pricing rule
|
2014-02-28 13:02:00 +05:30 |
|
Nabin Hait
|
c65a0c7197
|
Allowed stock entry import
|
2014-02-28 13:02:00 +05:30 |
|
Nabin Hait
|
bc34f3edae
|
shortage qty column added in stock projected qty report
|
2014-02-28 13:02:00 +05:30 |
|
Nabin Hait
|
615d342056
|
Pricing Rule: first commit
|
2014-02-28 13:02:00 +05:30 |
|
Anand Doshi
|
8462a7691b
|
Fixed login
|
2014-02-28 11:53:59 +05:30 |
|
Rushabh Mehta
|
063141d152
|
added patch for address
|
2014-02-28 11:37:36 +05:30 |
|
Anand Doshi
|
fb21ce3893
|
3to4 fixes
|
2014-02-27 13:18:20 +05:30 |
|
Anand Doshi
|
e9baaa68e7
|
Changed frappe.conn to frappe.db
|
2014-02-26 12:35:33 +05:30 |
|
Anand Doshi
|
901f4434fd
|
Fixed Purchase Invoice test cases
|
2014-02-25 17:25:28 +05:30 |
|
Anand Doshi
|
0936ae6dca
|
Fixed company web page creation
|
2014-02-25 16:21:50 +05:30 |
|
Anand Doshi
|
4362443b6e
|
Propagate ignore_permissions during mapping from quotation to sales order
|
2014-02-25 15:42:32 +05:30 |
|
Anand Doshi
|
201dbbd977
|
Quotation Item Table can be empty
|
2014-02-25 15:42:32 +05:30 |
|
Rushabh Mehta
|
a6628eee56
|
rename sitemap to route
|
2014-02-25 11:08:37 +05:30 |
|
Nabin Hait
|
a1c96de9fc
|
party related cleanup
|
2014-02-21 14:45:10 +05:30 |
|
Rushabh Mehta
|
6fbda08583
|
fixed sitemap patch
|
2014-02-20 19:03:03 +05:30 |
|
Nabin Hait
|
cda83bba59
|
Row no fix in stock reconciliation
|
2014-02-20 15:01:51 +05:30 |
|
Nabin Hait
|
2f8d4451f5
|
calculate outstanding amount in server side, only if docstatus is 0
|
2014-02-20 14:59:37 +05:30 |
|
Nabin Hait
|
0f2310690e
|
fix in fetch item details and supplier non-mandatory to fetch
|
2014-02-20 11:27:47 +05:30 |
|
Pratik Vyas
|
28da7523be
|
set single defaults after install
|
2014-02-19 20:53:45 +05:30 |
|
Nabin Hait
|
ce64afaa51
|
default value in single doctypes
|
2014-02-19 19:12:01 +05:30 |
|
Nabin Hait
|
f5bb9ae1b1
|
default value in single doctypes
|
2014-02-19 19:02:40 +05:30 |
|
Nabin Hait
|
22831563ff
|
default value in selling settings
|
2014-02-19 18:35:54 +05:30 |
|
Nabin Hait
|
32f168617c
|
default value in global defaults
|
2014-02-19 18:11:42 +05:30 |
|
Nabin Hait
|
74bbd24b1d
|
Merge github.com:frappe/erpnext into develop
|
2014-02-19 17:43:51 +05:30 |
|
Nabin Hait
|
9d1f077922
|
get lead details in quotation
|
2014-02-19 17:43:24 +05:30 |
|
Rushabh Mehta
|
e0e3f92019
|
fixed sales / accounts tree
|
2014-02-19 12:43:16 +05:30 |
|
Nabin Hait
|
05b28eb161
|
minor fixes
|
2014-02-19 11:04:32 +05:30 |
|
Nabin Hait
|
36a4db69b8
|
price list on_trash function
|
2014-02-18 15:14:46 +05:30 |
|
Pratik Vyas
|
da0a23e635
|
remove print in patch, booboo
|
2014-02-17 14:56:00 +05:30 |
|
Pratik Vyas
|
31affc0e67
|
bump modified dates for purchase receipt and purchase invoice
|
2014-02-17 11:36:10 +05:30 |
|
Rushabh Mehta
|
793ba6bd37
|
-webnotes +frappe 💥
|
2014-02-14 15:47:51 +05:30 |
|
Nabin Hait
|
8ae051cb39
|
fixed conflict
|
2014-02-14 13:42:41 +05:30 |
|
Nabin Hait
|
adeff27f28
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
|
2014-02-14 13:41:00 +05:30 |
|
Nabin Hait
|
9ea461638e
|
minor fix
|
2014-02-14 13:40:41 +05:30 |
|
Rushabh Mehta
|
989b60ae52
|
removed setup from desktop:
|
2014-02-14 13:16:39 +05:30 |
|
Nabin Hait
|
a038831c45
|
validate item of item_price record
|
2014-02-13 15:54:51 +05:30 |
|
Nabin Hait
|
36028bfb56
|
minor
|
2014-02-12 19:09:28 +05:30 |
|
Nabin Hait
|
a87121c6da
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
|
2014-02-12 17:09:08 +05:30 |
|
Nabin Hait
|
e219d61ed4
|
patch included in patches txt
|
2014-02-12 17:08:35 +05:30 |
|
Nabin Hait
|
66b2717c54
|
Merge pull request #1414 from akhileshdarjee/4.0-hotfix
Customer and Supplier dashboard set to company currency
|
2014-02-12 16:55:17 +05:30 |
|
Nabin Hait
|
eba1bdbcca
|
minor fixes
|
2014-02-12 16:04:17 +05:30 |
|
Nabin Hait
|
139dc7b9b2
|
minor fixes
|
2014-02-12 14:54:16 +05:30 |
|
Nabin Hait
|
0aa71a5c41
|
minor fixes
|
2014-02-12 14:54:15 +05:30 |
|
Nabin Hait
|
5aecc538dd
|
Letter Head field added in purchase receipt and invoice
|
2014-02-12 14:54:15 +05:30 |
|
Nabin Hait
|
5f59726903
|
Rename fields: replaced in html and txt files
|
2014-02-12 14:54:15 +05:30 |
|
Nabin Hait
|
1eb560130a
|
Rename fields: amount related fields
|
2014-02-12 14:54:14 +05:30 |
|
Nabin Hait
|
7979f7ed21
|
Field Rename: rate field mass replacement
|
2014-02-12 14:54:14 +05:30 |
|
Nabin Hait
|
a7f757a3f4
|
Rename fields: initial commit
|
2014-02-12 14:54:13 +05:30 |
|
Nabin Hait
|
777397489e
|
Fields renamed in schema
|
2014-02-12 14:54:13 +05:30 |
|
Nabin Hait
|
436f526102
|
commonify get_item_details and rename fields to sync selling and purchase
|
2014-02-12 14:54:12 +05:30 |
|
Nabin Hait
|
c28c86dfd8
|
Validate duplicate serial nos entry
|
2014-02-12 14:54:11 +05:30 |
|
Nabin Hait
|
9beffb646d
|
Validate duplicate serial nos entry
|
2014-02-12 14:54:11 +05:30 |
|
Nabin Hait
|
f0d29be1d5
|
Removed on_trash function from support ticket
|
2014-02-12 14:54:11 +05:30 |
|
Akhilesh Darjee
|
f2b7cd65a9
|
customer and supplier dashboard set to company currency
|
2014-02-12 11:29:08 +05:30 |
|
Anand Doshi
|
2735733d1f
|
Minor fix in setup import
|
2014-02-11 20:28:11 +05:30 |
|
Anand Doshi
|
93fdc670fe
|
Fixes in Test Cases
|
2014-02-11 14:40:21 +05:30 |
|
Anand Doshi
|
d7cc47e3ac
|
Do not validate Material Request against Sales Order, Moved Setup page to Framework
|
2014-02-10 17:39:12 +05:30 |
|
Anand Doshi
|
1d7e933590
|
Fix in Get Job Applications
|
2014-02-07 20:26:56 +05:30 |
|
Anand Doshi
|
080b64a98f
|
Fixes in Sales Partner and Support Mails
|
2014-02-07 19:14:21 +05:30 |
|
Rushabh Mehta
|
c4ec534b06
|
added config.setup
|
2014-02-07 19:04:19 +05:30 |
|
Rushabh Mehta
|
22ababbec1
|
configs
|
2014-02-07 18:16:11 +05:30 |
|
Anand Doshi
|
7c34f1c472
|
Test Item Group
|
2014-02-07 14:52:14 +05:30 |
|
Anand Doshi
|
7bb9c3f125
|
Nested Set Test using Test Item group
|
2014-02-06 17:51:18 +05:30 |
|
Nabin Hait
|
a03f654446
|
Merge pull request #1382 from akhileshdarjee/4.0-hotfix
Newsletter can also be sent to employees
|
2014-02-06 16:02:39 +05:30 |
|
Nabin Hait
|
574c7e7c63
|
item related cleanup
|
2014-02-06 15:51:01 +05:30 |
|
Pratik Vyas
|
79499e3615
|
fix syntax error in material request, merge booboo
|
2014-02-06 15:25:17 +05:30 |
|
Akhilesh Darjee
|
462740f72b
|
sales funnel fix
|
2014-02-06 13:14:15 +05:30 |
|
Anand Doshi
|
3decf4dbc5
|
Fixes related website hierarchy
|
2014-02-06 12:50:35 +05:30 |
|
Rushabh Mehta
|
4b41e420c0
|
cleaned up splash:
|
2014-02-06 11:02:53 +05:30 |
|
Rushabh Mehta
|
2c545ef1ad
|
bugfix to feed
|
2014-02-06 10:38:45 +05:30 |
|
Rushabh Mehta
|
307fac8b78
|
hooks fixes
|
2014-02-05 17:04:49 +05:30 |
|
Akhilesh Darjee
|
602fdc0000
|
patch reloading employee form
|
2014-02-03 19:32:59 +05:30 |
|
Akhilesh Darjee
|
f1c3537924
|
webnotes/erpnext#869 newsletter to send to employees
|
2014-02-03 19:28:36 +05:30 |
|
Akhilesh Darjee
|
81578d2e77
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
|
2014-02-03 17:48:46 +05:30 |
|
Akhilesh Darjee
|
8f674fe0fb
|
minor changes
|
2014-02-03 17:47:50 +05:30 |
|
Akhilesh Darjee
|
abb3af7b30
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
|
2014-02-03 16:44:14 +05:30 |
|
Rushabh Mehta
|
cc008cc109
|
commonified get_party_details
|
2014-02-03 16:14:56 +05:30 |
|
Rushabh Mehta
|
347889b233
|
merge
|
2014-02-03 14:49:53 +05:30 |
|
Rushabh Mehta
|
8ed0268b9d
|
fix to SalesInvoice format
|
2014-02-03 14:40:01 +05:30 |
|
Rushabh Mehta
|
fa799f7d81
|
Merge branch '4.0.0-cleanup' of github.com:webnotes/erpnext into 4.0.0-cleanup
|
2014-02-03 14:38:52 +05:30 |
|
Nabin Hait
|
23c28704d2
|
Field arrangement in child table
|
2014-02-03 14:36:59 +05:30 |
|
Akhilesh Darjee
|
dd905fcaba
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
|
2014-02-03 13:56:10 +05:30 |
|
Akhilesh Darjee
|
53593c9c47
|
Newsletter allow delete
|
2014-02-03 13:40:27 +05:30 |
|
Rushabh Mehta
|
8612778136
|
style fix
|
2014-02-03 10:45:21 +05:30 |
|
Rushabh Mehta
|
9adcf85a14
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
|
2014-02-03 10:44:34 +05:30 |
|
Akhilesh Darjee
|
d6d2193f91
|
newsletter reload
|
2014-01-31 19:59:25 +05:30 |
|
Nabin Hait
|
bec11fa86e
|
Newsletter permissions
|
2014-01-31 17:33:23 +05:30 |
|
Nabin Hait
|
dfae0ea570
|
minor fix in patch
|
2014-01-31 17:25:09 +05:30 |
|
Nabin Hait
|
d7fb6dce89
|
Stock reconciliation: cost center filters
|
2014-01-31 17:05:09 +05:30 |
|
Nabin Hait
|
7f80485070
|
Merge pull request #1374 from akhileshdarjee/sms-center
SMS center character count
|
2014-01-31 02:57:35 -08:00 |
|
Nabin Hait
|
45f0c25a6d
|
Merge pull request #1365 from akhileshdarjee/4.0-hotfix
Stay Updated button in website fixed
|
2014-01-31 02:44:35 -08:00 |
|
Nabin Hait
|
c3211ab394
|
Merge pull request #1368 from akhileshdarjee/default-tax
Default tax for customer and supplier
|
2014-01-31 02:40:51 -08:00 |
|
Akhilesh Darjee
|
dc45153430
|
webnotes/erpnext#1221 dont allow duplicate user id in employee
|
2014-01-31 12:23:13 +05:30 |
|
Akhilesh Darjee
|
4e3b601990
|
webnotes/erpnext#1188 sms center character count
|
2014-01-30 19:13:25 +05:30 |
|
Nabin Hait
|
b5be7bab9b
|
Stock Return: fetch customer and supplier details
|
2014-01-30 18:47:12 +05:30 |
|
Nabin Hait
|
8dc2c6a16c
|
Default accounts in company should not be copied
|
2014-01-30 17:00:09 +05:30 |
|
Nabin Hait
|
ec43e4dd33
|
Merged with develop
|
2014-01-30 15:22:10 +05:30 |
|
Rushabh Mehta
|
fcb6b01e4e
|
cleaned up email
|
2014-01-30 15:09:05 +05:30 |
|
Akhilesh Darjee
|
e0a1039756
|
merge conflict fixed
|
2014-01-30 14:44:35 +05:30 |
|
Akhilesh Darjee
|
4cdb79941b
|
map charge to taxes and charges in transactions
|
2014-01-30 13:56:57 +05:30 |
|
Nabin Hait
|
0ff32e73ba
|
Merged with 4.0.0-wip
|
2014-01-30 12:41:52 +05:30 |
|
Nabin Hait
|
fe8db590a1
|
Fixed conflict while merging with develop
|
2014-01-30 12:32:47 +05:30 |
|
Nabin Hait
|
b87e9f2651
|
Fixes in fetching party details
|
2014-01-29 19:51:36 +05:30 |
|
Akhilesh Darjee
|
b665d86292
|
patch to reload all sales and purchase doctypes and print formats
|
2014-01-29 17:40:34 +05:30 |
|
Akhilesh Darjee
|
4f7215662d
|
webnotes/erpnext#1090 set default tax type in customer and supplier
|
2014-01-29 16:31:38 +05:30 |
|
Rushabh Mehta
|
24da761a17
|
more updates to party
|
2014-01-29 15:26:04 +05:30 |
|
Akhilesh Darjee
|
2ced3b07d4
|
changed fieldname from charge to taxes
|
2014-01-28 19:16:05 +05:30 |
|
Rushabh Mehta
|
49dd7bee87
|
added get_supplier_details and commonified invoice functions
|
2014-01-28 17:43:10 +05:30 |
|
Rushabh Mehta
|
3b432dce88
|
added listviews
|
2014-01-28 16:10:15 +05:30 |
|
Nabin Hait
|
21d324c597
|
Merged with 4.0-wip
|
2014-01-28 15:52:25 +05:30 |
|
Akhilesh Darjee
|
a7ab20ec78
|
webnotes/erpnext#912 Stay Updated button in website fixed
|
2014-01-28 15:50:28 +05:30 |
|
Akhilesh Darjee
|
ffa4769b51
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
|
2014-01-27 17:32:32 +05:30 |
|
Akhilesh Darjee
|
db4304914c
|
POS Invoice print format showing inclusive taxes and discount amount
|
2014-01-27 17:27:39 +05:30 |
|
Akhilesh Darjee
|
86894f3bbf
|
merge conflict fixed
|
2014-01-27 15:42:02 +05:30 |
|
Rushabh Mehta
|
1230e3a28b
|
don't hide customer / supplier links, webnotes/erpenxt#796
|
2014-01-27 11:02:27 +05:30 |
|
Anand Doshi
|
3f8f4ff6cd
|
BugFix: Production Planning Tool - get_raw_materials
|
2014-01-24 21:47:01 +05:30 |
|
Anand Doshi
|
cb39e0878e
|
Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip
Conflicts:
config.json
erpnext/accounts/utils.py
erpnext/patches/patch_list.py
erpnext/stock/doctype/price_list/price_list.txt
erpnext/stock/doctype/warehouse/warehouse.py
portal/templates/sale.html
portal/utils.py
selling/doctype/sales_order/templates/pages/order.py
selling/utils/cart.py
selling/utils/product.py
utilities/demo/demo_docs/Fiscal_Year.csv
utilities/demo/make_demo.py
|
2014-01-24 21:44:36 +05:30 |
|
Akhilesh Darjee
|
a4e0a1c061
|
minor changes
|
2014-01-24 19:57:52 +05:30 |
|
Rushabh Mehta
|
e288e5238a
|
added title_fields for Task, Newsletter
|
2014-01-24 15:33:42 +05:30 |
|
Rushabh Mehta
|
1cd96a136f
|
updates for restriction
|
2014-01-24 11:10:24 +05:30 |
|
Nabin Hait
|
93eab5521c
|
Minor fix in path
|
2014-01-23 17:58:03 +05:30 |
|
Nabin Hait
|
4ba95d0b7a
|
Fix in testcases
|
2014-01-23 16:45:22 +05:30 |
|
Nabin Hait
|
5ae6a61c4d
|
Fixes related to appifing shopping cart
|
2014-01-23 15:33:30 +05:30 |
|
Nabin Hait
|
6a23cfa5cd
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
|
2014-01-22 15:57:32 +05:30 |
|
Rushabh Mehta
|
7460dcf406
|
updated Bootstrap
|
2014-01-22 12:44:46 +05:30 |
|
Rushabh Mehta
|
f96bcf943b
|
added explicit delete perimssions
|
2014-01-20 17:52:13 +05:30 |
|
Nabin Hait
|
9e056ec1ce
|
Auto closing of tickets through schedulers
|
2014-01-20 17:46:37 +05:30 |
|
Rushabh Mehta
|
cef681942f
|
merge fix
|
2014-01-20 17:41:13 +05:30 |
|
Nabin Hait
|
5c6d13a0df
|
Fixed conflict while merging with develop branch
|
2014-01-20 17:18:16 +05:30 |
|
Nabin Hait
|
719f2803b3
|
Fixed conflict while merging with develop branch
|
2014-01-20 17:01:28 +05:30 |
|
Nabin Hait
|
dc15b4fa8a
|
Fixed conflict while merging with develop brnach
|
2014-01-20 16:48:49 +05:30 |
|
Akhilesh Darjee
|
2a79b00700
|
minor fix
|
2014-01-15 11:54:05 +05:30 |
|
Akhilesh Darjee
|
6a749e3a8e
|
removed while loop
|
2014-01-15 11:43:47 +05:30 |
|
Anand Doshi
|
b9b6a6cea5
|
Moved webnotes scheduler event hooks
|
2014-01-13 21:22:23 +05:30 |
|
Nabin Hait
|
f6cf5e0f43
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-cleanup
|
2014-01-06 17:36:04 +05:30 |
|
Akhilesh Darjee
|
5dd92fd5d6
|
reload doc in maintenance schedule
|
2014-01-03 19:14:01 +05:30 |
|
Akhilesh Darjee
|
e27717261d
|
merge conflict fixed
|
2014-01-03 18:18:31 +05:30 |
|
Akhilesh Darjee
|
57738a0ff3
|
flat discount replaced to discount amount
|
2014-01-03 18:15:07 +05:30 |
|
Akhilesh Darjee
|
5c96b75a68
|
fixed maintenance schedule
|
2014-01-02 17:54:12 +05:30 |
|
Akhilesh Darjee
|
064d2ba16a
|
fixed sr no in maintenance schedule
|
2014-01-02 17:47:32 +05:30 |
|
Rushabh Mehta
|
b09d9dabc5
|
started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions
|
2014-01-02 11:47:23 +05:30 |
|
Nabin Hait
|
06720dfb90
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
|
2014-01-01 10:47:18 +05:30 |
|
Nabin Hait
|
a2e0a9b05f
|
Fliend rearrangemet in tables
|
2014-01-01 10:45:42 +05:30 |
|
Rushabh Mehta
|
3f7e2729bb
|
removed demo hooks
|
2014-01-01 10:45:26 +05:30 |
|
Nabin Hait
|
6260b58a0a
|
Merge pull request #1253 from nabinhait/4.0.0-wip
4.0.0 wip
|
2013-12-31 21:13:45 -08:00 |
|
Anand Doshi
|
9a4a13cb73
|
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
|
2013-12-31 17:38:21 +05:30 |
|
Nabin Hait
|
139aa71666
|
Fixed conflict while merging with master
|
2013-12-31 16:09:22 +05:30 |
|
Nabin Hait
|
d3f04d754a
|
General ledger path fixed
|
2013-12-31 16:04:48 +05:30 |
|
Nabin Hait
|
432b86344e
|
Validate account with reference voucher if against voucher mentioned
|
2013-12-31 15:07:58 +05:30 |
|
Akhilesh Darjee
|
829eda47a8
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount
|
2013-12-30 12:31:07 +05:30 |
|
Anand Doshi
|
0663ec4a9c
|
Merge fixes: removed patches, removed Warehouse User
|
2013-12-27 18:00:28 +05:30 |
|
Rushabh Mehta
|
61bf425935
|
deleted moves
|
2013-12-27 17:58:39 +05:30 |
|
Akhilesh Darjee
|
d203aea7c2
|
[flat discount] flat discount implemented on sales cycle
|
2013-12-27 17:49:57 +05:30 |
|
Rushabh Mehta
|
c4a0ed63ef
|
Moved demo to separate app, moved patches folder
|
2013-12-27 17:30:24 +05:30 |
|
Rushabh Mehta
|
4ac68952e8
|
Moved patches and fixed method routing in pages
|
2013-12-27 13:43:40 +05:30 |
|
Anand Doshi
|
e7fc25d6a8
|
Fixes after permissions merge
|
2013-12-27 10:49:28 +05:30 |
|
Anand Doshi
|
8e332ffd16
|
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
|
2013-12-26 19:12:51 +05:30 |
|
Rushabh Mehta
|
7334bea3c2
|
fixed languages, moved framework strings to framework
|
2013-12-26 14:44:08 +05:30 |
|
Rushabh Mehta
|
caa4380d49
|
Merge with 3.3.8
|
2013-12-26 11:07:58 +05:30 |
|
Rushabh Mehta
|
54047780fc
|
Merge with 3.3.8
|
2013-12-26 11:07:46 +05:30 |
|
Rushabh Mehta
|
4b6b377134
|
Removed config.json
|
2013-12-25 17:38:12 +05:30 |
|
Rushabh Mehta
|
df200f305b
|
Redesigned templates. Now all templates must be inside templates/pages templates/generators
|
2013-12-25 15:19:22 +05:30 |
|
Rushabh Mehta
|
3c68488873
|
Fixes to setup wizard
|
2013-12-24 18:51:49 +05:30 |
|
Rushabh Mehta
|
b63d550a70
|
Added Applications page and fixed issues in translations and hooks
|
2013-12-23 16:09:00 +05:30 |
|
Rushabh Mehta
|
2b08985e16
|
Translations redesigned webnotes/wnframework#351
|
2013-12-19 18:27:48 +05:30 |
|
Rushabh Mehta
|
91e9822f65
|
fixed test cases webnotes/wnframework#351
|
2013-12-16 18:43:42 +05:30 |
|
Rushabh Mehta
|
c652a6254f
|
Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351
|
2013-12-16 12:48:38 +05:30 |
|
Rushabh Mehta
|
30430796c7
|
notifications via hooks webnotes/wnframework#351
|
2013-12-13 15:33:40 +05:30 |
|
Rushabh Mehta
|
6de403f2be
|
added manifest, hooks and fixed requires webnotes/wnframework#351
|
2013-12-13 14:10:14 +05:30 |
|
Rushabh Mehta
|
1f84799f2d
|
install, web serving, session booting webnotes/wnframework#351
|
2013-12-12 19:12:19 +05:30 |
|
Rushabh Mehta
|
d2dd83c3a3
|
fixed template loader webnotes/wnframework#351
|
2013-12-12 13:57:58 +05:30 |
|
Pratik Vyas
|
1b23208779
|
[minor] get bundle working, almost
|
2013-12-12 10:44:38 +05:30 |
|
Rushabh Mehta
|
39bb8e2ed4
|
step 0: install
|
2013-12-11 15:32:14 +05:30 |
|
Rushabh Mehta
|
e460aa277b
|
added setup.py
|
2013-12-11 11:32:21 +05:30 |
|
Rushabh Mehta
|
b234a3545a
|
moved config.json inside erpnext
|
2013-12-11 10:55:55 +05:30 |
|
Rushabh Mehta
|
afea58b7a1
|
moved modules inside erpnext folder
|
2013-12-11 10:43:52 +05:30 |
|
Rushabh Mehta
|
55fd5f3ed6
|
added voucher import tool
|
2012-09-26 19:00:02 +05:30 |
|
Anand Doshi
|
3c4238fc9c
|
Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts:
public/js/all-app.js
public/js/all-web.js
|
2012-09-26 12:24:28 +05:30 |
|
Nabin Hait
|
0baf74a139
|
fixes in gross profit report
|
2012-09-26 11:38:48 +05:30 |
|
Nabin Hait
|
e89379f8a2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-09-26 11:30:59 +05:30 |
|
Nabin Hait
|
9be5717f6c
|
fixes in gross profit report
|
2012-09-26 11:30:30 +05:30 |
|
Nabin Hait
|
052a5e85e0
|
fixes in gross profit report
|
2012-09-26 11:27:23 +05:30 |
|
Anand Doshi
|
dcbeec1407
|
fix in bin.py msgprint
|
2012-09-25 16:07:52 +05:30 |
|
Rushabh Mehta
|
2fa2f7178d
|
moved directory structure
|
2012-09-24 19:13:42 +05:30 |
|
Anand Doshi
|
da3d9a3ee0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-09-24 18:26:17 +05:30 |
|
Anand Doshi
|
4627867786
|
fix in general ledger report: account filter options to be filtered by company
|
2012-09-24 18:16:52 +05:30 |
|
Anand Doshi
|
bc243dee81
|
fix in general ledger report: account filter options to be filtered by company
|
2012-09-24 18:03:35 +05:30 |
|
Nabin Hait
|
9b4ffcb507
|
total gross profit % in gross profit report
|
2012-09-24 16:12:01 +05:30 |
|
Nabin Hait
|
acd39fd957
|
rounding issue fixed in gross profit
|
2012-09-24 15:59:26 +05:30 |
|
Nabin Hait
|
de7fcc66df
|
updated repost_stock patch
|
2012-09-24 15:53:01 +05:30 |
|
Nabin Hait
|
9ed7b8bb75
|
fixed conflict
|
2012-09-24 15:46:55 +05:30 |
|
Nabin Hait
|
6e6dd1b0d5
|
reload gross profit report
|
2012-09-24 15:45:02 +05:30 |
|
Anand Doshi
|
5f76ceb38e
|
Delete permission for Event doctype to System Manager
|
2012-09-24 15:41:41 +05:30 |
|
Anand Doshi
|
9ef7bd8494
|
Delete permission for Event doctype to System Manager
|
2012-09-24 15:41:27 +05:30 |
|
Nabin Hait
|
41207dbec1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-09-24 15:41:16 +05:30 |
|