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

3811 Commits

Author SHA1 Message Date
Rushabh Mehta
98ae5bd9db [form] show website link for website generator 2014-10-31 14:28:47 +05:30
Nabin Hait
e6370860a0 accounts receivable summary report cleanup 2014-10-30 15:54:40 +05:30
Nabin Hait
0822dcbde6 get query for bank/cash account 2014-10-30 15:54:40 +05:30
Nabin Hait
7dbcee87af AR/AP report cleanup 2014-10-30 15:54:39 +05:30
Nabin Hait
99be941e7b Party is only relevant to receivable/payable account 2014-10-30 15:54:39 +05:30
ankitjavalkarwork
574e55788f [#1379] Add Accounts Receivable Summary Report 2014-10-30 15:54:39 +05:30
ankitjavalkarwork
e63432db63 Commonify AR and AP reports 2014-10-30 15:54:39 +05:30
Pratik Vyas
dda239fd49 bumped to version 4.9.2 2014-10-30 14:52:17 +06:00
Nabin Hait
ee212e7bb5 [fix] Floating point issue fixed in payment reconciliation 2014-10-29 14:26:05 +05:30
Neil Trini Lasrado
f92b026405 fixed 2014-10-28 14:50:47 +05:30
Neil Trini Lasrado
2c404cf34f FIX validate-bom wrong condition 2014-10-28 14:50:47 +05:30
Nabin Hait
6c698e19ca Merge pull request #2356 from neilLasrado/cost-center-undefined-error-fix 
fix - validations added for auto fetch of cost center
 2014-10-28 14:50:27 +05:30
Neil Trini Lasrado
6fc2821e5f fix - validations added for auto fetch of cost center 2014-10-28 14:36:26 +05:30
Neil Trini Lasrado
df4b947e40 data type of start_date and end_date changed to datetime 2014-10-27 14:41:43 +05:30
Neil Trini Lasrado
4a75a42437 Filters added 2014-10-27 13:37:42 +05:30
Neil Trini Lasrado
712cd7a426 Calender and gantt chart view added for production order doctype 2014-10-27 13:37:42 +05:30
Neil Trini Lasrado
9d01133e49 start date and end date added to production order doctype 2014-10-27 13:37:41 +05:30
Nabin Hait
7cdb25b733 Merge pull request #2337 from neilLasrado/makepaymententryfix 
Error fix, arguments in function call for Make Payment Entry from SI/PI
 2014-10-27 11:42:50 +05:30
Nabin Hait
823774ee15 Merge pull request #2340 from neilLasrado/fixstockentryerror 
Fix error in get_default_cost_center() function
 2014-10-27 11:42:28 +05:30
ankitjavalkarwork
4e61536f50 Fix Customer Issue error on click event of Serial No. field 2014-10-27 11:08:05 +05:30
Neil Trini Lasrado
d718c93726 shopping cart fix 2014-10-27 11:03:09 +05:30
Pratik Vyas
daed0b655a bumped to version 4.9.1 2014-10-27 09:56:36 +06:00
Nabin Hait
10b155a486 cost center based on project 2014-10-23 13:18:59 +05:30
ankitjavalkarwork
14e1d20df3 Change position of 'To Time' field for better UX 2014-10-22 16:55:29 +05:30
Nabin Hait
f5b94143dc Minor fixes 2014-10-22 16:14:41 +05:30
Neil Trini Lasrado
0683fc33ed Fix error in get_default_cost_center() function 2014-10-22 14:51:37 +05:30
Pratik Vyas
16343683d9 bumped to version 4.9.0 2014-10-22 14:49:17 +06:00
Nabin Hait
16e05c321c Removed stock ageing grid report 2014-10-22 13:10:43 +05:30
Nabin Hait
23d7919865 Stock ageing report fix 2014-10-22 13:06:26 +05:30
Nabin Hait
38265efc39 Minor fix 2014-10-21 20:23:39 +05:30
Rushabh Mehta
3daa49ac1f [shopping-cart] i'm back 2014-10-21 16:16:30 +05:30
Rushabh Mehta
39dbf73de7 [merge] item-variants 2014-10-21 13:24:46 +05:30
Rushabh Mehta
be1a8d82c5 [merge] develop 2014-10-21 13:14:55 +05:30
Rushabh Mehta
ab43942b35 Merge pull request #2231 from rmehta/item-variants 
Item variants
 2014-10-21 12:38:16 +05:30
Neil Trini Lasrado
572ad4c8ef Error fix, arguments in function call for Make Payment Entry from SI/PI 2014-10-21 12:34:07 +05:30
Rushabh Mehta
2d414706dc [hotfix] translation boo boo 2014-10-21 11:49:40 +05:30
Rushabh Mehta
45d03af8f6 [translations] update 2014-10-20 17:11:06 +05:30
Nabin Hait
73804580d4 validate quotation to lead or customer 2014-10-20 11:18:11 +05:30
Nabin Hait
259f9779db Credit Note: Set total amount and print format fix 2014-10-20 11:18:11 +05:30
Neil Trini Lasrado
1cdfbdb899 fiscal year auto-create added 2014-10-17 15:44:22 +05:30
Pratik Vyas
5eb373f7b5 bumped to version 4.8.0 2014-10-17 15:34:05 +06:00
Nabin Hait
fc2dd44694 Partial payment reconciliation. Fixes #1982 2014-10-17 14:57:20 +05:30
Pratik Vyas
26d096aa87 bumped to version 4.7.2 2014-10-15 16:04:39 +06:00
Nabin Hait
476c613ba6 Merge pull request #2317 from nabinhait/stock_reco 
repost stock utility
 2014-10-15 15:33:50 +05:30
Nabin Hait
2348a5f592 repost stock utility 2014-10-15 15:31:33 +05:30
Pratik Vyas
63914dd55b bumped to version 4.7.1 2014-10-15 15:14:35 +06:00
Nabin Hait
93a8042f08 Merge pull request #2316 from nabinhait/stock_reco 
Minor fix
 2014-10-15 14:44:06 +05:30
Nabin Hait
b2f32dac1b Minor fix 2014-10-15 14:42:18 +05:30
Pratik Vyas
5e46ce8a50 bumped to version 4.7.0 2014-10-15 15:05:47 +06:00
Nabin Hait
3b7342b7b5 Merge pull request #2315 from nabinhait/stock_reco 
Strip company in setup wizard
 2014-10-15 13:59:07 +05:30
Nabin Hait
531077e504 Strip company in setup wizard 2014-10-15 13:55:37 +05:30
Nabin Hait
147918ed66 Merge pull request #2313 from nabinhait/stock_reco 
Fix gl entries for stock transactions
 2014-10-15 12:44:59 +05:30
Nabin Hait
9bbfca9226 Fix gl entries for stock transactions 2014-10-15 12:24:38 +05:30
Nabin Hait
f1a07ff105 Allow zero rate while reposting 2014-10-15 12:23:35 +05:30
Nabin Hait
fb6e434315 Guess valuation rate in case of negative stock 2014-10-15 11:34:40 +05:30
Pratik Vyas
663bfeacf4 bumped to version 4.6.2 2014-10-14 18:04:01 +06:00
Nabin Hait
e918ebd721 Merge pull request #2307 from nabinhait/stock_reco 
Minor fixes
 2014-10-14 17:16:32 +05:30
Nabin Hait
0dc18f0102 Minor fixes 2014-10-14 17:15:02 +05:30
Pratik Vyas
49365d0982 bumped to version 4.6.1 2014-10-14 16:46:29 +06:00
Nabin Hait
bf492122f8 minor fix 2014-10-14 16:09:14 +05:30
Nabin Hait
38d0ed9f3a Negative stock allowed for perpetual inventory. Blocked in specific case 2014-10-14 16:08:19 +05:30
Pratik Vyas
78f86e9385 bumped to version 4.6.0 2014-10-14 13:07:07 +06:00
Neil Trini Lasrado
c40451ee2e Patch Fixed 2014-10-14 12:14:39 +05:30
Neil Trini Lasrado
6644406185 Fix - BOM calculated wrong cost on update cost 2014-10-14 12:14:38 +05:30
Nabin Hait
8a28ccfa2f Repost gl entries where mismatch with stock balance 2014-10-14 11:41:56 +05:30
Nabin Hait
17a16eeaf4 Tets case fixed for payment tool 2014-10-13 11:43:14 +05:30
Nabin Hait
3d3f0bcf54 Minor fix in setup wizard 2014-10-13 11:32:41 +05:30
Nabin Hait
bc8b20ae3c Allocate entire advance amount if advance against SO/PO 2014-10-13 10:48:26 +05:30
Nabin Hait
daf344e5fd Precision fixed in batch-wise balance report 2014-10-13 10:48:26 +05:30
Nabin Hait
a538f8a24a Merge pull request #2296 from nabinhait/stock_reco 
Stock balance report and valuation fixes
 2014-10-10 21:23:30 +05:30
Nabin Hait
70ec88b733 fixed test cases 2014-10-10 21:22:46 +05:30
Nabin Hait
4f0e5db216 Stock balance grid report deprecated and moved to server side 2014-10-10 20:54:57 +05:30
Nabin Hait
79ed124939 Update journal_voucher.py 2014-10-10 18:19:03 +05:30
Nabin Hait
30a0e3e8b4 Merge pull request #2275 from ankitjavalkarwork/fix2164 
Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes
 2014-10-10 18:05:19 +05:30
Nabin Hait
7c6f990cf9 Minor fix for moving average 2014-10-10 18:03:27 +05:30
Nabin Hait
7820b171d3 Stock balance grid report deprecated and moved to server side 2014-10-10 18:03:07 +05:30
ankitjavalkarwork
ad3d698fd8 [#2164] Add test case for delivered qty in Sales Order 2014-10-10 16:59:47 +05:30
ankitjavalkarwork
0cf4cc283c Add Shipping Addr to Sales Invoice 2014-10-10 16:55:03 +05:30
ankitjavalkarwork
9a4b173b88 Add validation for stopped orders, advance payment in journal voucher 2014-10-10 16:28:41 +05:30
Nabin Hait
a5082d6233 Merge pull request #2283 from neilLasrado/employee-reports-to 
employee cannot report to himself validation added to employee doctype
 2014-10-10 15:20:13 +05:30
ankitjavalkarwork
6d83454237 Disallow Stopped Orders in Against Voucher table 2014-10-10 13:30:10 +05:30
ankitjavalkarwork
ff231b5e62 Allow advance JV payments in Accounts Receivable/Payable 2014-10-10 13:13:39 +05:30
Nabin Hait
4d74216147 Maintain negative stock balance if balance qty is negative 2014-10-09 19:25:19 +05:30
ankitjavalkarwork
e69a611991 [#2164] New field names in DN, fix field name refs, Patch added 2014-10-09 17:31:46 +05:30
ankitjavalkarwork
9aadb0d95d [#2164] Add Delivered Qty to Sales Inv from Delivery Note, fix issues 2014-10-09 17:31:46 +05:30
Neil Trini Lasrado
9b08062bed employee cannot report to himself validation added to employee doctype 2014-10-09 17:26:17 +05:30
Neil Trini Lasrado
eaae58f507 Transaction.js fixed , code commonified 2014-10-09 15:01:13 +05:30
Neil Trini Lasrado
9614b552fd fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim 2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
565d986198 fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed 2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6 Fixed issues 2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
78fa6954e5 Fiscal year autofetch added 2014-10-09 15:01:12 +05:30
ankitjavalkarwork
e93b1fc508 [fix][#1450] Add Shipping Addr field to Sales Invoice 2014-10-09 12:11:49 +05:30
Nabin Hait
b7e5ad0a31 Merge pull request #2276 from ankitjavalkarwork/sopofield 
Rearrange To/From, Recurring Type field for better UX
 2014-10-09 11:58:13 +05:30
Nabin Hait
0ba32b05be Merge pull request #2266 from ankitjavalkarwork/fix1387 
Add Customer Credit Balance Report
 2014-10-09 11:45:26 +05:30
Nabin Hait
12ade3c682 Merge pull request #2250 from ankitjavalkarwork/fix1808 
[fix][#1808] Allow configurable AR/AP ageing dates
 2014-10-09 11:24:01 +05:30
Pratik Vyas
e435592d64 [minor] Fix default website style patch (reload doc) 2014-10-09 11:22:12 +05:30
Nabin Hait
7ddde8dc3a Merge pull request #2278 from nabinhait/stock_reco 
stock reco and repost vouchers
 2014-10-08 18:38:54 +05:30
Nabin Hait
fce2881de6 minor fix 2014-10-08 18:38:27 +05:30
Nabin Hait
e96e83d557 stock reco and repost vouchers 2014-10-08 18:06:14 +05:30
ankitjavalkarwork
1b2944e871 Rearrange To/From, Recurring Type field for better UX 2014-10-08 14:24:58 +05:30
Rushabh Mehta
074e73a0dd [translations] updated via translator 2014-10-08 14:16:33 +05:30
Rushabh Mehta
ebc6016ffb [tests] fixes 2014-10-08 13:54:19 +05:30
Nabin Hait
8923801881 Update stock_entry.py 2014-10-08 13:20:31 +05:30
Rushabh Mehta
7472a1147c [tests] fixes 2014-10-08 12:41:06 +05:30
Rushabh Mehta
c2d2857540 [fixes] tests and moved reorder_item to separate module 2014-10-08 12:19:55 +05:30
Rushabh Mehta
f850987db0 [fixes] tests and moved reorder_item to separate module 2014-10-08 12:03:19 +05:30
Nabin Hait
6c48ef781b Utility: Repost stock ledger entries and gl entries for all stock transactions 2014-10-08 11:02:18 +05:30
Nabin Hait
adeb976a1b Block negative stock in perpetual inventory 2014-10-08 11:02:18 +05:30
Nabin Hait
bb19b91ef9 stock reco fixes 2014-10-08 11:02:18 +05:30
Nabin Hait
bfa7f171bd Stock reconciliation sl entries 2014-10-08 11:02:18 +05:30
Nabin Hait
b96c014daf Stock Reconciliation logic simplified 2014-10-08 11:02:18 +05:30
Rushabh Mehta
c62b6a815b [tests] fixes to stock entry 2014-10-07 17:15:30 +05:30
pdvyas
099ad0f5e1 bumped to version 4.5.2 2014-10-07 17:35:32 +06:00
Rushabh Mehta
b31e90c7a5 [tests] fixes to stock entry 2014-10-07 16:56:46 +05:30
Rushabh Mehta
db08041f05 [fix] remove test for item attribute value 2014-10-07 15:39:35 +05:30
Rushabh Mehta
724f9e57e3 [item-variants] get table values from template if not set in variant #2224 2014-10-07 15:29:58 +05:30
ankitjavalkarwork
6c29d8789a [fix][#1769] Add disable option to Sales/Purchase Tax Master with validation 2014-10-07 14:44:37 +05:30
Nabin Hait
803cd11f68 Update patches.txt 2014-10-07 13:05:29 +05:30
Rushabh Mehta
baef96b5a2 [item-variants] allow production order of variant #2224 2014-10-07 12:34:19 +05:30
ankitjavalkarwork
fe7a6b502a Add Customer Credit Balance Report, minor changes 2014-10-07 11:41:31 +05:30
Rushabh Mehta
1a7637459c [item-variants] added more validations, tests #2224 2014-10-07 11:40:47 +05:30
Rushabh Mehta
ef276045c4 [item variants] make variants, bom updates 2014-10-07 11:40:47 +05:30
Rushabh Mehta
70aa8933b1 [item variant] started 2014-10-07 11:39:54 +05:30
Nabin Hait
0ef1e75c56 party model patch included in patches.txt 2014-10-07 11:37:58 +05:30
Nabin Hait
b70712dbba Voucher dynamic link in general ledger report 2014-10-07 11:32:54 +05:30
ankitjavalkarwork
437af5b031 [fix][#1808] Allow configurable AR/AP ageing dates 2014-10-07 11:32:21 +05:30
Rushabh Mehta
4c057fe693 Merge pull request #2269 from rmehta/fixes 
[fix] packing slip
 2014-10-07 11:06:08 +05:30
Rushabh Mehta
9974b16c32 [fix] packing slip 2014-10-07 10:52:05 +05:30
Nabin Hait
f065b756e5 Update customer.json 2014-10-06 17:50:58 +05:30
Nabin Hait
2dcc576f0e Chart finalizzed for Austria and UAE 2014-10-06 13:15:21 +05:30
Nabin Hait
6f17cf93c5 Party balance 2014-10-06 13:15:21 +05:30
Nabin Hait
997a7a1d3e Test case fixes 2014-10-06 13:15:21 +05:30
Nabin Hait
678b441082 Payment tool as per party model 2014-10-06 13:15:02 +05:30
Nabin Hait
36cf4a4708 Test case fixes 2014-10-06 13:15:02 +05:30
Nabin Hait
034ac6b00b Payment Reconciliation based on party 2014-10-06 13:14:22 +05:30
Nabin Hait
894a1b539a Dynamic link in general ledger and stock ledger report 2014-10-06 13:14:22 +05:30
Nabin Hait
cb8e255f0f Dynamic link for voucher no in AR/AP report 2014-10-06 13:14:22 +05:30
Nabin Hait
bd1c8aff8e Deleted customer/supplier account head report 2014-10-06 13:14:02 +05:30
Nabin Hait
76030540cb Accounts Receivable/Payable report based on party 2014-10-06 13:14:02 +05:30
Nabin Hait
965a5a34b5 Party is now dynamic link in JV and GL Entry 2014-10-06 13:13:28 +05:30
Nabin Hait
62c762aac5 Sales/purchase register and item-wise sales/purchase register fixes for party 
Show Delivery Note and Purchase Receipt based on SO and PO if it not defined in SI/PI #2166
 2014-10-06 13:13:27 +05:30
Nabin Hait
8f44f03cba Party model patch 
- Create receivable / payable account, set them in company
	- Set party in JV and GL Entry
	- Delete all exisintg individual party account
 2014-10-06 13:13:27 +05:30
Nabin Hait
db030d1761 Set Receivable/Payable account based on party 2014-10-06 13:13:27 +05:30
Nabin Hait
e2095c0dd7 Created new doctype Party Account to maintain default party account, it is a child table for Customer, Supplier, Customer Group, Supplier type 
Default Receivable / Payable Account in company
Filter results in all receivable/payable link fields
 2014-10-06 13:12:05 +05:30
Nabin Hait
3225102eb9 Update outstanding amt based on party 
Party mandatory if account is receivable/payable
Fetch advance based on party
Reconciliation splitting logic based on party
 2014-10-06 13:09:18 +05:30
Nabin Hait
cc582bd774 posted party in gl entry and multiple other fixes 2014-10-06 13:06:11 +05:30
Nabin Hait
3a40435f8c Credit days and credit limit option in customer group / supplier type #1354 2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f Credit Limit and credit days fixes #2031 2014-10-06 13:05:28 +05:30
Nabin Hait
be8ec39678 Deleted master_type, master_name, credit_days, credit_limit fields from account 
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
 2014-10-06 13:02:40 +05:30
Nabin Hait
fbc3d25d13 Root type defined for uae and austria 2014-10-06 13:01:58 +05:30