waqas
/
Akaunting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,691 Commits 1 Branch 172 Tags 84 MiB
Commit Graph

515 Commits

Author SHA1 Message Date
denisdulici 9f80098796 check if module files exists 2018-12-24 16:53:10 +03:00
denisdulici cfbf81fe39 fixed wizard 2018-12-24 11:41:52 +03:00
Denis Duliçi 0220045ed6
Merge branch 'master' into master 2018-12-24 10:17:40 +03:00
sausin 27088e0d9a
Update IncomeSummary.php 2018-12-23 15:07:18 +05:30
sausin 46d68f3e8c
Update ExpenseSummary.php 
Include missing modification
 2018-12-23 15:06:49 +05:30
sausin f2d65d0032
Update IncomeExpenseSummary.php 
Include missing modification
 2018-12-23 15:06:19 +05:30
denisdulici ca0b21b583 fixed #695 2018-12-22 14:59:58 +03:00
denisdulici 83d92158ba delete item taxes 2018-12-21 18:36:25 +03:00
denisdulici 0a02a677df removed unused method 2018-12-21 17:44:01 +03:00
Batuhan Baş 1e4e6b4a39 Company transfer problem 2018-12-21 11:34:05 +03:00
sausin 4a67b52f0d
Update BillPayments.php 
Fix `grand_total` calculation. No $paid variable existed
 2018-12-20 22:54:09 +05:30
denisdulici c809e94763 set company id 2018-12-20 17:35:28 +03:00
denisdulici e3730ed6dd removed duplicates 2018-12-20 13:59:05 +03:00
majamis 423314a306 Removed unnecessary/duplicate return declaration. 2018-12-19 23:52:55 +02:00
sausin 8a998b1a3a
Update TaxSummary.php 2018-12-14 20:02:35 +05:30
sausin 3422d29868
Update ProfitLoss.php 2018-12-14 20:01:30 +05:30
sausin a85d979bf2
Update IncomeSummary.php 2018-12-14 20:00:47 +05:30
sausin 9f81918e4c
Update ExpenseSummary.php 2018-12-14 20:00:01 +05:30
sausin d1fd63e308
Update IncomeExpenseSummary.php 2018-12-14 19:59:12 +05:30
sausin 78b090b188
Update ExpenseSummary.php 2018-12-14 19:57:54 +05:30
sausin af5a891c36
Update Dashboard.php 2018-12-14 19:48:58 +05:30
sausin 54431e3bf5
Update Dashboard.php 2018-12-14 19:48:30 +05:30
sausin 1eeee80fb7
Update Dashboard.php 2018-12-14 11:20:28 +05:30
denisdulici d32478fff1 small fixes 2018-12-12 20:28:16 +03:00
cuneytsenturk 8c312ad6cb close #676 Fixed: Unique link not working. 2018-12-11 18:31:23 +03:00
cuneytsenturk 37376cd0b2 close #660 Fixed: Inclusive tax calculation seems incorrect 2018-12-04 12:02:15 +03:00
cuneytsenturk f8ba2721a8 close #665 Fixed: Reconciliation missing currency then it wrong calculate 2018-12-04 11:42:22 +03:00
cuneytsenturk bc8a1305a5 close #664 Fixed: Not listing invoice/bill add payment if empty account's currency 2018-12-04 11:29:42 +03:00
cuneytsenturk 5511ab9a48 Merge branch 'master' of github.com:akaunting/akaunting 2018-12-04 11:06:08 +03:00
cuneytsenturk 2e03e3819f close #663 Fixed: Invoice/Bill add item row missing currency code broken 2018-12-04 11:05:15 +03:00
cuneytsenturk 2570dad2b7 Merge branch 'master' of github.com:akaunting/akaunting 
Conflicts:
	app/Http/Controllers/Auth/Login.php
 2018-12-03 13:49:31 +03:00
cuneytsenturk 7570918ff8 redirect to intended url 2018-12-03 13:45:33 +03:00
denisdulici 79075e3f5a fixed #658 2018-12-03 01:05:59 +03:00
cuneytsenturk 84b10b85a4 close #655 Added: App Store add app documentation 2018-11-30 17:24:03 +03:00
denisdulici 8467209bde check account currency 2018-11-29 13:10:52 +03:00
cuneytsenturk 9934ebda30 close #642 Fixed: Invoices do not have a euro sign (PDF) 2018-11-29 12:56:49 +03:00
denisdulici e000f55e65 fixed #652 2018-11-29 12:51:01 +03:00
denisdulici c1a5b26e2c fixed #649 2018-11-29 12:05:12 +03:00
cuneytsenturk 1d63b2d85a close #651 Fixed: Invoice/Bill create page, if you add new tax. it missing tax type column 2018-11-29 11:47:20 +03:00
cuneytsenturk e78b786e42 Notification hide. 2018-11-17 13:13:15 +03:00
denisdulici d8b83ffe4b check if is object 2018-11-14 13:51:45 +03:00
denisdulici 25941226e9 unnecessary 2018-11-12 23:52:48 +03:00
denisdulici 3959fe2f61 fixed #621 2018-11-12 15:09:46 +03:00
cuneytsenturk d30fe4da9b close #611 Fixed: Create tax rate not null type. 2018-11-09 12:14:06 +03:00
cuneytsenturk 636afc4565 close #610 Fixed: Transaction page invoice/bill category name issue. 2018-11-09 11:47:20 +03:00
Cüneyt Şentürk 0777c6401b Wizard taxes edit page path issue solved. 2018-11-09 00:06:18 +03:00
denisdulici 8cb4d47d4e Merge branch '1.3-dev' of github.com:akaunting/akaunting into 1.3-dev 2018-11-07 19:56:25 +03:00
denisdulici 28063c65bb sorted taxes by name 2018-11-07 19:56:11 +03:00
cuneytsenturk c51edbce36 Wizard currency and tax edit issue solved. 2018-11-07 19:55:39 +03:00
denisdulici 86330b0a41 naming 2018-11-07 12:07:38 +03:00
cuneytsenturk 9fdcf7dbbe refs #602 change calculate to included 2018-11-07 11:45:29 +03:00
cuneytsenturk 49112ce50f Merge branch '1.3-dev' of github.com:akaunting/akaunting into tax-rate 2018-11-07 11:19:52 +03:00
cuneytsenturk fe9ce1c733 Bill create and update tax changes finished 2018-11-07 11:06:38 +03:00
cuneytsenturk 71bcdb915a Invoice create and update function finished. 2018-11-06 20:00:38 +03:00
cuneytsenturk 79ebd9d025 Tax rate change workflow. 2018-11-06 17:55:31 +03:00
denisdulici ff08aec93c fixed #553 2018-11-06 17:34:53 +03:00
denisdulici 270a44411d fixed #594 2018-11-06 14:00:30 +03:00
denisdulici 135ac9020f don't add paid attribute to export 2018-11-05 21:31:40 +03:00
Batuhan Baş dfc6357154
Merge pull request #587 from batuhawk/1.3-dev 
Some request values fixed
 2018-11-05 20:08:27 +03:00
Batuhan Baş 413b68fbe3 Invoice test and invoice update issue solved 2018-11-05 20:07:40 +03:00
Batuhan Baş bd94e8374a close #597 Fixed: Invoice send customer email broken 2018-11-05 18:16:24 +03:00
denisdulici e5bdb410ae missing variable 2018-11-05 16:11:31 +03:00
cuneytsenturk 209e4435e1 refs #265 for custom date 2018-11-05 13:38:28 +03:00
cuneytsenturk 9988d49f46 close #265 Fixed: Dashboard 'Last 12 months' does not work, 'Custom Range' partially broken 2018-11-05 13:29:55 +03:00
denisdulici b80cb67487 added jobs 2018-11-05 01:25:43 +03:00
denisdulici bd97f7eaf1 fixed #590 2018-11-04 10:08:08 +03:00
denisdulici 9709899941 use trait in api 2018-11-03 12:40:43 +03:00
Cüneyt Şentürk 0083171a99
Merge pull request #585 from kostasdizas/issue578 
Fixed bug in reconciliations that prevented it from working in linux and other OSes
 2018-11-02 18:17:10 +03:00
Kostas Dizas bf74ee7f83 Fixed bug in reconciliations that prevented it from working in linux and other OSes 
Fixes #578
 2018-11-02 13:58:43 +00:00
cuneytsenturk dd836a943b close #582: Bill Vendor Currency Mask Issue 2018-11-02 16:26:02 +03:00
cuneytsenturk af95d9b552 close #581: Decimals problem for bill and invoice 2018-11-02 15:54:26 +03:00
cuneytsenturk 4f33cf4f14 Report > ExpenseSummary account issue solved 2018-11-02 14:29:05 +03:00
denisdulici 9a85bb9f5a added multi-select filters everywhere 2018-11-02 11:32:42 +03:00
denisdulici 6c95593082 added filters to reports 2018-11-01 16:58:31 +03:00
denisdulici af6e6eb1b6 not reflecting revenues & payments #557 2018-10-30 13:01:33 +03:00
Cüneyt Şentürk 54ee72f958
Merge pull request #573 from cuneytsenturk/wizard 
Wizard on Invoice and Bill work flow
 2018-10-29 15:43:39 +03:00
cuneytsenturk 66f0e7c9d7 Wizard on Invoice and Bill work flow 2018-10-29 15:36:23 +03:00
denisdulici e53efb952a Merge branch '1.3-dev' of github.com:akaunting/akaunting into 1.3-dev 2018-10-27 18:01:38 +03:00
denisdulici 268a4aa9d5 bank reconciliation 2018-10-27 17:57:40 +03:00
Cüneyt Şentürk 16abcb27f3
Merge pull request #567 from cuneytsenturk/wizard 
Wizard
 2018-10-25 16:58:50 +03:00
cuneytsenturk 618ff1ccc8 Wizard Taxes step finish 2018-10-25 16:41:43 +03:00
cuneytsenturk 5f00757142 Wizard Currencies step finished 2018-10-25 16:12:47 +03:00
cuneytsenturk ac2ab267c8 Wizard Currencies, Taxes, Finish pages changes 2018-10-24 18:30:37 +03:00
denisdulici 42f6b00485 fixed #566 2018-10-24 17:32:00 +03:00
cuneytsenturk 2ebe1e34c3 Wizard Currencies and Taxes edit page start 2018-10-24 12:24:20 +03:00
cuneytsenturk 6039fcb5f1 Wizard files permission and route, controller, view files added 2018-10-24 12:07:28 +03:00
cuneytsenturk 97f43a0930 Wizard files added 2018-10-23 18:47:55 +03:00
Cüneyt Şentürk 82a9b7dc8c
Merge pull request #565 from cuneytsenturk/1.3-dev 
Invoice/Bill Items: Multiple tax rate
 2018-10-22 18:10:39 +03:00
cuneytsenturk dedcb9493a Bill item tax multible files added 2018-10-22 16:57:35 +03:00
cuneytsenturk 7f9239e602 Invoice create invocie item multible tax 2018-10-22 15:53:56 +03:00
denisdulici bbec3dafc2 fixed #563 2018-10-20 16:29:48 +03:00
cuneytsenturk 983015509a Multible Tax files for Items 2018-10-19 19:43:50 +03:00
Batuhan Baş 4eaf2692aa Invoice customization added 2018-10-17 20:58:46 +03:00
cuneytsenturk e0cf64e7d9 Reflect next recurrings to reports 2018-10-16 15:04:46 +03:00
cuneytsenturk c23abe13bf Customer invoice for unique link 2018-10-15 16:25:10 +03:00
cuneytsenturk c680ccf8f7 Invoice page added customer share link 2018-10-15 16:10:49 +03:00
cuneytsenturk 7ee300e5d1 Signed URL for invoice 2018-10-15 12:39:41 +03:00
cuneytsenturk 922a03b988 Invoice/Bill: Multiple tax rate 2018-10-09 19:41:05 +03:00
cuneytsenturk 0a616a0480 App store vendor's app page added. 2018-10-03 12:10:59 +03:00
Batuhan Baş 320006a69a Updates progress get Core check api token and upload error message issue solved 2018-10-02 14:36:33 +03:00
Cüneyt Şentürk 6d7bc2f6a1
Merge pull request #511 from batuhawk/1.3-dev 
Out-of-stock reminder settings
 2018-09-29 17:49:31 +03:00
Batuhan Baş 4974940401 Out-of-stock reminder settings 2018-09-29 17:37:55 +03:00
Cüneyt Şentürk 119e969e8b
Merge pull request #505 from cuneytsenturk/1.3-dev 
Improve the update process
 2018-09-27 17:12:03 +03:00
cuneytsenturk 98e8a8072f Improve the update process 2018-09-27 17:08:00 +03:00
Batuhan Baş c0283746d3 Refactor Role form 2018-09-26 17:20:19 +03:00
cuneytsenturk de10f1fbce List invoices/bills in customer/vendor show page 2018-09-20 19:46:56 +03:00
cuneytsenturk 034c5b828c App review add pagination 2018-09-20 18:35:24 +03:00
cuneytsenturk 2ea4722dcf Added app store pagination 2018-09-20 11:16:56 +03:00
cuneytsenturk da779e88ed close #472 Fixed: If you create/edit invoice/bill then Validation return error missing items. 2018-09-03 13:24:27 +03:00
denisdulici 49e9732fac check if there is any relationship 2018-09-01 19:09:04 +03:00
denisdulici 800ccbb332 mass delete relationships 2018-08-31 19:55:27 +03:00
cuneytsenturk 0993885a11 close #468 Fixed: App show page issue 2018-08-30 16:30:22 +03:00
denisdulici 7ffa8895d1 fixed #467 2018-08-30 16:20:01 +03:00
cuneytsenturk a3a2cf55fe close #451 Finished: Format amount fields with respect to currency 2018-08-30 15:40:12 +03:00
cuneytsenturk 3589a0b5fc close #466 Fixed: Bill Payment Problem 2018-08-30 13:08:31 +03:00
Batuhan Baş 51503e688c invoice and bill currency issue some fix 2018-08-29 19:45:50 +03:00
Batuhan fa6a5d7f47
Banking account edit set always default account 2018-08-29 14:40:44 +03:00
Cüneyt Şentürk 398c8d38a6 refs #451 Items 2018-08-18 17:16:19 +03:00
Cüneyt Şentürk b2e25990a1 refs #451 Banking, Transfer and Account issue solved 2018-08-18 15:56:24 +03:00
cuneytsenturk ca6788686e refs #451 Bill create and edit item price mask 2018-08-17 18:17:33 +03:00
cuneytsenturk 15455de4ca refs #451 Bank Transfer issue solve 2018-08-17 17:54:15 +03:00
cuneytsenturk 1e2f0127ac refs #451 Invoice edit, 2018-08-17 17:17:56 +03:00
cuneytsenturk 17b582796d refs #451 Invoice create added item price mask 2018-08-17 17:10:23 +03:00
cuneytsenturk 022b203823 refs #451 Add payment on Invoice and Bill, Account create and edit save issue solved. 2018-08-16 15:26:44 +03:00
cuneytsenturk 47ad57eaed refs #443 Bill create and edit page added stack and fixed category type for expense, income 2018-08-16 11:34:08 +03:00
cuneytsenturk 30298635fd refs #443 invoice create and edit add stack 2018-08-16 10:32:07 +03:00
cuneytsenturk 17eda360d5 refs #443 Payment create page new vendor and category 2018-08-15 18:19:38 +03:00
cuneytsenturk 41f54e64f6 refs #443 Revenue create page new customer and category modal transform. 2018-08-15 18:03:21 +03:00
cuneytsenturk e83eade56a refs #451 Banking -> Account currency issue solved 2018-08-14 11:40:16 +03:00
cuneytsenturk e9d6cecf14 refs #451 Add format files; 
Banking => Account,
Banking => Transfer,
Common => Items,
Expense => Payment,
Income => Revenue
 2018-08-13 21:14:58 +03:00
cuneytsenturk 31c21aebd7 close #446 Fixed: Wrong transfer amount EUR to TRY currency rate issue 2018-08-07 19:58:24 +03:00
cuneytsenturk 36df336578 close #434 Fixed: Cannot Import Data 2018-08-07 16:39:54 +03:00
cuneytsenturk bfdd3b21dc refs #434 2018-08-06 23:16:18 +03:00
denisdulici efbd17f5fe wrong redirection in items out of stock read 2018-07-20 14:22:37 +03:00
cuneytsenturk 4c497c3f60 close #420 Fixed: Reports - Income Summary - Paid Tab - Not adding income categories 2018-07-19 14:54:23 +03:00
cuneytsenturk 67228694a1 invoice mark paid show add payment price 2018-07-18 17:21:08 +03:00
cuneytsenturk 968c0b2016 close #421 Fixed: Payments for expenses, wrong calculation error 2018-07-18 16:28:56 +03:00
cuneytsenturk 80901078ea refs #412 2018-07-11 15:16:24 +03:00
cuneytsenturk 5503e546c1 refs #273 change solution system 2018-07-11 14:05:42 +03:00
cuneytsenturk 6405aafef9 close #412 Fixed: Invoice add payment problem 2018-07-10 18:30:03 +03:00
cuneytsenturk 7641d7e315 refs #412 Added payment check currency 2018-07-10 17:21:40 +03:00
cuneytsenturk eec7c0290b close #273 Fixed: Banking - Transfer and Transactions - Latest dates should be first then descend for consistency 2018-07-09 12:01:16 +03:00
denisdulici 672159eafc Merge branch 'master' of github.com:akaunting/akaunting 2018-07-05 16:56:09 +03:00
denisdulici d0c6e327c1 fixed #372 2018-07-05 16:55:35 +03:00
cuneytsenturk f0e48521d4 close #404 Fixed: Apps are not updating 2018-07-03 10:52:38 +03:00
cuneytsenturk 61262a5d4b get currency account, customer and vendor issues solved 2018-07-02 14:13:20 +03:00
denisdulici 93ed391cdd fixed #400 2018-06-29 14:42:15 +03:00
cuneytsenturk 9628d93ab4 close #399 Fixed: Search not working for items 2018-06-27 19:59:22 +03:00
cuneytsenturk 68576ffeeb refs #392 fixed Account, Vendor, Customer currency issue 2018-06-27 19:43:48 +03:00
denisdulici e7c7a472c1 validate import sheet name 2018-06-27 17:01:26 +03:00
cuneytsenturk 5b147834ad get Account currency issue solved 2018-06-26 15:16:13 +03:00
denisdulici 8999e11688 made update error as important 2018-06-26 13:49:16 +03:00
cuneytsenturk ebda456f21 Merge branch 'master' of github.com:akaunting/akaunting 2018-06-25 17:54:31 +03:00
cuneytsenturk 55ac8447fc import validation fixed create and edit action on invoice, bill, revenue, payment. 
refs #392
 2018-06-25 17:53:43 +03:00
denisdulici 474cf929e6 fixed #391 2018-06-25 10:46:37 +03:00
denisdulici 9566464938 small fixes #392 2018-06-23 16:45:03 +03:00
denisdulici 978e8631aa import validation 2018-06-23 15:59:13 +03:00
denisdulici e44934337a fixed #390 2018-06-21 18:09:58 +03:00
denisdulici 5a46f86207 added histories to prevent n+1 2018-06-21 16:24:40 +03:00
denisdulici 89158e83bd fixed #389 2018-06-21 16:22:37 +03:00
denisdulici 7f28b00570 more enable/disable 2018-06-11 11:53:45 +03:00
denisdulici f3e54217fc enable/disable from index 2018-06-11 11:19:30 +03:00
denisdulici 3d68496145 added export and improved import 2018-06-11 03:47:32 +03:00
denisdulici c274d38f13 invoice pdf fix 2018-06-10 15:38:07 +03:00
denisdulici b1fd49c507 moved folders to common directory 2018-06-10 02:48:51 +03:00
denisdulici 7fa629e8b5 fixed #370 2018-06-09 15:37:28 +03:00
cuneytsenturk c0d03b820e My apps get installed app for current company. 2018-06-08 18:31:15 +03:00
denisdulici d8e122c476 fixed #366 2018-06-01 12:09:22 +03:00
cuneytsenturk 9f3dec6e84 Add UTM suggestions apps for buy now button 2018-05-29 19:01:29 +03:00
cuneytsenturk 54f10af4d3 Added My apps page, it show Purchase and installed app 2018-05-29 12:55:16 +03:00
cuneytsenturk d57537b203 Apps page show installed modules 2018-05-28 16:46:52 +03:00
cuneytsenturk 8242da88f3 close #352 Fixed: Not running migrations on module install 2018-05-22 12:18:34 +03:00
denisdulici f3414ddbd8 language fix #349 2018-05-21 20:05:37 +03:00
cuneytsenturk c57f3936ca close #349 Fixed: Transfer added edit and delete feature 2018-05-21 16:47:35 +03:00
denisdulici 99178a3887 added ACL support for modules 2018-05-21 02:10:51 +03:00
denisdulici 72ed09c352 fixed #342 2018-05-14 09:46:37 +03:00
cuneytsenturk 170cf883d8 close #339 Fixed: Dashboard widgets progress bar issue 2018-05-10 21:06:18 +03:00
denisdulici cec708a4fe fixed #331 2018-05-09 17:27:33 +03:00
denisdulici 59ae2f9977 fixed #327 2018-05-05 12:12:35 +03:00
denisdulici 654bd509bd added invoice/bill category to customer/vendor summary page 2018-05-02 22:12:18 +03:00
denisdulici 7e21634d77 removed test line 2018-05-01 19:25:04 +03:00
denisdulici 0a5136bd40 fixed recurring command #315 2018-05-01 19:00:33 +03:00
denisdulici 1c8bcd8cb2 decimal quantity 2018-04-30 11:49:47 +03:00
denisdulici 1b47c33b54 force item price to be double 2018-04-30 10:32:52 +03:00
cuneytsenturk 34c869b0cf Invoice & Bill add discount style change 2018-04-28 18:43:43 +03:00
denisdulici b0e9de6347 recurring trait 2018-04-27 16:01:31 +03:00
denisdulici b5e937b58d form stuff done 2018-04-26 18:40:04 +03:00
denisdulici c283796fe1 moved logo method to view composer 2018-04-26 16:04:27 +03:00
denisdulici ad202645b8 started recurring 2018-04-26 02:17:55 +03:00
cuneytsenturk 1294ab3f8b App Store search issue solved 2018-04-25 19:28:10 +03:00
cuneytsenturk bfc4a70ec9 Bill, Revenue, Bill, Payment create page add new category button 2018-04-24 17:26:05 +03:00
denisdulici 483ffa396e prevent deletion of last category by type #304 2018-04-24 01:03:01 +03:00
denisdulici 15e0662b76 prevent deletion of invoice/bill category #304 2018-04-23 22:28:43 +03:00
denisdulici 1af5720915 categories for invoices/bills 2018-04-23 22:17:20 +03:00
denisdulici 61d326d76a check if date is available in totals 2018-04-18 16:12:46 +03:00
denisdulici df3a15f7bd removed tax from item total 2018-04-17 17:05:44 +03:00
denisdulici 18a3a3f6cb discount 2018-04-17 16:40:52 +03:00
denisdulici d2b0a816e3 closes #281 2018-04-16 19:01:29 +03:00
denisdulici 0d4f3e9dae missing bills in paid view #296 2018-04-16 14:37:19 +03:00
denisdulici 5dc4ca6d0d added temp show method 2018-04-16 13:59:53 +03:00