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
|
32af5cd62e
|
Fix translate accounts/page/general_ledger/general_ledger.js
|
2013-10-15 15:52:57 -03:00 |
|
Bárbara Perretti
|
ac0e261eee
|
Fix translate accounts/page/financial_statements/financial_statements.js
|
2013-10-15 15:33:54 -03:00 |
|
Bárbara Perretti
|
1e7685e8ae
|
Fix translate accounts/page/financial_analytics/financial_analytics.js
|
2013-10-15 15:32:13 -03:00 |
|
Bárbara Perretti
|
8bf1374abf
|
Fix translate accounts/page/accounts_home/accounts_home.js
|
2013-10-15 15:22:20 -03:00 |
|
Anand Doshi
|
9106221ea4
|
[minor] fixes after merge with master
|
2013-10-10 18:44:26 +05:30 |
|
Rushabh Mehta
|
8c2e4e1e1f
|
[wsgi] [minor] fixed webnotes.local.form_dict
|
2013-10-02 14:34:25 +05:30 |
|
Bárbara Perretti
|
9b4a233126
|
Fix translate financial_statements.js
|
2013-10-01 15:23:50 -03:00 |
|
Bárbara Perretti
|
d4279c7fe5
|
Fix translate voucher_import_tool.js
|
2013-09-30 19:05:32 -03:00 |
|
Bárbara Perretti
|
e99c558152
|
Fix trasnlate trial_balance.js
|
2013-09-30 19:04:16 -03:00 |
|
Bárbara Perretti
|
c52cbef184
|
Fix translate general_ledger.js
|
2013-09-30 19:02:50 -03:00 |
|
Bárbara Perretti
|
e37cc01d16
|
Fix translate voucher_import_tool.js
|
2013-09-30 18:39:43 -03:00 |
|
Bárbara Perretti
|
e6063695d1
|
Fix translate voucher_import_tool.js
|
2013-09-30 17:46:10 -03:00 |
|
Bárbara Perretti
|
f2ae1bee20
|
Fix translate trial_balance.js
|
2013-09-30 17:40:19 -03:00 |
|
Bárbara Perretti
|
26b13a8a45
|
Fix translate general_ledger.js
|
2013-09-30 17:26:51 -03:00 |
|
Bárbara Perretti
|
5d19387756
|
Fix translate financial_statements.js
|
2013-09-30 17:07:59 -03:00 |
|
Bárbara Perretti
|
9963d5bda3
|
Fix translate financial_analytics.js
|
2013-09-30 16:57:52 -03:00 |
|
Bárbara Perretti
|
ad6679f8f1
|
Fix translate accounts_home.js
|
2013-09-30 16:42:27 -03:00 |
|
Bárbara Perretti
|
54edf12900
|
fix translate accounts_browser.js
|
2013-09-30 16:38:30 -03:00 |
|
Nabin Hait
|
6911bb244e
|
[fix] [minor] fixes in voucher import tool
|
2013-09-19 11:57:05 +05:30 |
|
Rushabh Mehta
|
cce21d11fa
|
[major] upgrade to bootstrap 3
|
2013-08-21 17:48:08 +05:30 |
|
Anand Doshi
|
379acbbd77
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-14 14:23:07 +05:30 |
|
Anand Doshi
|
9618cb8ef1
|
[fix] [minor] downsample data to 1000 points before plotting using flot.downsample plugin
|
2013-08-14 14:22:47 +05:30 |
|
Nabin Hait
|
29c8327a2f
|
[fix] [minor] Analytics role added in Financial Statements report
|
2013-08-14 12:48:41 +05:30 |
|
Anand Doshi
|
38a07cf86a
|
[fix] [chart of accounts] view ledger should show correct account's ledger
|
2013-08-08 18:49:58 +05:30 |
|
Rushabh Mehta
|
d056e1b453
|
[minor] added webnotes.get_list, fixed webnotes/erpnext#663
|
2013-08-05 16:21:04 +05:30 |
|
Rushabh Mehta
|
e67d1fbcdf
|
[license] [minor] Updated License Text in all js and py files
|
2013-08-05 14:59:54 +05:30 |
|
Nabin Hait
|
8608f0e9fa
|
[fix] [minor] error display in voucher import tool
|
2013-07-31 18:00:25 +05:30 |
|
Anand Doshi
|
5c76f014a7
|
[report] [accounts] Delivered Items To Be Billed, Received Items To Be Billed
|
2013-07-30 18:42:16 +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 |
|
Anand Doshi
|
5491332772
|
[fix] [minor] use wn.defaults.get_default instead of sys_defaults
|
2013-07-26 13:02:18 +05:30 |
|
Anand Doshi
|
85fa3d2bb9
|
[fix] [minor] upload callback arguments changed
|
2013-07-25 16:02:15 +05:30 |
|
Anand Doshi
|
fafb9a8843
|
[fix] [report] general ledger - group by ledger and group by voucher
|
2013-07-23 17:13:55 +05:30 |
|
Rushabh Mehta
|
df92a553cb
|
[style] Added Icons to Pages
|
2013-07-11 14:50:43 +05:30 |
|
Rushabh Mehta
|
ad71473f35
|
[cleanup] Default Warehouses created on Company creation. Warehouse names have Company abbreviation as suffix
|
2013-07-10 18:59:55 +05:30 |
|
Anand Doshi
|
1357c0b2df
|
[cleanup] #402 changed fieldname company_name to company in Cost Center
|
2013-07-09 15:45:38 +05:30 |
|
Nabin Hait
|
2bd37771ca
|
validate with prevdoc
|
2013-07-08 19:00:29 +05:30 |
|
Anand Doshi
|
8aaccf7269
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/lead/lead.txt
|
2013-07-04 17:18:45 +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 |
|
Rushabh Mehta
|
9a04b19160
|
[form] [legacy-js] removed old Dialog, PageHeader etc., cleanup Opportunity and Quotation
|
2013-07-03 13:27:39 +05:30 |
|
Rushabh Mehta
|
d420401ba3
|
[moduleview] added top bar
|
2013-07-01 17:15:23 +05:30 |
|
Rushabh Mehta
|
4cd0a07290
|
[grid-reports] [page] bug fix for double 'show' call, fixed ledger reports links
|
2013-07-01 15:17:36 +05:30 |
|
Rushabh Mehta
|
36af6a02ad
|
[grid reports] now show by wn.route_options
|
2013-07-01 14:35:57 +05:30 |
|
Rushabh Mehta
|
8706ca9445
|
[journal voucher] [added opening entry] [cleanups]
|
2013-07-01 09:36: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
|
bd7218979e
|
[shipping rule] added doctypes shipping rule and shipping rule conditions
|
2013-06-26 13:53:01 +05:30 |
|
Nabin Hait
|
cca41a172c
|
[fix][report] general ledger
|
2013-06-25 14:14:32 +05:30 |
|
Nabin Hait
|
909e8b120f
|
[fix][report] general ledger
|
2013-06-25 14:08:18 +05:30 |
|
Rushabh Mehta
|
7a93d5de30
|
[bug fixes] [global defaults] [cleanup]
|
2013-06-24 18:18:46 +05:30 |
|
Nabin Hait
|
3e8eca35a2
|
[report][fix] stock balance
|
2013-06-24 17:18:24 +05:30 |
|