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

572 Commits

Author SHA1 Message Date
Anand Doshi
b604eddbfd [minor] [fixes] view in website and other fixes 2013-10-10 15:43:32 +05:30
Rushabh Mehta
69ad94a795 [minor] fixes to form layouts 2013-10-10 15:30:12 +05:30
Rushabh Mehta
ddca90ef7b [communication] [setup wizard] [minor] [fixes] 2013-10-09 16:08:54 +05:30
Rushabh Mehta
5d45557729 [wsgi] [minor] fixed flags 2013-10-08 18:23:05 +05:30
Rushabh Mehta
8c5a5f1ed5 New Setup Wizard 2013-10-08 17:59:11 +05:30
Rushabh Mehta
8941841a9c [setup wizard] added more steps [minor] [wip] 2013-10-07 18:22:29 +05:30
Bárbara Perretti
cd0a40b20f Fix translate sales_person.js 2013-10-04 17:41:33 -03:00
Bárbara Perretti
5cf2c00472 Fix translate sales_partner.js 2013-10-04 17:40:44 -03:00
Bárbara Perretti
cc58f86842 Fix translate item_group.js 2013-10-04 17:37:30 -03:00
Bárbara Perretti
bd16f133ce Fix translate email_digest.js 2013-10-04 17:34:45 -03:00
Bárbara Perretti
6e2fc5c676 Fix translate customer_group.js 2013-10-04 17:31:15 -03:00
Bárbara Perretti
fdb1fd361d Fix translate company.js 2013-10-04 17:23:24 -03:00
Rushabh Mehta
ae307e8bf8 [setup wizard] Started - WIP 2013-10-04 17:48:05 +05:30
Rushabh Mehta
43247cedea [issues] [minor] fixed multiple minor issues 2013-10-03 14:50:55 +05:30
Anand Doshi
fa228e9c9b Merge branch 'master' of github.com:webnotes/erpnext into wsgi 
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py
 2013-10-02 16:52:52 +05:30
Anand Doshi
c49986f092 [minor] [fix] price list table 2013-10-02 16:14:30 +05:30
Anand Doshi
6f817b58ea [minor] [fix] item price grid 2013-10-02 15:16:22 +05:30
Anand Doshi
2ebbe95e04 [minor] [fix] item prices html table 2013-10-02 12:44:59 +05:30
Anand Doshi
b6177cbb5b [minor] change filename to unicode after os.walk and os.listdir 2013-10-01 17:11:39 +05:30
Akhilesh Darjee
67a9ea6800 [price_list] [minor] move header of new grid to right if currency 2013-09-30 19:05:36 +05:30
Akhilesh Darjee
eb8753e8b6 [fix] [minor] new grid to hide delete button on new row & added description 2013-09-30 15:56:36 +05:30
Akhilesh Darjee
9cb2cdbce6 [price_list] [minor] fix of new grid 2013-09-30 15:43:00 +05:30
Akhilesh Darjee
7d36fc821b [fix] [minor] new grid fix to hide other grid 2013-09-30 12:44:00 +05:30
Akhilesh Darjee
d086d724b6 [price_list] new grid finished with fixes 2013-09-30 11:37:44 +05:30
Akhilesh Darjee
ff15367a1d Merge branch 'master' of github.com:webnotes/erpnext 2013-09-30 11:35:36 +05:30
Akhilesh Darjee
2ba61236c1 [price list] make new grid 2013-09-27 21:08:37 +05:30
Anand Doshi
5b004ff8a7 Merge branch 'master' of github.com:webnotes/erpnext into wsgi 
Conflicts:
	accounts/doctype/account/account.py
	accounts/doctype/gl_entry/gl_entry.py
	accounts/doctype/period_closing_voucher/period_closing_voucher.py
	stock/doctype/delivery_note/delivery_note.py
	stock/doctype/landed_cost_wizard/landed_cost_wizard.py
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/stock_ledger/stock_ledger.py
	stock/doctype/warehouse/warehouse.py
	stock/stock_ledger.py
 2013-09-25 19:55:41 +05:30
Nabin Hait
a7687e9ab6 [fix] [minor] create default web page only for first company 2013-09-25 13:43:35 +05:30
Nabin Hait
69a3ee54f2 [fix] [minor] create default warehouse on saving of company if not exists 2013-09-25 13:00:22 +05:30
Nabin Hait
625da79e9f item-wise price list rate, editable report 2013-09-25 10:32:51 +05:30
Anand Doshi
de8b6aadaf [minor] fixes for import conf 2013-09-24 17:17:39 +05:30
Nabin Hait
11f41955c9 [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
Pratik Vyas
cfed8c44b4 conf migration 2013-09-21 15:16:47 +05:30
Pratik Vyas
5e16a69b35 mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
Pratik Vyas
e55fbfc090 remove sql = 2013-09-18 11:10:59 +05:30
Anand Doshi
83de391efc Merge branch 'akhileshdarjee-master' into website-wip 2013-09-17 16:09:15 +05:30
Anand Doshi
2840620070 [fix] [minor] [website] 2013-09-17 15:28:58 +05:30
Nabin Hait
142007a226 [fix] [minor] perpetual inventory: account for each warehouse 2013-09-17 15:15:16 +05:30
Anand Doshi
619ed5e949 [fix] [minor] [website] 2013-09-17 13:46:50 +05:30
Nabin Hait
5cd1d54347 [minor] merged with master branch 2013-09-17 10:30:24 +05:30
Nabin Hait
7a75e10a61 [fix] [minor] perpetual inventory: account for each warehouse 2013-09-17 10:21:20 +05:30
Akhilesh Darjee
2e1f94f222 [fix] [pos] hide custom buttons in pos view 2013-09-13 17:37:23 +05:30
Anand Doshi
8a4b21ab8e Merge branch 'master' of github.com:webnotes/erpnext into website-wip 2013-09-11 19:38:38 +05:30
Akhilesh Darjee
fb6d410e60 [fix] test cases fix for price list 2013-09-11 16:18:10 +05:30
Akhilesh Darjee
c3ec72c991 [fix] [minor] merge conflict fixed 2013-09-11 14:49:38 +05:30
Akhilesh Darjee
db59ffb76d [usability] item price moved to price list 2013-09-11 13:05:24 +05:30
Nabin Hait
6e6ba9de14 [minor] label changed in sms settings 2013-09-10 17:20:42 +05:30
Anand Doshi
429fd1d3d8 Merge branch 'website-wip' of github.com:webnotes/erpnext into website-wip 2013-09-10 12:54:10 +05:30
Rushabh Mehta
7c2312a74c [website] [minor] moving to framework 2013-09-10 12:51:52 +05:30
Anand Doshi
9686b937bb [fix] [minor] print hide communication table 2013-09-10 10:54:34 +05:30
Rushabh Mehta
bdb846f665 [website] [minor] moving to framework 2013-09-09 17:31:19 +05:30
Rushabh Mehta
c59c4e0699 [website] [minor] moving to framework 2013-09-09 12:17:45 +05:30
Rushabh Mehta
46089dbc97 [website] [minor] moving website helper methods to doctypes 2013-09-09 11:32:24 +05:30
Nabin Hait
a653cd3608 [minor] fixed conflict while merging with master 2013-09-05 10:56:44 +05:30
Nabin Hait
2162fee396 Merge pull request #792 from akhileshdarjee/master 
[pos][fix] fixed pos view in sales_invoice.js
 2013-09-04 22:03:42 -07:00
Akhilesh Darjee
734b2aab5c [fix] pos setting link fields validate to specific company 2013-09-04 18:48:08 +05:30
Nabin Hait
bf4d27ecf1 [minor] repost future gl entries only for current voucher items 2013-09-04 17:55:45 +05:30
Anand Doshi
36b63a44b9 [fix] [minor] profile query 2013-09-03 15:33:56 +05:30
Nabin Hait
3f5e59eeeb [minor] [cleanup] Landed cost wizard 2013-09-02 18:44:55 +05:30
Rushabh Mehta
96690ebd0f [communication] [minor] cleaed model 2013-09-02 17:04:27 +05:30
Nabin Hait
d85d63bb81 [minor] renamed perpetual accounting to make_accounting_entry_for_every_stock_entry 2013-08-28 19:24:52 +05:30
Nabin Hait
92b0e777e8 [fix] [minor] merged with master 2013-08-26 16:55:42 +05:30
Nabin Hait
27994c216a [perpetual accounting] gl entries based on stock_value difference in sl entries 2013-08-26 16:53:30 +05:30
Akhilesh Darjee
d6aa4bff7f [pos] pos view first commit 2013-08-22 17:26:43 +05:30
Nabin Hait
11bd44e447 [minor] fixed conflict while merging with master 2013-08-21 17:51:46 +05:30
Rushabh Mehta
cce21d11fa [major] upgrade to bootstrap 3 2013-08-21 17:48:08 +05:30
Nabin Hait
9b09c95d83 [cleanup] [accounts] delete gl entries on cancellation of accounting transactions 2013-08-21 17:47:11 +05:30
Nabin Hait
74c281cc55 [cleanup] [minor] On cancellation of transation, do not post cancelled sl entries, delete allexisting sl entries against that transaction 2013-08-19 16:17:18 +05:30
Nabin Hait
44da6f2efe [fix] [minor] fixed conflict while merging with master 2013-08-19 11:06:06 +05:30
Nabin Hait
4af2dbf84d [perpetual accounting] [minor] patch for intial setup 2013-08-12 12:24:08 +05:30
Rushabh Mehta
813b1cba65 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-09 18:12:15 +05:30
Rushabh Mehta
4a404e9299 [price list] Separated Default Price List for Selling and Buying and changed fieldnames 2013-08-09 18:11:35 +05:30
Nabin Hait
d9ef559f3b [fix] [minor] fix in updating numbering series 2013-08-09 13:17:32 +05:30
Rushabh Mehta
0983cb75d5 [cleanup] [minor] removed default value 0.00 2013-08-07 15:06:51 +05:30
Nabin Hait
cc0e2d1740 [minor] merged with master 2013-08-06 16:19:18 +05:30
Nabin Hait
43eba26dcf [perpetual accounting] make gl entries relevant for different transactions 2013-08-06 16:00:50 +05:30
Anand Doshi
7e76ca350c [fix] default float precision = 3, changed description of float precision in global defaults [issue] webnotes/erpnext#712 2013-08-06 13:33:42 +05:30
Rushabh Mehta
a1d668a6e3 [nested set] [minor] Added validation to test loop in hierarchy 2013-08-05 18:14:39 +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
Anand Doshi
e79d57ca19 [salary slip] total no. of working days calculation [issue] webnotes/erpnext#285 2013-08-02 19:31:41 +05:30
Anand Doshi
5cd58dc387 [usability] [issue] webnotes/erpnext#606 - disable default currency after a transaction is created for a company 2013-08-01 18:58:35 +05:30
Anand Doshi
49154c790e [fix] if no valid territory for price list, try adding the user's default territory 2013-08-01 15:43:33 +05:30
Rushabh Mehta
e3742322fb Merge branch 'master' of github.com:webnotes/erpnext 2013-07-30 16:20:19 +05:30
Rushabh Mehta
ed186b719e [demo] [minor] Started make_demo.py 2013-07-30 16:19:40 +05:30
Anand Doshi
a648f46d4e [fix] [minor] show stock ledger, general ledger, fixes post changes in script manager trigger [issue] webnotes/wnframework#228 2013-07-30 14:43:29 +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
5f6022681b [fix] [minor] email digest events fix 2013-07-28 09:15:11 +05:30
Anand Doshi
2b518e37e5 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-26 11:34:38 +05:30
Anand Doshi
720a01a6f6 [selling] changed fieldtype of Price List to link 2013-07-26 11:32:02 +05:30
Rushabh Mehta
dea6e51929 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-26 11:22:09 +05:30
Rushabh Mehta
c4f5e4fd3f [docs] remove attributions from page and added to docs 2013-07-26 11:21:45 +05:30
Anand Doshi
23de6df72e [fix] [minor] replace single quote in territory name while creating territories in setup control 2013-07-25 19:30:13 +05:30
Rushabh Mehta
4dca40195e [feature] Ability to set UOM as Integer-only and related validations. 2013-07-25 17:45:59 +05:30
Rushabh Mehta
8f81a6f6c6 [feature] [setup] Added Refresh 2013-07-25 15:01:44 +05:30
Nabin Hait
48a0bd3eda [minor] [fix] price list currency read only and SO-MR mapping 2013-07-23 15:31:39 +05:30
Anand Doshi
648a5c7e33 [fix] added required permissions for fiscal year, brand, company, country, currency, item group, price list, uom and warehouse 2013-07-23 12:07:55 +05:30
Anand Doshi
832dd5f27d Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 16:36:38 +05:30
Rushabh Mehta
500ce2bd6d [minor] [fix] #218 add default home icon in website if brand not set so it appears okay for small layouts 2013-07-22 16:30:40 +05:30
Anand Doshi
fbd47e3da5 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 16:26:44 +05:30