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

468 Commits

Author SHA1 Message Date
Akhilesh Darjee
81578d2e77 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix 2014-02-03 17:48:46 +05:30
Akhilesh Darjee
8f674fe0fb minor changes 2014-02-03 17:47:50 +05:30
Rushabh Mehta
cc008cc109 commonified get_party_details 2014-02-03 16:14:56 +05:30
Rushabh Mehta
347889b233 merge 2014-02-03 14:49:53 +05:30
Nabin Hait
23c28704d2 Field arrangement in child table 2014-02-03 14:36:59 +05:30
Nabin Hait
dfae0ea570 minor fix in patch 2014-01-31 17:25:09 +05:30
Nabin Hait
7f80485070 Merge pull request #1374 from akhileshdarjee/sms-center 
SMS center character count
 2014-01-31 02:57:35 -08:00
Akhilesh Darjee
4e3b601990 webnotes/erpnext#1188 sms center character count 2014-01-30 19:13:25 +05:30
Akhilesh Darjee
e0a1039756 merge conflict fixed 2014-01-30 14:44:35 +05:30
Nabin Hait
0ff32e73ba Merged with 4.0.0-wip 2014-01-30 12:41:52 +05:30
Nabin Hait
fe8db590a1 Fixed conflict while merging with develop 2014-01-30 12:32:47 +05:30
Nabin Hait
b87e9f2651 Fixes in fetching party details 2014-01-29 19:51:36 +05:30
Akhilesh Darjee
b665d86292 patch to reload all sales and purchase doctypes and print formats 2014-01-29 17:40:34 +05:30
Akhilesh Darjee
4f7215662d webnotes/erpnext#1090 set default tax type in customer and supplier 2014-01-29 16:31:38 +05:30
Rushabh Mehta
24da761a17 more updates to party 2014-01-29 15:26:04 +05:30
Akhilesh Darjee
2ced3b07d4 changed fieldname from charge to taxes 2014-01-28 19:16:05 +05:30
Rushabh Mehta
49dd7bee87 added get_supplier_details and commonified invoice functions 2014-01-28 17:43:10 +05:30
Nabin Hait
21d324c597 Merged with 4.0-wip 2014-01-28 15:52:25 +05:30
Akhilesh Darjee
ffa4769b51 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix 2014-01-27 17:32:32 +05:30
Akhilesh Darjee
86894f3bbf merge conflict fixed 2014-01-27 15:42:02 +05:30
Anand Doshi
cb39e0878e Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 
Conflicts:
	config.json
	erpnext/accounts/utils.py
	erpnext/patches/patch_list.py
	erpnext/stock/doctype/price_list/price_list.txt
	erpnext/stock/doctype/warehouse/warehouse.py
	portal/templates/sale.html
	portal/utils.py
	selling/doctype/sales_order/templates/pages/order.py
	selling/utils/cart.py
	selling/utils/product.py
	utilities/demo/demo_docs/Fiscal_Year.csv
	utilities/demo/make_demo.py
 2014-01-24 21:44:36 +05:30
Akhilesh Darjee
a4e0a1c061 minor changes 2014-01-24 19:57:52 +05:30
Rushabh Mehta
1cd96a136f updates for restriction 2014-01-24 11:10:24 +05:30
Rushabh Mehta
f96bcf943b added explicit delete perimssions 2014-01-20 17:52:13 +05:30
Nabin Hait
5c6d13a0df Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
Nabin Hait
dc15b4fa8a Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
Nabin Hait
f6cf5e0f43 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-cleanup 2014-01-06 17:36:04 +05:30
Akhilesh Darjee
e27717261d merge conflict fixed 2014-01-03 18:18:31 +05:30
Akhilesh Darjee
57738a0ff3 flat discount replaced to discount amount 2014-01-03 18:15:07 +05:30
Akhilesh Darjee
5c96b75a68 fixed maintenance schedule 2014-01-02 17:54:12 +05:30
Rushabh Mehta
b09d9dabc5 started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions 2014-01-02 11:47:23 +05:30
Nabin Hait
06720dfb90 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip 2014-01-01 10:47:18 +05:30
Nabin Hait
a2e0a9b05f Fliend rearrangemet in tables 2014-01-01 10:45:42 +05:30
Anand Doshi
9a4a13cb73 Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes 2013-12-31 17:38:21 +05:30
Akhilesh Darjee
829eda47a8 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount 2013-12-30 12:31:07 +05:30
Akhilesh Darjee
d203aea7c2 [flat discount] flat discount implemented on sales cycle 2013-12-27 17:49:57 +05:30
Rushabh Mehta
c4a0ed63ef Moved demo to separate app, moved patches folder 2013-12-27 17:30:24 +05:30
Rushabh Mehta
4ac68952e8 Moved patches and fixed method routing in pages 2013-12-27 13:43:40 +05:30
Anand Doshi
8e332ffd16 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 
Conflicts:
	erpnext/accounts/page/accounts_browser/accounts_browser.css
	erpnext/controllers/buying_controller.py
	erpnext/manufacturing/doctype/production_order/production_order.py
	erpnext/patches/patch_list.py
	erpnext/selling/doctype/customer/customer.txt
	erpnext/selling/doctype/sales_order/sales_order.py
	erpnext/selling/doctype/sales_order/test_sales_order.py
	erpnext/setup/doctype/features_setup/features_setup.txt
	erpnext/stock/doctype/stock_entry/test_stock_entry.py
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	startup/query_handlers.py
 2013-12-26 19:12:51 +05:30
Rushabh Mehta
54047780fc Merge with 3.3.8 2013-12-26 11:07:46 +05:30
Rushabh Mehta
df200f305b Redesigned templates. Now all templates must be inside templates/pages templates/generators 2013-12-25 15:19:22 +05:30
Rushabh Mehta
6de403f2be added manifest, hooks and fixed requires webnotes/wnframework#351 2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
Rushabh Mehta
d2dd83c3a3 fixed template loader webnotes/wnframework#351 2013-12-12 13:57:58 +05:30
Rushabh Mehta
39bb8e2ed4 step 0: install 2013-12-11 15:32:14 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Anand Doshi
1fc9ae2230 Fixes and Validations for nested doctypes 2012-09-24 14:00:59 +05:30
Rushabh Mehta
09d84b6575 Stock Ageing & release of Analytics 2012-09-21 19:46:24 +05:30
Rushabh Mehta
f200c5296d added sales analytics 2012-09-21 15:19:40 +05:30
Anand Doshi
6450b12881 fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form 2012-09-17 11:34:24 +05:30
Anand Doshi
4de55b6f6b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 14:44:03 +05:30
Nabin Hait
eb9f6eda02 order type fix in quote/SO 2012-09-10 14:36:49 +05:30
Anand Doshi
e67bcc38b4 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 17:51:05 +05:30
Anand Doshi
f480dc9d2e fix in opportunity to quotation fetch 2012-09-06 17:50:44 +05:30
Anand Doshi
f03e3bb06b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 07:55:19 +05:30
Anand Doshi
e642805882 changed date displayed in transaction listing from modified date to transaction/posting date 2012-09-03 13:32:25 +05:30
Anand Doshi
b211a41547 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-31 13:39:58 +05:30
Anand Doshi
00d3c7c67d open communication in dialog 2012-08-31 13:25:03 +05:30
Anand Doshi
62a3881837 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-30 18:17:20 +05:30
Nabin Hait
fff16c337d fixes in over billing validation 2012-08-29 12:07:32 +05:30
Nabin Hait
9c043b2f51 Billed amount in SO and DN based on export amount and patch for it 2012-08-29 11:46:12 +05:30
Anand Doshi
998d39f71b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-24 12:17:33 +05:30
Anand Doshi
ba278000d7 edit / add nodes allowed in sales browser, only if user has valid permissions 2012-08-24 12:15:44 +05:30
Rushabh Mehta
24fabf3b73 cleaned up source from lead 2012-08-06 15:21:35 +05:30
Rushabh Mehta
f83159edbe Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-08-06 10:17:38 +05:30
Rushabh Mehta
49dc5da0dc refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:24 +05:30
Rushabh Mehta
384b61749e added 'blog_subscriber' and 'unsubscribed' fields 2012-08-03 14:09:32 +05:30
Rushabh Mehta
f0018b5e05 added unsubscribed fields in Lead and Contact and cleaned up sendmail function 2012-08-02 18:03:12 +05:30
Anand Doshi
cf546d547d fix in quotation item's get query 2012-08-01 12:05:13 +05:30
Anand Doshi
96efd2ba9b fix in quotation item's get query 2012-08-01 12:00:30 +05:30
Rushabh Mehta
0fa628bf86 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
	public/js/report-legacy.js
 2012-07-26 15:46:13 +02:00
Anand Doshi
e87482ac86 Fixed: Lead Lost Reason message 2012-07-26 12:48:26 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb Merge branch 'master' of github.com:webnotes/erpnext into dev 
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
	public/js/all-app.js
 2012-07-18 20:31:37 +05:30
Anand Doshi
249659d673 Changed file names from listview.js to doctype_name_list.js 2012-07-18 20:25:58 +05:30
Anand Doshi
f2f5c94c41 Default Currency specification for Customer and Supplier 
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
 2012-07-18 20:13:52 +05:30
Nabin Hait
18b9eccdfa packing list issue fixed 2012-07-18 13:31:08 +05:30
Nabin Hait
41c922d200 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-18 13:19:32 +05:30
Nabin Hait
510eda353a packing list issue fixed 2012-07-18 13:19:01 +05:30
Nabin Hait
8b091cd864 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 16:35:10 +05:30
Nabin Hait
a25ebe3dbf Conversion rate fieldtype set as float (from currency) 2012-07-16 16:34:28 +05:30
Anand Doshi
2f192a6167 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 16:33:22 +05:30
Anand Doshi
8499773db8 fix in last sales and quote rate in quotation 2012-07-16 16:33:10 +05:30
Rushabh Mehta
527c5b6da5 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 15:45:18 +05:30
Rushabh Mehta
3c419c5e05 cur_frm.doc re-reference when is called 2012-07-16 15:44:38 +05:30
Nabin Hait
65535da220 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 15:38:41 +05:30
Nabin Hait
49e170153e Include in print rate validation added 2012-07-16 15:38:11 +05:30
Anand Doshi
e7c54a4714 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 15:16:27 +05:30
Anand Doshi
7f2385cee9 Merge branch 'master' into dev 2012-07-16 15:15:34 +05:30
Anand Doshi
59fa430be3 fixes in quotation item code get query 2012-07-16 15:15:24 +05:30
Rushabh Mehta
9e9809a44f Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 14:17:22 +05:30
Rushabh Mehta
2eef40bf1e get_field > wn.meta.get_docfield 2012-07-16 14:16:57 +05:30
Nabin Hait
8f5cd388cc Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 12:50:25 +05:30
Nabin Hait
388e09834c Check duplicate SO entry for same po no and customer 2012-07-16 12:49:52 +05:30
Anand Doshi
bb81c198f5 Merge branch 'dev' of github.com:webnotes/erpnext into dev 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-07-13 16:48:08 +05:30
Anand Doshi
9ec8024db7 show order type icon in sales order list view 2012-07-13 16:46:12 +05:30
Rushabh Mehta
8cbbab2e75 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-12 18:01:31 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30
Nabin Hait
70db682a9a fixed conflict in setup control 2012-07-12 11:47:40 +05:30
Rushabh Mehta
5faf37f312 item group cleanup 2012-07-12 11:33:00 +05:30
Rushabh Mehta
cf969143f2 cleaned up customer group 2012-07-12 09:54:43 +05:30
Rushabh Mehta
b9fabf8e16 sales bom cleanup 2012-07-11 19:18:50 +05:30
Nabin Hait
cfc6bb1d6c consider warehouse, serial no and batch no from packing list for sales bom item and populate packing list only for sales bom items 2012-07-11 13:14:52 +05:30
Nabin Hait
0a38e4528b Merge branch 'master' of github.com:webnotes/erpnext 2012-07-10 10:28:21 +05:30
Nabin Hait
1b310c26ce removed depricated commenting style 2012-07-10 10:27:58 +05:30
Anand Doshi
95a822c701 Fetch Customer's Item Code in Sales Transaction 2012-07-09 11:09:07 +05:30
Nabin Hait
cb2e76a79c delete row issue in grid fixed 2012-07-05 14:44:39 +05:30
Anand Doshi
d383e573fc contact, address list views and allow their deletion from customer / supplier form 2012-07-02 19:45:35 +05:30
Anand Doshi
e301e8a6c1 Merge branch 'master' into dev 
Conflicts:
	erpnext/buying/doctype/quality_inspection/quality_inspection.py
 2012-06-28 18:40:57 +05:30
Nabin Hait
2c2a17f138 pull available qty in so and DN in selection of item 2012-06-27 15:14:58 +05:30
Anand Doshi
d4425cc57d Merge branch 'master' into dev 
Conflicts:
	erpnext/support/doctype/maintenance_visit/maintenance_visit.py
 2012-06-27 14:13:34 +05:30
Anand Doshi
81fa802e09 Merge branch 'master' into dev 2012-06-25 20:06:54 +05:30
Anand Doshi
8ae5ba9abf fixes related to --> clear locals and then sync locals when whole doclist is passed 2012-06-25 20:05:35 +05:30
Nabin Hait
a5e972dd89 reserved warehouse in so and delivery warehouse in dn can be different 2012-06-25 18:06:37 +05:30
Nabin Hait
318eab813c delete customer account on deletion of customer record 2012-06-22 13:35:13 +05:30
Anand Doshi
2939a0ea65 fetch price list rates when creating quotation from opportunity 2012-06-21 11:20:37 +05:30
Anand Doshi
f8946b1e31 fix in buttons displayed - on change of status in lead form 2012-06-18 18:04:28 +05:30
Anand Doshi
7d1e8f218b change date field for sales invoice in sales personwise transaction summary search criteria 2012-06-14 18:11:36 +05:30
Rushabh Mehta
4c56275d26 appframe is now heading 2012-06-14 11:05:09 +05:30
Anand Doshi
7deaff1979 fixed default tax fetch issue 2012-06-13 14:20:24 +05:30
Anand Doshi
0146ddcfc6 delete communication log for supplier and customer, on trash 2012-06-12 14:09:44 +05:30
Anand Doshi
89e2b3bda4 minor fix in lead's listview 2012-06-12 13:11:29 +05:30
Anand Doshi
3b6eda3b45 fix in listviews of lead, customer and supplier 2012-06-12 13:08:57 +05:30
Nabin Hait
be5e5059c3 Lead Organization field added in quotation 2012-06-08 16:15:08 +05:30
Nabin Hait
2e3579a4eb Item Barcode implemented 2012-06-07 19:09:17 +05:30
Anand Doshi
dbb84a271e Merge branch 'master' of github.com:webnotes/erpnext into comm_log 
Conflicts:
	erpnext/selling/doctype/lead/lead.js
	erpnext/setup/doctype/contact_control/contact_control.js
 2012-06-05 18:37:17 +05:30
Nabin Hait
e315aba130 expected delivery date mandatory only if order type is sales 2012-06-01 10:11:14 +05:30
Anand Doshi
a6708fb748 new doctype: communication 2012-05-31 14:53:55 +05:30
Nabin Hait
0908b2709b fixed conflict 2012-05-31 11:49:37 +05:30
Nabin Hait
5c1de3a639 fixed conflict 2012-05-31 11:47:09 +05:30
Nabin Hait
353bc313a6 Link to Sales/accounts browser fixed 2012-05-31 11:43:14 +05:30
Anand Doshi
82695ddd90 fixes in transaction history of customer and supplier 2012-05-29 14:14:27 +05:30
Anand Doshi
2ac77beb50 fix in packing list issue 2012-05-29 11:29:52 +05:30
Anand Doshi
2ad2426610 fix in get other charges of sales_common.py 2012-05-28 16:05:54 +05:30
Anand Doshi
041cea763e fix in stock ledger entry for items have sales bom 2012-05-25 17:49:37 +05:30
Anand Doshi
16cf4fa806 fix in get_item_list, which was causing negative stock error 2012-05-25 16:54:27 +05:30
Anand Doshi
fcbd2ad792 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-23 18:27:29 +05:30
Anand Doshi
9da0bf6106 fix in customer address contact report 2012-05-23 18:27:05 +05:30
Nabin Hait
4aaaa8af7b Merge branch 'master' of github.com:webnotes/erpnext 2012-05-23 16:22:41 +05:30
Nabin Hait
2b06b903a5 Merge branch 'shf_rename' 2012-05-23 16:22:24 +05:30
Nabin Hait
517eacf9e3 packing list code updated for duplicate items in item table 2012-05-23 16:21:39 +05:30
Anand Doshi
9327bb9585 fix in tag viewing in doclistview 2012-05-23 15:12:22 +05:30
Nabin Hait
86df78aabc fixed conflict 2012-05-23 11:33:28 +05:30
Anand Doshi
38830ddae1 removed console log in customer.js 2012-05-23 10:55:59 +05:30
Nabin Hait
611157447f sms fix 2012-05-22 17:25:39 +05:30
Anand Doshi
e780f661a7 fix in transaction history 2012-05-22 17:04:33 +05:30
Nabin Hait
86375f089a Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-21 15:48:21 +05:30
Nabin Hait
cba9c716f2 Remove all those parent items from packing details which are no longer present in main item table 2012-05-21 15:35:23 +05:30
Nabin Hait
fec3f783af custom field included in docfield query 2012-05-21 14:40:25 +05:30