Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,306 Commits 3 Branches 0 Tags 1 GiB
54c1545c49
Commit Graph

292 Commits

Author SHA1 Message Date
Rushabh Mehta
e05135c8c4 [fixes to wnf #127 2013-05-27 18:32:20 +05:30
Anand Doshi
3543f30046 [calculations] [client/server] first cut 2013-05-24 19:25:01 +05:30
Rushabh Mehta
126f2c62f2 [merge] merge with master 2013-05-24 16:09:13 +05:30
Anand Doshi
2168e39bf3 [selling/buying] set dynamic labels 2013-05-23 19:25:08 +05:30
Anand Doshi
4543884021 Merge branch 'edge' of github.com:webnotes/erpnext into webshop 
Conflicts:
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	selling/doctype/quotation/quotation.txt
	selling/doctype/quotation_item/quotation_item.txt
	selling/doctype/sales_order_item/sales_order_item.txt
	stock/doctype/delivery_note_item/delivery_note_item.txt
	stock/doctype/item/item.txt
 2013-05-23 15:22:47 +05:30
Nabin Hait
b7e07ac6a5 [fixes] updated no_copy field 2013-05-22 12:10:16 +05:30
Anand Doshi
f309613a7d [selling] [calculations] client side calculations, cleanup, patch fixes 2013-05-21 19:35:06 +05:30
Anand Doshi
0eef6e9e42 Merge branch 'edge' of github.com:webnotes/erpnext into webshop 
Conflicts:
	patches/patch_list.py
 2013-05-15 21:18:27 +05:30
Anand Doshi
1dde46aff0 [buying, selling] [refactor] get item details 2013-05-15 21:15:57 +05:30
Nabin Hait
da369d8eee [report] requested qty to be ordered 2013-05-13 16:29:28 +05:30
Anand Doshi
ef06a4b349 [autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype 2013-05-09 15:13:47 +05:30
Anand Doshi
bddd5d9b0c [rename] [fix] merge should be passed to on_rename method of controller for further processing 2013-05-09 12:45:18 +05:30
Rushabh Mehta
f514998011 merge 2013-05-09 11:42:35 +05:30
Nabin Hait
620576080a [fixes][currency symbol] fieldtype in report 2013-05-07 12:03:33 +05:30
Nabin Hait
52f7b6daf8 [report] purchase in transit in new style 2013-05-06 12:24:27 +05:30
Nabin Hait
c51c0ce3e9 [fixes] salary slip 2013-05-03 15:40:26 +05:30
Nabin Hait
317f0273e7 [query report] item-wise purchase history 2013-05-03 15:08:12 +05:30
Rushabh Mehta
d3e00995db [conflicts] [merged] 2013-05-02 16:02:59 +05:30
Rushabh Mehta
3aeed95e0a [customer/supplier] [address] extended list to 5 2013-05-02 11:39:46 +05:30
Rushabh Mehta
ecb36f2cb0 [purchase] [validation] validate warehouse belongs to company if set 2013-05-02 11:34:37 +05:30
Rushabh Mehta
cc32b65b66 [toolbars] [design] commonified into common toolbar 2013-04-19 13:01:32 +05:30
Rushabh Mehta
33075e1f69 [files] [patch] dropped file_list property and moved links to 2013-04-10 11:08:50 +05:30
Anand Doshi
e60f4560d1 [supplier] [fix] on_trash sql syntax fix 2013-04-04 14:00:56 +05:30
Nabin Hait
82be7dc301 fixed conflict 2013-03-25 18:30:15 +05:30
Rushabh Mehta
74506e96d3 [profile/email] [feature] added option not to send print as email body. fix in profile delete 2013-03-25 17:52:14 +05:30
Nabin Hait
0fc2454384 aii: patches and fine tuning 2013-03-25 11:06:00 +05:30
Anand Doshi
080f9098c0 deprecated sales and purchase return tool 2013-03-18 17:57:59 +05:30
Anand Doshi
df6ff1385f fixes in warehouse validation 2013-03-11 19:44:52 +05:30
Anand Doshi
88ac485541 minor fixes in utils, purchase common and task 2013-03-11 14:57:45 +05:30
Anand Doshi
b96fef9802 remove cancelled entries from grid report when fetching data based on modified 2013-03-07 15:35:36 +05:30
Anand Doshi
80f7637ae6 added print width in txts of istable type doctypes 2013-03-07 11:37:33 +05:30
Nabin Hait
e1f99586fd fixes in price list for purchase 2013-03-06 14:24:03 +05:30
Rushabh Mehta
c9e32e6c8d fixed patches for new sync 2013-03-06 11:30:09 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Nabin Hait
0d20d6fdd2 fixes for purchase price list 2013-03-04 15:35:45 +05:30
Rushabh Mehta
ba0e1ea194 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-01 19:09:38 +05:30
Rushabh Mehta
213b180060 merge, update bean validations 2013-03-01 19:09:06 +05:30
Nabin Hait
54d209ffb0 sub-contracting code refactored for po 2013-03-01 18:51:10 +05:30
Anand Doshi
1bfec3a6c8 buying - update valuation rate when item row has item_code and quantity, else set valuation rate as 0 2013-02-28 19:17:46 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
Nabin Hait
15e7c18639 fixes in price list currency 2013-02-28 18:10:19 +05:30
Nabin Hait
a71ace0d74 fixed asynchronus issue in purchase cycle 2013-02-28 16:30:53 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
9e02949821 updated language and separated slickgrid files 2013-02-25 11:05:27 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Anand Doshi
cf05580f8e fixes related to Material Request; added button to make Stock Entry of type Material Transfer; calculate ordered_qty and per_ordered in Material Request using observer pattern when Stock Entry against it is submitted or cancelled 2013-02-20 18:44:10 +05:30
Rushabh Mehta
5117d9c266 refactored defaults, bin material request wip 2013-02-19 15:27:31 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Rushabh Mehta
c06ce25470 updated translations 2013-02-18 14:24:05 +05:30
Anand Doshi
10eeae067c rename Purchase Request to Material Request 2013-02-18 13:49:22 +05:30
Anand Doshi
236cc173ad rename Purchase Request to Material Request 2013-02-18 13:49:15 +05:30
Nabin Hait
362455e749 fix outstanding and floating point issue in gl entry 2013-02-13 15:50:39 +05:30
Rushabh Mehta
51709b7eb3 Merge branch 'master' into edge 2013-02-12 19:23:48 +05:30
Rushabh Mehta
4b9827a5fc upgraded test_runner, now can run multiple tests 2013-02-12 19:20:39 +05:30
Nabin Hait
4860754407 call calc_adjustment_amount function only if docstatus is zero 2013-02-12 18:49:55 +05:30
Rushabh Mehta
af222dc6b2 updated language 2013-02-11 11:49:18 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Anand Doshi
6209046772 added some test records 2013-02-07 19:47:34 +05:30
Nabin Hait
9986ae8c6f stock_qty now editable in PO item and PR Item table 2013-02-07 10:51:40 +05:30
Rushabh Mehta
d39c55ae4b added explain to get_status in field for debugging 2013-02-04 10:24:43 +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
dacfa901c6 finished listviews 2013-01-29 18:33:48 +05:30
Rushabh Mehta
08da1a0a3d setting list_views 2013-01-29 17:53:29 +05:30
Rushabh Mehta
b6a45fad5e Merge branch 'master' of github.com:webnotes/erpnext 2013-01-28 14:22:14 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Nabin Hait
0490b77743 made Stock Qty field editable in PO Item table 2013-01-28 12:07:39 +05:30
Rushabh Mehta
7b563f7569 added translation files 2013-01-28 11:19:03 +05:30
Anand Doshi
44077d22cc fixes related to currency and po price list 2013-01-27 17:02:49 +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
e281e670ba Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 07:32:10 +01:00
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Rushabh Mehta
3525b62842 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 06:44:01 +01:00
Rushabh Mehta
f8b9c51e1b Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 10:20:04 +05:30
Rushabh Mehta
4e01011669 added language to pages 2013-01-24 19:31:55 +05:30
Nabin Hait
d1301c7823 purchase analytics based on pur order/pur receipt/pur invoice 2013-01-24 18:38:30 +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
908d09d058 added spanish 2013-01-24 15:55:30 +05:30
Rushabh Mehta
27254d9440 added spanish 2013-01-24 15:55:08 +05:30
Rushabh Mehta
597d470e63 added format_currency and added options to all currency fields 2013-01-23 19:39:51 +05:30
Rushabh Mehta
5842ee0918 removed amendment_date mandatory validation from purchase cucle 2013-01-23 09:17:51 +01:00
Rushabh Mehta
6382a42dbe more fixes to perms, floats and default enabled / disabled in search 2013-01-23 10:09:28 +05:30
Rushabh Mehta
cd4a854a28 converted currency to float and removed level 1 permissions 2013-01-22 15:10:25 +05:30
Nabin Hait
5b4c294b40 commonified in_words function 2013-01-22 11:12:02 +05:30
Nabin Hait
d98b65386e pull item_tax from item master while selecting item in purchase cycle 2013-01-21 18:54:01 +05:30
Nabin Hait
d707e2b6b6 fixes in division by zero in discount calculation 2013-01-21 17:44:14 +05:30
Nabin Hait
223897f145 fixes merge conflict 2013-01-21 17:30:35 +05:30
Nabin Hait
d3b625035c fixes in total_in_words 2013-01-21 17:24:31 +05:30
Rushabh Mehta
bb9968491b added report permissions to txt files 2013-01-21 14:22:07 +05:30
Nabin Hait
30b142b563 removed unwanted import 2013-01-21 14:12:36 +05:30
Nabin Hait
1022198cc8 fixes in purchase price list 2013-01-18 16:47:39 +05:30
Nabin Hait
396f47d029 fixes in purchase price list 2013-01-18 16:29:30 +05:30
Anand Doshi
a81370f2a3 added description to Price List field. added in latest updates 2013-01-18 13:26:54 +05:30
Anand Doshi
8b940ee451 fixes after merge 2013-01-18 13:07:02 +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
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +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
4d79bfb225 added back Trend Analyzer report to home pages 2013-01-11 19:06:57 +05:30
Rushabh Mehta
ce1d5276ff added moduleview 2013-01-09 16:39:27 +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
Anand Doshi
f9a3c8fcdc added status validation 2012-12-28 19:42:49 +05:30
Nabin Hait
5d273df92e changes in layout of module home page 2012-12-28 15:39:21 +05:30
Anand Doshi
44c9def74f if no address, only then have address type as Office 2012-12-27 18:34:35 +05:30
Rushabh Mehta
43eb513a43 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-27 16:50:55 +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
Rushabh Mehta
5f1d57ecb7 address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner 2012-12-27 14:05:02 +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
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
Anand Doshi
f1854b1c2f removed discount from print hide in purchase cycle 2012-12-19 12:01:48 +05:30
Nabin Hait
1a6a94b760 stock entry cleanup 2012-12-18 18:42:02 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Rushabh Mehta
291449b6fb refactored javascript models 2012-12-13 12:53:21 +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
Anand Doshi
c551964d5d Merge branch 'master' into production 
Conflicts:
	patches/patch_list.py
	production/doctype/bom_explosion_item/bom_explosion_item.txt
 2012-12-11 14:59:19 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Anand Doshi
89e2dd8dbb rename Production --> Manufacturing and delete old patches 2012-12-10 19:01:31 +05:30
Rushabh Mehta
af63b16be8 f 2012-12-10 13:41:10 +05:30
Anand Doshi
0952dcdda3 fixed error message in purchase common in update_refdoc_qty 2012-12-08 13:03:57 +05:30
Nabin Hait
2ce027fc9f floating point issue in percentage delivered/billed 2012-12-07 14:43:06 +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
28bc87fb8c fix in supplier creation issue due to missing make_autoname import 2012-12-06 14:55:36 +05:30
Rushabh Mehta
76c4f61ffb more refactoring to renaming 2012-12-06 12:09:52 +05:30
Anand Doshi
737e9db4db changed to cur_frm.call for get uom details 2012-12-05 18:26:28 +05:30
Anand Doshi
bfc6612979 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 16:51:37 +05:30
Anand Doshi
0a32ed3219 allow changing the uom conversion factor in purchase cycle 2012-12-05 16:50:49 +05:30
Anand Doshi
69e9620609 fix in purchase order list 2012-12-05 13:04:14 +05:30
Nabin Hait
b24e783aef deprecated tds 2012-12-04 18:58:15 +05:30
Nabin Hait
1d15c704af rejected serial no fixes 2012-12-03 18:14:16 +05:30
Nabin Hait
23aac61bbf removed basic info section 2012-12-03 17:27:21 +05:30
Anand Doshi
ec8709b009 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-03 15:45:41 +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
Rushabh Mehta
e7fc747520 email_doc:bufix, autoselect in float, number fields 2012-12-03 15:23:11 +05:30
Rushabh Mehta
833f070991 added allow_rename and also fix in autonotification 2012-12-03 11:33:08 +05:30
Anand Doshi
9021ef75d1 minor fixes 2012-11-30 19:45:51 +05:30
Anand Doshi
eaed03d010 replaced convert_to_lists 2012-11-30 17:24:54 +05:30
Anand Doshi
ea61d8cf99 replaced set 2012-11-30 17:18:45 +05:30