Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,082 Commits 3 Branches 0 Tags 1 GiB
c5e813f9f4
Commit Graph

681 Commits

Author SHA1 Message Date
Nabin Hait
d0605443fb removed print statement 2014-05-30 11:22:13 +05:30
Nabin Hait
47a8670d37 pricing rule testcase fixes 2014-05-30 11:22:12 +05:30
Nabin Hait
ccb9826afd pricing list tets case fixes 2014-05-30 11:22:12 +05:30
Nabin Hait
a3dd72a759 Pricing Rule 2014-05-30 11:22:10 +05:30
Rushabh Mehta
f944e819e9 fixes #1581 and added icons to grid reports 2014-05-27 15:22:04 +05:30
Rushabh Mehta
a7c46e4d83 removed debug in query (packing_slip.py) 2014-05-26 13:35:47 +05:30
Rushabh Mehta
b15d760406 fix to packing slip (validation) 2014-05-26 13:05:19 +05:30
Nabin Hait
edf87a258f Create serial no based on series only if item is serialized 2014-05-21 15:38:56 +05:30
Nabin Hait
2e0620e370 Server side onload functionality in multiple docs 2014-05-19 18:15:58 +05:30
Nabin Hait
b5a8cab8df Valuation Rate column in Stock Ledger report. Fixed #1633 2014-05-15 11:50:46 +05:30
Anand Doshi
54b7962eb9 Pass frm to open_mapped_doc 2014-05-14 17:38:45 +05:30
Anand Doshi
39cc1df560 Fixes #1635, Stock Reconcilation 2014-05-14 15:10:00 +05:30
Anand Doshi
4c83e407a9 Changed Print Format files to lowercase 2014-05-13 17:58:30 +05:30
Nabin Hait
aade34b0c9 Reports and print formats modified for renamed fields 2014-05-13 16:12:37 +05:30
Nabin Hait
b3bead2f06 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-12 17:46:02 +05:30
Nabin Hait
827480fd2b import, export and report permission in account and pricing rule 2014-05-12 17:45:37 +05:30
Rushabh Mehta
2fdb51f85e fixes frappe/erpnext#1627 2014-05-12 17:32:36 +05:30
Nabin Hait
2f50b85f99 Test case fixes for serial no 2014-05-11 13:03:53 +05:30
Nabin Hait
0ff6e3a6bb Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-11 12:11:50 +05:30
Nabin Hait
75e50ee082 Fixes for subcontracting 2014-05-11 12:11:15 +05:30
Nabin Hait
6d5c248402 Test case fixes for serial no 2014-05-11 12:10:57 +05:30
Anand Doshi
78e9c6ef70 Deprecate Select fields with options as link: 2014-05-09 13:36:13 +05:30
Nabin Hait
d64a952b5d Stock reco: item and warehouse validation and translation fixes 2014-05-09 11:50:24 +05:30
Nabin Hait
344f4436f1 Create / update raw materials supplied table for sub-contracting 2014-05-08 19:08:20 +05:30
Nabin Hait
5d070753fd Item managed batch-wise, can not be reconciled through stock reconciliation 2014-05-08 19:08:06 +05:30
Nabin Hait
227db769a0 Item valuation rate on material transfer based on fifo 2014-05-08 19:06:01 +05:30
Anand Doshi
0c85169539 Fixed clear cache for item page 2014-05-08 17:46:00 +05:30
Anand Doshi
f410bd9bf9 Better default permissions, ignore_restrictions for defaults, removed field trash_reason 
Additions:
	Account --> Material User: Read
	Cost Center --> Sales User, Purchase User: Read
	Mode of Payment --> Accounts User: Read
	Supplier --> Material User, Accounts User: Read
	Employee --> Employee: Restricted Read
	Leave Type --> Employee: Read
	Production Order --> Material User: Read
	Sales Order --> Material User: Read
	Print Heading --> All: Read
	Terms and Conditions --> Purchase User, Material User: Read
	Territory --> Material User, Maintenance User: Read
	Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
	Price List --> Manufacturing User: Read
	Purchase Receipt --> Accounts User: Read
	Warehouse --> Manufacturing User: Read
 2014-05-07 17:20:42 +05:30
Anand Doshi
8c2dbab878 Changed default naming series options 
C-Form: C-FORM-.#####
	Purchase Invoice: PINV-.#####
	Sales Invoice: SINV-.#####
	Purchase Order: PO-.#####
	Quality Inspection: QI-.#####
	Supplier: SUPP-.#####
	Supplier Quotation: SQTN-.#####
	Attendance: ATT-.#####
	Production Order: PRO-.#####
	Installation Note: IN-.#####
	Lead: LEAD-.#####
	Opportunity: OPTY-.#####
	Quotation: QTN-.#####
	Sales Order: SO-.#####
	Delivery Note: DN-.#####
	Item: ITEM-.#####
	Material Request: MREQ-.#####
	Packing Slip: PS-.#####
	Purchase Receipt: PREC-.#####
	Stock Entry: STE-.#####
	Customer Issue: CI-.#####
	Support Ticket: SUP-.#####
	Customer: CUST-.#####
	Journal Voucher: JV-.#####
 2014-05-06 19:43:11 +05:30
Anand Doshi
37909b292f Remove India specific fields 2014-05-06 16:15:56 +05:30
Nabin Hait
cea4cd4e5f Pull stock entry difference account from company 2014-05-06 11:57:33 +05:30
Nabin Hait
98c2a052e5 Fixes in pricing rule testcases #565 2014-05-05 18:41:41 +05:30
Nabin Hait
f2db87a766 Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565 2014-05-05 15:04:55 +05:30
Nabin Hait
53dab55703 Pricing Rule: if multiple rules, ask to resolve conflict #565 2014-05-05 14:49:40 +05:30
Nabin Hait
f57f0a661a Stock Entry: pulling items from BOM fixed #1579 2014-05-05 10:27:53 +05:30
Anand Doshi
4ab5382d3f Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564 2014-05-04 11:50:10 +05:30
Nabin Hait
296d626e53 Back flush issue fixed in sub contracting #1567 2014-05-02 17:36:13 +05:30
Nabin Hait
1e6c32e95f Address and contact creation from opportunity #1570 2014-05-02 11:42:24 +05:30
Nabin Hait
d341254786 Purchase receipt to purchase invoice item 2014-05-01 17:42:21 +05:30
Anand Doshi
d9f0f27cd4 Fixes in test cases 2014-04-30 22:16:25 +05:30
Rushabh Mehta
a15164750d started client side testing using selenium and other related and unrelated fixes 2014-04-30 19:39:13 +05:30
Nabin Hait
6777efa7fa Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-04-28 17:09:13 +05:30
Nabin Hait
2594e41462 Removed Stock Ledger doctype 2014-04-28 16:23:45 +05:30
Anand Doshi
6916baa299 BugFix: Item search in Stock UOM Replace Utility 2014-04-28 15:33:34 +05:30
Rushabh Mehta
41d126586e fix get_server_fields in stock_entry.js 2014-04-27 12:30:20 +05:30
Anand Doshi
8e5b2af0fb Set conversion_factor in stock entry test case 2014-04-25 19:35:06 +05:30
Anand Doshi
fc79efb97c Fixes #1532. Only show an error message for missing Quality Inspection but let the user submit Purchase Receipt. 2014-04-25 18:44:28 +05:30
Anand Doshi
bbffaf78fb BugFix: use transfer_qty instead of actual_qty in check_duplicate_entry_for_production_order - ported webnotes/erpnext@942ff2583b 2014-04-25 18:31:09 +05:30
Anand Doshi
8bde7f9b3a Conditionally toggle Naming Series. Fixes #1526 2014-04-24 18:11:49 +05:30
Anand Doshi
b054eb7a4f Call calculate_taxes_and_totals after mapping 2014-04-22 20:35:22 +05:30
Anand Doshi
68d0b7c7ff get_item_details fixed for Material Request 2014-04-22 19:30:53 +05:30
Anand Doshi
07339fc69e Fixes in Setup Wizard and Attachments 2014-04-22 15:30:24 +05:30
Anand Doshi
0549b1c5c9 Duplicate supplier delivery number validation in Purchase Receipt should happen per financial year 2014-04-21 15:59:47 +05:30
Anand Doshi
21ae930b4c Removed controller.py 2014-04-21 15:12:50 +05:30
Anand Doshi
424c033395 Removed controller.py 2014-04-21 15:06:56 +05:30
Anand Doshi
5d591ebe83 Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext 2014-04-18 16:20:07 +05:30
Rushabh Mehta
169c1fd93b fixed translation for setup-wizard and removed purchase validation for Material Request #925 2014-04-18 10:40:17 +05:30
Anand Doshi
ac32bad25a Fixes in Taxes, Quotation and Address Territory 2014-04-18 01:32:02 +05:30
Anand Doshi
dbfcd328fb Fixes update_after_submit validation errors 2014-04-17 12:35:04 +05:30
Anand Doshi
0d345c9152 Fixes Item Price duplicate entry validation 2014-04-17 11:40:22 +05:30
Anand Doshi
094610d7ce Fixes in Production, Stock Entry and Stock Controller 2014-04-16 20:23:24 +05:30
Rushabh Mehta
052fe82688 production order: test fixed and added in test_stock_entry.py 2014-04-16 19:20:11 +05:30
Rushabh Mehta
c38fc713c6 updated translations 2014-04-16 17:46:30 +05:30
Anand Doshi
652bc0784a Ported v3 fixes to v4 
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
 2014-04-16 15:26:42 +05:30
Nabin Hait
6298536e46 set stock balance as per serial no count 
Cherry Picked and Modified by @anandpdoshi

Conflicts:
	stock/doctype/stock_ledger/stock_ledger.py
	utilities/repost_stock.py
 2014-04-16 15:23:08 +05:30
Rushabh Mehta
d85dc868ca more message fixes for translation 2014-04-15 22:54:34 +05:30
Rushabh Mehta
ff93802d58 more message fixes 2014-04-15 18:40:31 +05:30
Rushabh Mehta
2c45899a02 fixed strings for translation 2014-04-15 14:41:56 +05:30
Pratik Vyas
f37d6fe32b Merge pull request #1514 from frappe/js-translate-refactor 
JS translation refactor
 2014-04-15 11:44:16 +05:30
Pratik Vyas
e1eeb22f1e remove linebreaks for translation strings (js) 2014-04-15 10:50:36 +05:30
Rushabh Mehta
9f0d625300 update translation strings #1403 2014-04-14 19:20:45 +05:30
Pratik Vyas
b0f279a34e js translations refactor 2014-04-14 17:14:23 +05:30
Pratik Vyas
b52618c142 frappe._ to __ 2014-04-14 16:25:30 +05:30
Anand Doshi
bd67e87921 Fixes saving of Sales Order and fetching Prices frappe/frappe#478 2014-04-11 16:51:27 +05:30
Anand Doshi
13ae548ff6 Fixes for model-cleanup frappe/frappe#478 2014-04-10 18:43:07 +05:30
Anand Doshi
9fd50bcfb6 Fixed rest of the test cases frappe/frapp#478 2014-04-09 19:20:01 +05:30
Anand Doshi
d29465029d Fixed Test Cases frappe/frappe#478 2014-04-08 20:15:22 +05:30
Anand Doshi
2ce39cf770 Fixed Stock Entry Test Cases frappe/frappe#478 2014-04-07 18:51:58 +05:30
Nabin Hait
103cc58cb6 material request testcase #478 2014-04-07 16:40:43 +05:30
Nabin Hait
088dec6c09 testcase fixes #478 2014-04-07 16:00:28 +05:30
Nabin Hait
dc82d4f0cd frappe/frappe#478 fixes 2014-04-07 12:02:57 +05:30
Nabin Hait
e7885e3ee0 frappe/frappe#478 replaced doclist in testcases 2014-04-04 13:26:50 +05:30
Rushabh Mehta
a504f0638b frappe/frappe#478, fixed list passed in 2014-04-04 12:16:26 +05:30
Rushabh Mehta
558a9aabfb removed control panel 2014-04-04 12:00:36 +05:30
Nabin Hait
312ba99e71 frappe/frappe#478 fixes 2014-04-04 11:06:10 +05:30
Nabin Hait
365ae27acf frappe/frappe#478 fixes 2014-04-03 17:38:54 +05:30
Rushabh Mehta
99f914b782 frappe/frappe#478, fixes 2014-04-03 14:47:03 +05:30
Rushabh Mehta
2fbb00fd8d frappe/frappe#478, more changes, removed bean 2014-04-03 14:38:22 +05:30
Rushabh Mehta
f14b809ab5 frappe/frappe#478, more changes, removed bean 2014-04-03 14:30:42 +05:30
Rushabh Mehta
d36cb5c812 frappe/frappe#478 removed more instances of doclist 2014-04-03 12:38:42 +05:30
Rushabh Mehta
cfb6ccfe51 frappe/frappe#478 removed self.doclist 2014-04-03 11:46:52 +05:30
Rushabh Mehta
f191f854cd frappe/frappe#478 erpnext install works 2014-04-02 18:09:34 +05:30
Anand Doshi
943e614810 frappe/frappe#478 2014-04-02 16:37:35 +05:30
Anand Doshi
5b552b51f1 frappe/frappe#478 2014-04-02 15:03:35 +05:30
Anand Doshi
dd32d6eb1f frappe/frappe#478 2014-04-01 12:22:14 +05:30
Rushabh Mehta
f2227d033c frappe/frappe#478, removed instances of .fields 2014-03-31 23:37:40 +05:30
Rushabh Mehta
231f6a5b58 frappe/frappe#478 added test_records.json 2014-03-31 23:05:12 +05:30
Rushabh Mehta
0a0f2495a2 frappe/frappe#478, frappe tests pass, .txt renamed to .json 2014-03-31 17:27:06 +05:30
Nabin Hait
0e13cd5ac9 frappe/frappe#478 2014-03-28 17:01:32 +05:30
Nabin Hait
0d8d30e1cc frappe/frappe#478 2014-03-28 16:57:21 +05:30