Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,009 Commits 3 Branches 0 Tags 1 GiB
2490ea0b91
Commit Graph

2219 Commits

Author SHA1 Message Date
Nabin Hait
2490ea0b91 Fixed merge conflict 2016-09-01 12:29:31 +05:30
Rohit Waghchaure
774ce63b75 remove mode of payment, migrate mode of payment from v6 to v7 2016-08-31 21:21:41 +05:30
Rohit Waghchaure
879cb6ebee [POS] Fixed POS Sales Invoice when Payment Table is Empty 2016-08-31 14:41:48 +05:30
Nabin Hait
566759acae Merge pull request #6211 from rohitwaghchaure/v7.1_fixes 
[Fix] Billing Hours showing blank on sales invoice
 2016-08-31 12:12:48 +05:30
Rohit Waghchaure
a2bf16bfaa [Fix] Billing Hours showing blank on sales invoice 2016-08-29 13:37:13 +05:30
Nabin Hait
338e63c448 Fixed version conflict 2016-08-29 11:47:50 +05:30
Rohit Waghchaure
63bdd679d0 [POS] Fixes and cleanup 2016-08-27 02:53:36 +05:30
Kanchan Chauhan
dd96cbd012 Coded column deleted, column added from UI 2016-08-26 14:32:38 +05:30
Nabin Hait
4403cf71b5 Merge pull request #6152 from rohitwaghchaure/profitability_report 
[Report] Profitability Analysis
 2016-08-26 13:21:01 +05:30
Rohit Waghchaure
0cb171feb2 [Enhancement] Added billing hours for account user in timesheet 2016-08-26 13:17:46 +05:30
Nabin Hait
e334813daf Merge pull request #6166 from neilLasrado/demo 
Merged Schools Demo into ERPNext
 2016-08-26 13:05:43 +05:30
Rohit Waghchaure
6462ba4e0b minor changes 2016-08-26 12:42:52 +05:30
Nabin Hait
0da75aede3 Fixed merge conflict 2016-08-26 12:40:02 +05:30
Nabin Hait
06b27757ab Merge pull request #6179 from rohitwaghchaure/minor_fix_patch 
[Sales Return] Minor fix in patch
 2016-08-26 12:33:33 +05:30
Rohit Waghchaure
e21e1ebae2 [Sales Return] Minor fix in patch 2016-08-26 12:31:41 +05:30
Nabin Hait
0a99b4347b Party mandatory message 2016-08-26 12:30:45 +05:30
Nabin Hait
a26bb96d2d Merge pull request #6178 from nabinhait/status_updater_fix 
Ignore validating billed amount against order if order item amount is zero
 2016-08-26 12:09:39 +05:30
Nabin Hait
47a3f639ed Ignore validating billed amount against order if order item amount is zero 2016-08-26 11:39:39 +05:30
Neil Trini Lasrado
067245933e Fixed Demo 2016-08-25 18:31:42 +05:30
Rohit Waghchaure
efb5bf2cfc [POS] Fixed payment gl entry for sales return 2016-08-25 16:23:47 +05:30
Rohit Waghchaure
1e8732abc2 removed old report 2016-08-24 19:20:58 +05:30
Rohit Waghchaure
5794ffd43d added filters project and cost center in profit and loss statement, open profit and loss statement on click of cost center/project in profitability analysis 2016-08-24 19:12:14 +05:30
Rohit Waghchaure
1255a6627e project based profitability Analysis 2016-08-24 18:01:39 +05:30
Rohit Waghchaure
78e08b8af5 [Report] Profitability Analysis 2016-08-24 18:00:22 +05:30
Rohit Waghchaure
fb432821bf [Report] Cost center wise profitability 2016-08-24 18:00:22 +05:30
Nabin Hait
cfbd0199eb Merge branch 'master' into develop 2016-08-23 12:10:56 +05:30
Nabin Hait
26f9673ad9 Merge pull request #6126 from rohitwaghchaure/multiyear_financial_statements 
[Enhancement] Multi year financial statements
 2016-08-23 11:32:08 +05:30
Rohit Waghchaure
ca4d9b54cd fixed accumulated values for cash flow 2016-08-22 17:51:58 +05:30
Pawan Mehta
bee3b40725 Update gross_profit.py 2016-08-22 17:47:13 +05:30
pawan
18bb431baa [fix] #6089 2016-08-22 17:27:22 +05:30
pawan
851e05672c [fix] #6089 2016-08-22 14:25:17 +05:30
Rohit Waghchaure
26b646f8a3 Added validation for fiscal year 2016-08-21 17:14:12 +05:30
Rohit Waghchaure
713e2b7b62 [POS] Fixed issue of paid amount, write off account 2016-08-19 19:27:16 +05:30
Rohit Waghchaure
4275c30059 [Enhancement] Multi year financial statements 2016-08-19 18:04:32 +05:30
Nabin Hait
b5951b72f3 Merge pull request #5924 from KanchanChauhan/salary-structure-changes 
Formula based Salary Structure
 2016-08-18 16:39:58 +05:30
Nabin Hait
f04ce3c5a6 [fix] check expense agaist budget 2016-08-18 16:14:23 +05:30
Nabin Hait
50f8262ac7 Currency fix in reports 2016-08-18 16:14:23 +05:30
Rohit Waghchaure
9d5a07d101 [POS] Fixed stock update issue 2016-08-18 13:27:06 +05:30
Kanchan Chauhan
bccf0fa041 [WIP] Formula based Salary Structure and multiple employees for same Salary Structure 2016-08-18 13:02:39 +05:30
Rushabh Mehta
b7bc6bd75d [fix] better message for cost center, fixes #6109 2016-08-18 12:50:58 +05:30
Rushabh Mehta
b969c2cb60 [minor] budget link in cost center, fixes #6093 2016-08-18 12:36:20 +05:30
Nabin Hait
6fe3ac49cf Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount 
Allow to edit change amount
 2016-08-17 17:08:54 +05:30
Rohit Waghchaure
e4e69ec027 changed field name, validation for change amount account, validation for serial no qty 2016-08-17 16:20:13 +05:30
Nabin Hait
95c998109d Merge pull request #6043 from aruizramon/purchase-taxes-client-validation 
Validate on changing from Total to Valuation/Valuation&Total when add…
 2016-08-17 12:12:14 +05:30
Nabin Hait
4da2c81641 Merge pull request #6094 from rmehta/sales-purchase-items 
[revert] is_sales_item, is_purchase_item back
 2016-08-17 11:30:37 +05:30
Rushabh Mehta
d973c1606a [revert] is_sales_item, is_purchase_item back 2016-08-16 11:32:08 +05:30
Rohit Waghchaure
9cd356c7f0 [POS] Fixed print qty decimal issue 2016-08-16 10:44:21 +05:30
Rohit Waghchaure
033ed00c56 [POS] fixed issue of negative stock 2016-08-11 16:37:29 +05:30
Rushabh Mehta
6c0d9579d2 Merge pull request #6055 from rohitwaghchaure/bank_reconciliation_statement_report_issue 
[Fix] No permission to read DocType for account user in bank reconciliation statement report
 2016-08-11 10:55:10 +05:30
Rohit Waghchaure
e78ef5f8c8 [Fix] No permission to read DocType for account user in bank reconciliation statement report 2016-08-11 00:46:15 +05:30