Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,965 Commits 3 Branches 0 Tags 1 GiB
07287e8b93
Commit Graph

483 Commits

Author SHA1 Message Date
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
Rushabh Mehta
9b1ddfd9ef merge 2013-01-02 15:32:29 +05:30
Rushabh Mehta
d4872483e4 fixes to permission manager / user property setter 2013-01-02 15:29:37 +05:30
Nabin Hait
e8b7ac1469 opening and closing balance fix in general ledger 2013-01-02 15:11:29 +05:30
Nabin Hait
2f1d1a05b8 general ledger report group by ledgers 2013-01-01 19:52:52 +05:30
Anand Doshi
6f6fadd360 group gl entries by ledger 2013-01-01 18:32:49 +05:30
Nabin Hait
3882db03e2 Trial Balance : with/without closing entry 2013-01-01 13:48:40 +05:30
Rushabh Mehta
8bf41ea461 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-31 10:52:10 +05:30
Rushabh Mehta
e2c7e583f5 updated usability of payment_to_invoice_matching tool and fixed hide_toolbar 2012-12-31 10:51:31 +05:30
Nabin Hait
5d273df92e changes in layout of module home page 2012-12-28 15:39:21 +05:30
Anand Doshi
b420e88955 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-27 15:36:30 +05:30
Anand Doshi
b62c4edf02 added is_item_table_empty validation in submit event of purchase common 2012-12-27 15:35:58 +05:30
Nabin Hait
562de92070 removed project related doctype mapper 2012-12-27 15:14:27 +05:30
Anand Doshi
98d588cd7d deprecated form 16 print format 2012-12-25 18:53:25 +05:30
Anand Doshi
a0713196d2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-24 18:08:16 +05:30
Anand Doshi
f5d90abe92 addchild will never save added doc 2012-12-24 17:02:38 +05:30
Rushabh Mehta
6f65de15ae appframe fixes 2012-12-22 13:50:35 +05:30
Nabin Hait
f33831abe4 Merge branch 'master' into production 2012-12-20 14:31:26 +05:30
Nabin Hait
457b0b8648 fixes in sales/purchase register 2012-12-20 14:29:53 +05:30
Anand Doshi
def65c671d show manufacturing small icon 2012-12-20 12:18:24 +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
Nabin Hait
4ecc785aab fixed conflict 2012-12-19 12:18:15 +05:30
Anand Doshi
ab28978755 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-19 12:02:46 +05:30
Anand Doshi
f1854b1c2f removed discount from print hide in purchase cycle 2012-12-19 12:01:48 +05:30
Nabin Hait
bb852e45e9 fixes in ordered/delivered items to be billed 2012-12-19 11:55:42 +05:30
Nabin Hait
64a839a747 fixes in ordered/delivered items to be billed 2012-12-19 11:43:28 +05:30
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Rushabh Mehta
7adf17e95d Merge branch 'master' of github.com:webnotes/erpnext 2012-12-18 11:47:46 +05:30
Rushabh Mehta
ee472b0926 upgraded to bootstrap 2.2 2012-12-18 11:47:13 +05:30
Nabin Hait
5c2bb9d9ed sales order linked with project 2012-12-18 10:44:01 +05:30
Nabin Hait
9ea22b75bd Merge branch 'master' into production 2012-12-17 11:39:41 +05:30
Nabin Hait
49415d90fc create recurring invoices on any date 2012-12-17 11:09:08 +05:30
Nabin Hait
3af7b981fa Merge branch 'master' of github.com:webnotes/erpnext 2012-12-17 10:50:13 +05:30
Nabin Hait
506f7a3f7b fixed null issue in recurring invoice 2012-12-17 10:49:20 +05:30
Nabin Hait
0a8a67129e fixed null issue in recurring invoice 2012-12-17 10:48:04 +05:30
webnotes
ff4e996a8f fixed syntax error in recurring sales invoice code 2012-12-15 17:51:24 +05:30
Nabin Hait
fce76cd5b2 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-14 13:21:52 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Rushabh Mehta
a59aa68eac added new reports 2012-12-14 10:27:10 +05:30
Nabin Hait
22c3f63edd small fixes: sms, quotation messages etc 2012-12-13 15:09:42 +05:30
Rushabh Mehta
e848e9c4c3 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-13 13:14:22 +05:30
Rushabh Mehta
291449b6fb refactored javascript models 2012-12-13 12:53:21 +05:30
Nabin Hait
561be839c5 voucher import tool message 2012-12-12 16:35:31 +05:30
Nabin Hait
003b31ae06 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-12 16:27:22 +05:30
Nabin Hait
06cbd3427f dynamic query for root in sales browser, validation for tree structure document 2012-12-12 16:26:39 +05:30
Rushabh Mehta
d1b2afcd18 webnotes.user.roles deprecated to webnotes.user.get_roles() 2012-12-12 15:58:46 +05:30
Nabin Hait
be356b8692 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-12 12:58:22 +05:30
Rushabh Mehta
74aebf0965 added Communication to Selling and refactored module pages a bit 2012-12-12 11:03:51 +05:30
Anand Doshi
c3b9a00c53 changed old type txt to new type txtt 2012-12-11 15:20:53 +05:30
Nabin Hait
69b3730a18 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-11 14:36:19 +05:30
Nabin Hait
cddbe6dd80 validation while created through company saving and root deleted 2012-12-11 14:35:45 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Rushabh Mehta
af63b16be8 f 2012-12-10 13:41:10 +05:30
Rushabh Mehta
a494b88ad8 updates to website: removed webnotes.cms 2012-12-07 12:44:45 +05:30
Nabin Hait
f71d8e0ee4 debit/credit adjustment if there is difference due to rounding 2012-12-06 17:24:59 +05:30
Anand Doshi
bd8ef60929 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-06 15:15:18 +05:30
Anand Doshi
85e44b4247 fix in voucher import tool 2012-12-06 15:14:51 +05:30
Rushabh Mehta
89c7b41fee account_browser: remove can_create check 2012-12-06 14:58:44 +05:30
Rushabh Mehta
06d24a60d0 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-06 12:19:33 +05:30
Rushabh Mehta
b536d36771 more refactoring to renaming 2012-12-06 12:19:05 +05:30
Rushabh Mehta
76c4f61ffb more refactoring to renaming 2012-12-06 12:09:52 +05:30
Nabin Hait
27184e0e05 default filters set in debtors and creditors ledger 2012-12-06 11:46:41 +05:30
Rushabh Mehta
a112981ca2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 14:34:51 +05:30
Rushabh Mehta
39c356393b refactored leave and expense 2012-12-05 14:27:50 +05:30
Nabin Hait
1ad42f09df bom fixes: item selection before server call 2012-12-05 12:36:19 +05:30
Nabin Hait
b24e783aef deprecated tds 2012-12-04 18:58:15 +05:30
Rushabh Mehta
535d6c4d91 added client side functions and mode_of_payment defaults 2012-12-04 16:34:26 +05:30
Rushabh Mehta
586ac7c977 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-04 16:32:28 +05:30
Rushabh Mehta
bbd5ea32d1 added client side functions and mode_of_payment defaults 2012-12-04 16:31:54 +05:30
Anand Doshi
188f977f73 fixes in tax controller and tests 2012-12-04 16:17:48 +05:30
Anand Doshi
5c2319549a updated webnotes.utils.__init__ with a few refactored methods 2012-12-04 11:53:42 +05:30
Nabin Hait
23aac61bbf removed basic info section 2012-12-03 17:27:21 +05:30
Anand Doshi
ef6a76f8aa fixes in renaming account, supplier, customer; fixes in accounts browser; fixes in customer address contact fetching in opportunity 2012-12-03 15:45:03 +05:30