Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,639 Commits 3 Branches 0 Tags 1 GiB
ca8019bd97
Commit Graph

246 Commits

Author SHA1 Message Date
Nabin Hait
ca8ad210d2 Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n 2013-10-24 11:40:32 +05:30
Nabin Hait
3eb901f47d [merge] merged with master 2013-10-24 11:21:11 +05:30
Maxwell
fb21c56078 Fix UnicodeDecodeError 
Traceback (most recent call last):
  File "./lib/wnf.py", line 590, in <module>
    run()
  File "./lib/wnf.py", line 314, in run
    build.bundle(False, cms_make)
  File "/home/maxwell/erp/lib/webnotes/build.py", line 27, in bundle
    on_build()
  File "app/startup/event_handlers.py", line 69, in on_build
  File "app/home/page/latest_updates/latest_updates.py", line 42, in make
  File "app/home/page/latest_updates/latest_updates.py", line 18, in add_to_logs
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 9: ordinal not in range(128)
 2013-10-21 17:29:18 -02:00
Bárbara Perretti
4b41e5f7f7 Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n 
Conflicts:
	accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
	accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
	public/js/complete_setup.js
	selling/doctype/opportunity/opportunity.js
	selling/doctype/quotation/quotation.js
 2013-10-16 15:09:18 -03:00
Bárbara Perretti
ab5fe0756a Fix translate latest_updates.js 2013-10-07 14:24:49 -03:00
Bárbara Perretti
f6a6399763 Fix translate home/page/activity/activity.js 2013-10-07 14:06:23 -03:00
Pratik Vyas
e55fbfc090 remove sql = 2013-09-18 11:10:59 +05:30
Anand Doshi
a9ad4e3045 [fix] [minor] feed label 2013-09-04 18:26:51 +05:30
Rushabh Mehta
090d410498 [minor] communication, webnotes/erpnext#790 2013-09-04 16:20:18 +05:30
Rushabh Mehta
fdaf5fd087 [bug] [minor] fix #790 2013-09-04 14:42:38 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
1fac2a98cf [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions 2013-07-29 19:30:39 +05:30
Rushabh Mehta
c4f5e4fd3f [docs] remove attributions from page and added to docs 2013-07-26 11:21:45 +05:30
Rushabh Mehta
855d92d957 [docs] added for translate and api 2013-07-23 12:20:08 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Rushabh Mehta
03be82f41a [minor] [css] #574 2013-07-11 10:22:07 +05:30
Rushabh Mehta
208e4f59b7 [minor] minor fix in latest_updates 2013-07-10 20:45:38 +05:30
Rushabh Mehta
994c319c31 [minor] 2013-07-10 19:03:09 +05:30
Anand Doshi
0cc2830392 [minor] [fix] use --no-color in latest updates build 2013-07-09 16:42:36 +05:30
Rushabh Mehta
3ed351df8e [feature] generate latest updates page from git commit log 2013-07-09 14:36:41 +05:30
Rushabh Mehta
8956c67267 [icons] added icons to forms, toolbars, moduleview, doclistview, reportview 2013-07-05 16:23:19 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +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
95e46bc930 [docs] for home, buying modules 2013-06-11 15:12:51 +05:30
Rushabh Mehta
1e5488fabf [cleanup] Home Control, Company Control 2013-06-11 15:12:35 +05:30
Rushabh Mehta
8fefeaf1bd [ui] removed links to old search_criteria and Report2 is now Report 2013-06-04 11:23:42 +05:30
Rushabh Mehta
126f2c62f2 [merge] merge with master 2013-05-24 16:09:13 +05:30
Rushabh Mehta
8e95af35d3 [form] [tags] added tags via tag-it in forms and listview 2013-05-24 11:20:44 +05:30
Rushabh Mehta
b394a25904 [ui] fixed #83, #103, #114, #116 and other minor ui issues, upgraded to jquery 1.9 2013-05-23 16:03:49 +05:30
Rushabh Mehta
4a2f0f8c36 [js-libs] upgraded to latest bootstrap and font-awesome 2013-05-22 11:57:05 +05:30
Nabin Hait
8a7d4f51b4 [latest updates] 2013-05-17 12:49:15 +05:30
Rushabh Mehta
f514998011 merge 2013-05-09 11:42:35 +05:30
Anand Doshi
9d504e4706 Merge branch 'price_list_country' 
Conflicts:
	home/page/latest_updates/latest_updates.js
	setup/doctype/price_list/price_list.txt
 2013-05-02 16:25:46 +05:30
Rushabh Mehta
d3e00995db [conflicts] [merged] 2013-05-02 16:02:59 +05:30
Anand Doshi
97e2a7eeb9 [latest updates] 2013-05-02 15:54:28 +05:30
Rushabh Mehta
f5f478ee78 [item] [naming] by series or code / [naming series] optionally set number of digits 2013-05-02 15:36:33 +05:30
Rushabh Mehta
3487e0a0f3 [price list] added currency property, validates currency, duplication in Item Price 2013-05-02 14:46:12 +05:30
Anand Doshi
d7ad13a8a7 [price list] [country] specify country for a price list 2013-04-29 19:38:34 +05:30
Anand Doshi
c9897ff533 Merge branch 'edge' 
Conflicts:
	home/page/latest_updates/latest_updates.js
 2013-04-29 10:42:21 +05:30
Anand Doshi
319e0f43da [latest updates] added default cost center and update manager 2013-04-29 08:53:12 +05:30
Rushabh Mehta
4c3419bee0 Merge branch 'master' into edge 2013-04-22 14:03:31 +05:30
Rushabh Mehta
01f6fc1206 Merge branch 'master' into responsive 2013-04-22 12:14:41 +05:30
Anand Doshi
9beae1e5c7 [attributions] [updates] added GeoLite attribution 2013-04-18 19:41:28 +05:30
Rushabh Mehta
d6c8235fb5 [style] [upgrade] moved to bootstrap 3 2013-04-18 17:43:21 +05:30
Rushabh Mehta
651ce05fcc [merge master 
]
 2013-04-18 10:37:16 +05:30
Anand Doshi
c6aecb3f97 Merge branch 'master' into edge 
Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
 2013-04-16 21:32:06 +05:30
Rushabh Mehta
f61b680576 [style] moving to 100% bootstrap css, started form / appframe headers 2013-04-16 15:45:05 +05:30
Anand Doshi
13760a1d74 [employee leave approvers] updated latest_updates.js 2013-04-12 21:59:22 +05:30
Rushabh Mehta
44323693f4 [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 13:54:44 +05:30
Nabin Hait
8022a439a8 role added in some pages 2013-04-09 11:49:42 +05:30