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

712 Commits

Author SHA1 Message Date
Nabin Hait
aade34b0c9 Reports and print formats modified for renamed fields 2014-05-13 16:12:37 +05:30
Nabin Hait
827480fd2b import, export and report permission in account and pricing rule 2014-05-12 17:45:37 +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
5365108ef9 Test case fixes for pos setting 2014-05-11 12:10:17 +05:30
Anand Doshi
78e9c6ef70 Deprecate Select fields with options as link: 2014-05-09 13:36:13 +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
dc644c37e6 Merge pull request #1597 from anandpdoshi/naming-series-by-fiscal-year 
Naming series by fiscal year
 2014-05-07 11:06:36 +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
Nabin Hait
3190f99ebe Option for selecting already reconciled entries in bank reconciliation #1310 2014-05-06 16:39:24 +05:30
Nabin Hait
98c2a052e5 Fixes in pricing rule testcases #565 2014-05-05 18:41:41 +05:30
Nabin Hait
0c7e28ec9f Pricing Rule improvements #565 2014-05-05 11:13:36 +05:30
Nabin Hait
ed8a845e83 POS Make Payment dialog box fix #1441 2014-05-05 11:01:32 +05:30
Anand Doshi
69e0cb5d6f Fixed POS and Sales Invoice paid amount display, when invoice not submitted. Fixes #1573 2014-05-04 19:37:45 +05:30
Nabin Hait
a096b2004f Financial analytics graph fix #1542 2014-05-04 16:02:26 +05:30
Nabin Hait
6b03914731 asynchronus issue in get_party_details 2014-05-02 15:45:10 +05:30
Nabin Hait
d341254786 Purchase receipt to purchase invoice item 2014-05-01 17:42:21 +05:30
Nabin Hait
5b98340d15 payment to invoice matching 2014-05-01 15:43:22 +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
b85a9108eb Payment to invoice matching tool 2014-04-30 19:32:16 +05:30
Nabin Hait
498ecfc192 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-04-30 19:31:22 +05:30
Nabin Hait
576f025c84 Payment to invoice matching tool 2014-04-30 19:30:50 +05:30
Anand Doshi
04f8990c11 Fixed can freeze account check for account doc in client side 2014-04-30 15:02:17 +05:30
Rushabh Mehta
d21f55b5d2 fix in naming and feature setup on install: 2014-04-29 16:25:07 +05:30
Nabin Hait
b54307d58e minor fixes for pos trigger 2014-04-29 13:40:54 +05:30
Anand Doshi
cd17bdffcd Fixes in account query, fiscal year and cost center 2014-04-28 20:34:48 +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
985918d42b Minor fixes in company and account 2014-04-28 17:08:28 +05:30
Néstor Díaz Valencia
21412ddf65 Update mode_of_payment.py 
Renamed solves issue #1536
 2014-04-28 11:54:31 +02:00
Anand Doshi
1872312cc6 Deprecated client side mapper: frappe.model.map. Fixes #1530 2014-04-25 18:38:08 +05:30
Anand Doshi
69a2c25ca5 Fixed set_query 2014-04-25 18:35:45 +05:30
Anand Doshi
8bde7f9b3a Conditionally toggle Naming Series. Fixes #1526 2014-04-24 18:11:49 +05:30
Anand Doshi
f50a65294f Fixed NameError handling 2014-04-23 13:41:28 +05:30
Anand Doshi
b054eb7a4f Call calculate_taxes_and_totals after mapping 2014-04-22 20:35:22 +05:30
Anand Doshi
3e41fd1fd3 List route for tree browser based doctypes; Fixes to add child in tree browsers 2014-04-22 18:55:21 +05:30
Anand Doshi
424c033395 Removed controller.py 2014-04-21 15:06:56 +05:30
Anand Doshi
9365b616b8 Added an exist check for accounts.utils.get_balance_on 2014-04-21 12:42:21 +05:30
Anand Doshi
cbbf451974 Fixes throw 2014-04-21 11:33:49 +05:30
Anand Doshi
dbfcd328fb Fixes update_after_submit validation errors 2014-04-17 12:35:04 +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
a0c239db8d perpetual inventory fix related to sub-contracting 
Cherry-picked and modified by @anandpdoshi

Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	controllers/buying_controller.py
	controllers/stock_controller.py
 2014-04-16 15:23:10 +05:30
Anand Doshi
88a869f34d No Copy for Paid and Write Off Amount in Sales Invoice 
Ported webnotes/erpnext@f739bffedd
 2014-04-16 15:23:08 +05:30
Rushabh Mehta
ff93802d58 more message fixes 2014-04-15 18:40:31 +05:30
Anand Doshi
a6e2ca9d3b Fixes #1491 2014-04-15 17:12:15 +05:30
Rushabh Mehta
8a40c136ce more message fixing 2014-04-15 16:31:20 +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
13c92e3ad5 fix accounts browser and cost center strings (js) 2014-04-15 10:08:53 +05:30
Pratik Vyas
ec9c448ccf fix taxes and charges strings and labels 2014-04-15 09:49:40 +05:30
Rushabh Mehta
549977bf4f typo fix in journal_voucher.py 2014-04-14 22:40:17 +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
cd71e1d8ab Test Cases - Journal Voucher, Purchase Invoice, Period Closing Voucher frappe/frappe#478 2014-04-08 13:53:35 +05:30
Anand Doshi
2ce39cf770 Fixed Stock Entry Test Cases frappe/frappe#478 2014-04-07 18:51:58 +05:30
Rushabh Mehta
322d39f3a6 Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup 2014-04-07 15:09:25 +05:30
Rushabh Mehta
49f49ea603 started party frappe/erpnext#1503 2014-04-07 15:09:09 +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
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
f191f854cd frappe/frappe#478 erpnext install works 2014-04-02 18:09:34 +05:30
Anand Doshi
5b552b51f1 frappe/frappe#478 2014-04-02 15:03:35 +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
Rushabh Mehta
b385ecf65e frappe/frappe#478 2014-03-28 16:54:45 +05:30
Anand Doshi
81ba0b29da frappe/frappe#478 2014-03-28 15:23:26 +05:30
Anand Doshi
f78d1aee28 Replaced doc, doc.fields frappe/frappe#478 2014-03-28 13:55:00 +05:30
Anand Doshi
67d6a4e3aa Merge remote-tracking branch 'frappe/develop' into model-cleanup 
Conflicts:
	erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/controllers/stock_controller.py
 2014-03-28 13:41:59 +05:30
Anand Doshi
40534f076b Changed creation, modified format frappe/frappe#478 2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608 frappe/frappe#478 2014-03-27 17:54:18 +05:30
Rushabh Mehta
e88bc8b12a frappe/frappe#478 2014-03-27 17:51:41 +05:30
Nabin Hait
4090c78c3f coa: payment to invoice matching tool fixes 2014-03-27 17:19:32 +05:30
Nabin Hait
becf75d791 Perpetual inventory cleanup 2014-03-27 17:18:29 +05:30
Rushabh Mehta
d2b34dc30c frappe/frappe#478 2014-03-27 16:12:56 +05:30
Rushabh Mehta
66d52b55c0 #478 2014-03-27 14:17:33 +05:30
Rushabh Mehta
aa355af2cf refactored client side Model and Meta - frappe/frappe#478 2014-03-26 18:24:30 +05:30
Anand Doshi
79196a9ef7 Fixed install 2014-03-25 19:32:08 +05:30
Nabin Hait
2c517e0a62 Fixes related to countrywise coa 2014-03-25 18:28:49 +05:30
Nabin Hait
06a595090d coa: minor fix 2014-03-21 18:30:46 +05:30
Nabin Hait
0c21e2afef Is_pl_account and debit_or_credit field removed and added report_type field in account 2014-03-21 11:35:59 +05:30
Nabin Hait
b5e6d7e171 Account balance in debit and credit columns in trial balance and financial analytics report 2014-03-21 11:26:09 +05:30
Nabin Hait
e67202484d Imported charts with proper report types 2014-03-21 11:26:08 +05:30
Nabin Hait
e0f98d7202 account properties file added 2014-03-21 11:26:08 +05:30
Nabin Hait
73083dc960 Fix related to user_default 2014-03-21 11:26:08 +05:30
Nabin Hait
27bb7892b3 Fixes in pos settings 2014-03-21 11:26:07 +05:30
Nabin Hait
e848914da1 consider all entries against bank account in bank reconciliation statement, even if no reference no 2014-03-21 11:25:17 +05:30
Nabin Hait
d8dcdfbf4f Warehouse disable option 2014-03-21 11:25:17 +05:30
Nabin Hait
eb1192771f set root type from parent or child 2014-03-21 11:25:17 +05:30