lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

726 Commits

Author SHA1 Message Date
aspangaro
20144c9883 FIX Accountancy - Problem with the manage of the zero at the end of an accounting account in dolibarr for somes countries. Add an option. 2016-07-29 07:32:55 +02:00
florian HENRY
ea3e851ec0 Fix stuff in accoutancy 2016-06-29 16:54:37 +02:00
Laurent Destailleur
232f525f29 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2016-06-15 18:31:43 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
aspangaro
23b748aca3 Fix: Accountancy - Access rights 2016-06-05 14:22:13 +02:00
aspangaro
466010a412 Fix: Accountancy 4.0 - Right to access to fiscal year 2016-06-05 14:14:20 +02:00
Juanjo Menent
8f617b196a Fix printing following the rules 2016-06-04 15:51:28 +02:00
Laurent Destailleur
986119d2b5 Start debug 2016-05-12 21:32:24 +02:00
Laurent Destailleur
55e904bc01 Debug for expert accounting module 2016-05-12 20:45:05 +02:00
Laurent Destailleur
c8d98dbfdc FIX error reported by scrutinizer 2016-05-08 11:33:46 +02:00
Laurent Destailleur
816dda5a8b Merge pull request #5158 from aspangaro/4.0-p29 
FIX: Accountancy - Little fix et add page to assign massively the category
 2016-05-05 22:52:20 +02:00
Laurent Destailleur
ec34b26562 Merge pull request #5148 from aspangaro/4.0-p27 
FIX: Fiscal year - Some mistakes on card
 2016-05-05 22:46:48 +02:00
aspangaro
e0f600f226 FIX: Accountancy - Little fix et add page to assign massively the category 2016-05-02 20:21:37 +02:00
aspangaro
1f015388b6 FIX: Fiscal year - Some mistakes on card 2016-05-01 17:04:55 +02:00
aspangaro
3cf1d891ab FIX: Accountancy - 3.9 - Chart of accounts are limited on only one country 2016-04-30 07:05:10 +02:00
aspangaro
7041a041ce FIX: Accountancy - Chart of accounts are limited on only one country 2016-04-30 06:52:21 +02:00
Laurent Destailleur
7e047ada2b Merge pull request #5064 from aspangaro/4.0-p21 
FIX: Accountancy - Road to stable version
 2016-04-22 19:21:18 +02:00
Laurent Destailleur
366db31a9e Make css more simple 2016-04-22 13:38:44 +02:00
aspangaro
df91a95b9b FIX: Add right to manage chart of accounts for non-admin 2016-04-22 07:05:24 +02:00
aspangaro
24fddaa039 Hidden old functions 2016-04-22 06:58:18 +02:00
aspangaro
b59c94e056 NEW: Accountancy - Add Result page 
& review
 2016-04-17 15:44:04 +02:00
Laurent Destailleur
83644dcb93 Fix errors reported by scrutinizer 2016-04-09 15:38:15 +02:00
aspangaro
c48869e02b Bugfix 2016-04-03 10:51:56 +02:00
aspangaro
0c5f504881 FIX: Accountancy - Correct the display of account_parent 2016-04-02 06:22:31 +02:00
aspangaro
ef03dc3454 Youps ! 2016-03-30 06:49:10 +02:00
aspangaro
26e017f4ef Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 
Conflicts:
	htdocs/accountancy/admin/card.php
 2016-03-30 06:05:38 +02:00
aspangaro
2be979569d Debug II 2016-03-28 21:03:47 +02:00
aspangaro
432cc44ab6 NEW: Accountancy - Add category 2016-03-28 13:51:19 +02:00
aspangaro
98a46fd335 NEW: Accountancy Use clean_account to remove 0 at the right when we create an account in chart of accounts 2016-03-28 08:21:02 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Florian HENRY
c380faacce Accountancy 2016-03-15 08:58:53 +01:00
Florian HENRY
e40de3ce28 fix accoutancy 2016-03-10 11:39:26 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
aspangaro
ba6dadb6fa Fix: Use getNomUrl to show account_parent instead of rowid of the account 2016-02-27 16:21:40 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
aspangaro
eaca582cb5 Fixed: Problem of merging - Review page init accountancy again 2016-02-07 08:47:02 +01:00
Laurent Destailleur
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
 2016-02-03 03:27:17 +01:00
Florian HENRY
fb5aba6de2 Accountancy 2016-02-01 15:07:12 +01:00
Florian HENRY
165b553a79 Format code 2016-02-01 14:50:25 +01:00
bobby
71c407e670 add coala book keeping export 2016-01-25 12:43:47 +01:00
bobby
59f356905a Accoutancy update 2016-01-25 12:42:18 +01:00
Juanjo Menent
cbf5021161 Merge pull request #4297 from aspangaro/develop-a10 
Accountancy Add a list to select accounting account on accoutancy admin
 2016-01-09 17:46:41 +01:00
aspangaro
6114606c11 Accountancy Add a list to select accounting account on accoutancy admin 2015-12-26 06:26:18 +01:00
aspangaro
ec7cffd6a4 Merge remote-tracking branch 'Upstream/develop' into develop-a7 2015-12-22 07:11:10 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old 
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
 2015-12-21 13:56:59 +01:00
aspangaro
c7b25ec497 Review page init accountancy 2015-12-21 06:51:46 +01:00
Laurent Destailleur
f25a9030eb Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
	htdocs/includes/adodbtime/adodb-time.inc.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-18 22:12:03 +01:00
Laurent Destailleur
dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
 2015-12-18 21:20:12 +01:00
aspangaro
dfbc2814e7 Fix: Add an empty field for list of parent account - This value can be null 2015-12-15 21:10:53 +01:00
philippe grand
9b0dd8159e [Qual] Close database handler should be after Footer 2015-12-11 12:29:19 +01:00
Florian HENRY
8edf3c65c6 work on accounting 2015-12-11 11:46:22 +01:00
philippe grand
72491db6b4 [Qual] Uniformize code 2015-10-20 09:31:33 +02:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
aspangaro
393d528be7 Merge remote-tracking branch 'Upstream/develop' into develop-64 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-08 21:17:54 +02:00
aspangaro
710e9327bf Update works 2015-09-07 21:42:12 +02:00
aspangaro
671018c5cc New Accountancy Uniformize code & rename a constant 2015-09-06 21:53:28 +02:00
aspangaro
ef7df3f261 New: Accountancy rename llx_accountingaccount in llx_accounting_account 
Fix: language key
 2015-09-05 08:03:06 +02:00
Laurent Destailleur
ce2e5e7862 Little debug of accounting module 2015-09-03 11:54:03 +02:00
Florian HENRY
adccd5d04f fix some feature on accountancy modules 2015-08-12 15:53:17 +02:00
Florian HENRY
f2c59405d4 Merge branch 'develop' into develop_darkjeff 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
 2015-08-12 14:23:51 +02:00
Darkjeff
2500e26072 update product account 
clean sql if buy or sell
 2015-08-10 10:29:05 +02:00
Darkjeff
b185cfb85f Update product account 
choose between code sell or code buy
cleaning code
need some tests
 2015-08-06 21:23:02 +02:00
aspangaro
b9b6abd7a8 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-18 05:29:57 +02:00
aspangaro
7b1976040d Error 2015-07-17 05:26:32 +02:00
aspangaro
5ce419922d Fix: #3253 #3252 #3251 Remove print_r 2015-07-17 05:22:29 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
aspangaro
dbb5d3d386 Fix #3166 : An accounting account can be alphanumeric (Need for EBP) 2015-07-08 21:47:45 +02:00
aspangaro
a283d0ce93 Update from elarifr 2015-07-08 07:46:26 +02:00
aspangaro
787d2310c1 Correct language key 2015-07-07 05:57:35 +02:00
aspangaro
a762910f11 Add getNomUrl on accounting for account 2015-06-29 21:16:30 +02:00
aspangaro
e20da5511d Accounting - Add field to edit in admin 2015-06-25 06:54:19 +02:00
Laurent Destailleur
4e5ed08ff8 Clean code 2015-06-12 13:21:21 +02:00
aspangaro
58e942681d NEW Forms are using the tab look, even in creation mode 2015-05-20 07:03:17 +02:00
Raphaël Doursenaud
5d2f081152 [Qual] Fixed HTML select form selected attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
 2015-05-07 14:21:14 +02:00
aspangaro
1174c67b07 Accountancy - Add key language & prepare journal for expense report 2015-05-02 06:42:06 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
0d150b1d32 Removed unused code, misc corrections and corrected PHPDoc problems. 2015-02-10 10:25:59 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
 2015-02-07 03:28:36 +01:00
aspangaro
14a078c9a7 FIXED Accountancy clean code 2015-02-03 06:39:44 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
aspangaro
ae11ab12f6 FIXED Accounting module - Align core & module 3.6 2015-01-25 06:54:17 +01:00
Philippe GRAND
3d510ef346 closing tag twice 2014-12-15 11:19:14 +01:00
Philippe GRAND
fedd05cbcc button should be within form 2014-12-15 11:05:47 +01:00
Philippe GRAND
b33612d231 close form should be outside button 2014-12-01 12:09:05 +01:00
Philippe GRAND
9118ef7c8f form should be outside table and close form was twice 2014-12-01 12:03:23 +01:00
Philippe GRAND
cef835cd2d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2014-12-01 11:27:46 +01:00
Philippe GRAND
d156e1ba82 form should be outside table 2014-11-28 12:51:08 +01:00
Philippe GRAND
15311fb643 form should not be inside table 2014-11-28 12:41:53 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Frédéric FRANCE
b6824877e5 Update /accountancy/admin/account.php 2014-11-23 17:44:49 +01:00
Frédéric FRANCE
5f11354547 Update /accountancy/admin/account.php 2014-11-23 09:58:19 +01:00
Laurent Destailleur
ad661256c0 Fix: Bugs reported by scrutinizer 2014-11-15 16:20:03 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
aspangaro
4951feeb8f Correct rights & presentation 2014-11-01 07:59:52 +01:00
aspangaro
e43de8b815 Update module accounting 2014-10-31 07:37:59 +01:00
Laurent Destailleur
13090ed778 Merge pull request #1944 from aspangaro/develop-accounting 
Fix :: Button on/off for account in chart of accounts
 2014-10-12 01:38:40 +02:00
Marcos García de La Fuente
f7a44347cb Lowecased booleans to fit with PSR-2 specification. 2014-10-12 00:23:19 +02:00
aspangaro
e8ac6567b7 Fix :: Button on/off for account in chart of accounts 2014-10-07 20:50:57 +02:00
aspangaro
1bcc2c92a3 compta_mode -> accounting_mode 2014-09-21 20:42:46 +02:00
aspangaro
e147259e95 Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 2014-09-21 20:30:55 +02:00
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
Juanjo Menent
cbe64bf09d Trad: Replace ACCOUNTINGEX by ACCOUNTING 2014-09-19 16:19:38 +02:00
Juanjo Menent
f426b9dcd2 Minor accountancy updates 2014-09-19 15:04:36 +02:00
aspangaro
7a9ce455d9 Uniformize code $_SERVER["PHP_SELF"] 2014-09-18 20:13:38 +02:00
aspangaro
25b66e0491 Add linkback into accountancy admin 2014-09-09 22:34:49 +02:00
aspangaro
7cc3fe9c95 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-09 20:41:19 +02:00
Laurent Destailleur
9e2a0cb671 Fix: debug of accountancy module 2014-09-09 09:46:57 +02:00
aspangaro
289f46977b List financial journals into admin 2014-09-08 21:19:05 +02:00
aspangaro
f9dc25cf3f Patch Accounting Expert Module 2014-09-06 09:50:42 +02:00
aspangaro
de63388d33 Directory of file 2014-09-03 22:09:01 +02:00
aspangaro
9d08f4c5f5 Patch Accounting Expert module 2014-09-03 07:22:59 +02:00
Laurent Destailleur
df70450073 Fix: Doxygen 2014-09-02 20:00:10 +02:00
aspangaro
c5a36f67ec Key language 2014-08-31 13:57:54 +02:00
aspangaro
0721974c05 Correct travis & licence 2014-08-31 07:41:55 +02:00
aspangaro
6bad77d8fb Move script 2014-08-30 06:46:42 +02:00
aspangaro
9b3a3a47c2 Add link chart of accounts in administration 2014-08-28 07:18:28 +02:00
aspangaro
add4528e6c Update perms 2014-08-28 06:48:22 +02:00
aspangaro
d03763f6c3 Update Accounting Expert integration 2014-08-28 06:30:01 +02:00
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +02:00