Commit Graph

455 Commits

Author SHA1 Message Date
Rushabh Mehta
6282c4a18a added bar indicators to Sales Invoice & Purchase Invoice 2013-02-02 15:12:45 +05:30
Nabin Hait
9159786d35 fixes in budget control 2013-02-01 17:49:56 +05:30
Nabin Hait
41434f1eb4 fixes for gl entries in purchase invoice 2013-02-01 17:14:30 +05:30
Nabin Hait
982a0a0e0a fixes for gl entries in purchase invoice 2013-02-01 17:03:05 +05:30
Nabin Hait
1a2974c53d fixes for gl entries in purchase invoice 2013-02-01 16:50:54 +05:30
Nabin Hait
2feab912a1 fixes in budget control 2013-02-01 16:34:48 +05:30
Nabin Hait
24c4bb5d6a fixes in sales invoice 2013-02-01 16:03:50 +05:30
Nabin Hait
298b334cb6 account type field added in payment reconciliation tool 2013-02-01 14:09:07 +05:30
Nabin Hait
cc9528c8e2 removed gl mapper with patch 2013-02-01 12:15:44 +05:30
Nabin Hait
fb3fd6e3e5 deprecated gl_control and some rewrites 2013-01-30 19:16:13 +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
9732250a83 ignore create permission in gl control 2013-01-30 11:46:59 +05:30
Nabin Hait
7c40531a7e Update accounts/doctype/gl_control/gl_control.py
ignore permission while creating account for customer and supplier
2013-01-29 18:55:34 +05:30
Rushabh Mehta
dacfa901c6 finished listviews 2013-01-29 18:33:48 +05:30
Rushabh Mehta
abf8fe414b Merge branch 'master' of github.com:webnotes/erpnext 2013-01-29 17:54:04 +05:30
Rushabh Mehta
08da1a0a3d setting list_views 2013-01-29 17:53:29 +05:30
Anand Doshi
55b93764b4 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-29 17:05:42 +05:30
Anand Doshi
763fcf735d removed Accounts User role for accounts report pages 2013-01-29 17:05:00 +05:30
Nabin Hait
cc8312a98d gl_entry_map for journal voucher 2013-01-29 11:35:07 +05:30
Nabin Hait
2df4d546ae make_gl_entry function in account_controller: deprecated gl mapper 2013-01-29 11:34:39 +05:30
Nabin Hait
23941aa8f2 accounts utils file instead of utils directory 2013-01-29 11:32:38 +05:30
Nabin Hait
53e36b34d3 fixed syntax issue in financial statements 2013-01-29 10:47:58 +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
Nabin Hait
d4c7159f60 fixes in dynamic label setting and column hiding based on currency 2013-01-25 18:31:06 +05:30
Rushabh Mehta
d9acb4bc0d Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 17:25:39 +05:30
Nabin Hait
f89fb1e41a Other charges in currect currency fixes for all classic/modern/spartan print g=format 2013-01-25 17:24:47 +05:30
Rushabh Mehta
83e08362bd nsm bug in customer_group and removed abbr in Cost Center 2013-01-25 15:11:26 +05:30
Rushabh Mehta
9babf9dbdb Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 11:58:45 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Nabin Hait
27b4a92b02 error fixed in recurring invoices 2013-01-25 11:10:29 +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
282d8cdd34 Removed 'Tax Included in Print Rate' from no_copy 2013-01-24 14:19:43 +05:30
Rushabh Mehta
c3c67d31ec merge fix 2013-01-23 19:57:35 +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
Nabin Hait
3ac8e59cb8 fixes in payment reconciliation 2013-01-23 13:59:29 +05:30
Nabin Hait
8e4a772a35 fixes in payment reconciliation 2013-01-23 13:59:00 +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
efe8102351 merge 2013-01-22 15:23:58 +05:30
Rushabh Mehta
cd4a854a28 converted currency to float and removed level 1 permissions 2013-01-22 15:10:25 +05:30
Nabin Hait
025e01322c stock balance report: qty and value in same page, valuation method from item master 2013-01-22 14:03:34 +05:30
Nabin Hait
ec52db8490 commonified in_words function and introduced selling_controller 2013-01-22 11:53:14 +05:30
Nabin Hait
0394f78382 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-01-22 11:22:53 +05:30
Nabin Hait
5b4c294b40 commonified in_words function 2013-01-22 11:12:02 +05:30
Rushabh Mehta
cb46a2df55 accounts_browser: fix for number formatting 2013-01-21 21:58:53 +05:30
Rushabh Mehta
6dd9d4583d updated payment receipt voucher format 2013-01-21 18:44:43 +05:30
Nabin Hait
d3b625035c fixes in total_in_words 2013-01-21 17:24:31 +05:30
Rushabh Mehta
9700bafbdb Merge branch 'master' of github.com:webnotes/erpnext 2013-01-21 16:29:05 +05:30
Rushabh Mehta
bb9968491b added report permissions to txt files 2013-01-21 14:22:07 +05:30
Nabin Hait
ec44cd763e in payment matching tool only show outstanding invoices 2013-01-21 12:29:20 +05:30
Nabin Hait
8f4c78c4bf in payment matching tool only show outstanding invoices 2013-01-21 11:57:03 +05:30
Rushabh Mehta
1a6220a332 Merge branch 'master' into edge 2013-01-21 10:33:22 +05:30
Rushabh Mehta
4ef3a28450 journal voucher difference fix 2013-01-21 10:32:28 +05:30
Rushabh Mehta
861b3d6092 merge 2013-01-21 10:23:21 +05:30
Nabin Hait
f2223102e2 removed supplier account field from jv 2013-01-18 17:45:24 +05:30
Anand Doshi
35af9ba4e6 Merge branch 'master' into edge 2013-01-18 14:50:25 +05:30
Anand Doshi
a81370f2a3 added description to Price List field. added in latest updates 2013-01-18 13:26:54 +05:30
Nabin Hait
b9b1e67c7d made c-form submittable 2013-01-18 12:58:21 +05:30
Anand Doshi
2865571cb9 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
	patches/patch_list.py
2013-01-18 12:32:00 +05:30
Nabin Hait
a642ae14eb updated gl mapper for tds entry 2013-01-18 10:49:39 +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
8957bf9e09 print hide price list related fields 2013-01-17 20:29:28 +05:30
Anand Doshi
f8f0c0d089 updates in purchase cycle's price list 2013-01-17 20:20:56 +05:30
Nabin Hait
16546d25e7 gl control cleanup[ 2013-01-17 18:43:54 +05:30
Nabin Hait
274de5462b Merge branch 'master' of github.com:webnotes/erpnext 2013-01-17 18:27:20 +05:30
Nabin Hait
1efaf841c4 payment reconciliation fixes 2013-01-17 18:26:58 +05:30
Rushabh Mehta
8af47e8413 Merge branch 'edge' 2013-01-17 18:24:09 +05:30
Rushabh Mehta
80721518e3 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-17 18:23:07 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Nabin Hait
a81010a5b3 removed debug mode 2013-01-17 17:25:55 +05:30
Nabin Hait
144ba186d3 fixes in c-form 2013-01-17 17:21:29 +05:30
Nabin Hait
1b4f56c57f fixes in c-form 2013-01-17 17:01:51 +05:30
Anand Doshi
9d9aec1ed4 shifted get_company_currency from transaction base to setup/utils.py 2013-01-17 15:44:57 +05:30
Rushabh Mehta
6f9915cd17 install from txt files, part 1 2013-01-16 17:48:17 +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
Anand Doshi
6c5262abb1 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco
Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt
2013-01-14 13:28:31 +05:30
Rushabh Mehta
6995bb36e8 module apostrophe link issue 2013-01-14 10:27:18 +05:30
Anand Doshi
4d79bfb225 added back Trend Analyzer report to home pages 2013-01-11 19:06:57 +05:30
Rushabh Mehta
1233c4a800 financial statements: show only companies where permission is given 2013-01-11 11:00:20 +05:30
Anand Doshi
b7d0dcdd14 changed wn.downloadify to wn.tools.downloadify 2013-01-10 14:44:03 +05:30
Rushabh Mehta
846678a1e4 added links to open count in module + other minor fixes 2013-01-10 12:25:25 +05:30
Rushabh Mehta
be0b7df27e Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-01-09 16:41:01 +05:30
Rushabh Mehta
ce1d5276ff added moduleview 2013-01-09 16:39:27 +05:30
Nabin Hait
f8c6531c3d set as default button in fiscal year 2013-01-09 14:44:24 +05:30
Nabin Hait
dc8913e132 toggle display of contact info based on customer and conatct, address query based on customer 2013-01-09 12:35:24 +05:30
Anand Doshi
e9418f3be1 fix in syntax when using erpnext.queries.item 2013-01-08 17:00:02 +05:30
Anand Doshi
6411b930d7 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-08 15:42:40 +05:30
Nabin Hait
4fb4659a03 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-08 15:42:04 +05:30
Rushabh Mehta
143ea718c3 commified item_code query 2013-01-07 17:03:11 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Anand Doshi
62299260dc shifted UOM field to after qty field in purchase cycle 2013-01-04 13:16:34 +05:30