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

2705 Commits

Author SHA1 Message Date
aspangaro
fd09bdfb15 Fix #5973: EBP export uses simple cote instead of double cote 2016-11-11 14:06:33 +01:00
Laurent Destailleur
ab269bd7a6 Better responsive 2016-11-11 01:15:41 +01:00
Laurent Destailleur
e39e20b1a4 Uniformize length of search fields 2016-11-07 12:04:47 +01:00
Laurent Destailleur
d96681bcef Id line at first column 2016-11-07 12:01:17 +01:00
Laurent Destailleur
5fb8ba8ee7 Better help to explain suggested account 2016-11-07 11:42:20 +01:00
Laurent Destailleur
8cb7d508d2 Fix missing length_account in output 2016-11-07 10:41:45 +01:00
Laurent Destailleur
18d1878775 Debug accountancy module 2016-11-06 13:07:49 +01:00
Laurent Destailleur
614f3d8286 Fix param lost when saving setup 2016-11-04 16:32:28 +01:00
Laurent Destailleur
e59c2bb61c Debug accounting menu. Can now edit product account if already set. 2016-11-04 16:15:31 +01:00
Juanjo Menent
a59cf0e13b Merge pull request #5935 from aspangaro/5.0-p32 
Accountancy - Add binding and journal for expense reports
 2016-10-28 11:25:21 +02:00
aspangaro
029fa1ed8a Finishing works 2016-10-27 06:04:23 +02:00
Laurent Destailleur
d47fc281b0 Better accountancy tutorial 2016-10-26 11:15:25 +02:00
aspangaro
8800bf8b25 Update works 2016-10-26 07:46:48 +02:00
aspangaro
6e7f104c5f Update works 2016-10-25 07:41:01 +02:00
aspangaro
6314df035a Work on expense report accountancy integration 2016-10-24 07:16:26 +02:00
Laurent Destailleur
ab3cdfa16d Clean code 2016-10-24 00:33:39 +02:00
Laurent Destailleur
60ba6164e4 Merge pull request #5883 from aspangaro/5.0-p22 
Accountancy - Add loan module in step to configure the accountancy
 2016-10-24 00:17:09 +02:00
Laurent Destailleur
d002648733 Alignement 2016-10-22 14:25:56 +02:00
Laurent Destailleur
a057cb93c9 Debug accounting module 2016-10-22 14:23:33 +02:00
Laurent Destailleur
14c9cd4490 Fix help with new menu 2016-10-22 13:57:47 +02:00
Laurent Destailleur
f0365e49e2 Fix book keeper can edit accounting account of taxes 2016-10-21 18:05:26 +02:00
Laurent Destailleur
304a44ffc2 Debug accounting module 2016-10-21 14:48:55 +02:00
Laurent Destailleur
3111b56b20 Fix navigation for list of product to bound. 2016-10-21 12:45:19 +02:00
Laurent Destailleur
cef43bf4b6 Better support of multicompany 2016-10-21 11:10:11 +02:00
aspangaro
53c8649629 Merge remote-tracking branch 'Upstream/develop' into 5.0-p22 
Conflicts:
	htdocs/langs/en_US/accountancy.lang
 2016-10-16 13:44:09 +02:00
aspangaro
1af1e4dc9c Accountancy - Add loan module in step to configure the accountancy 2016-10-16 13:38:29 +02:00
Laurent Destailleur
30e6dd93a6 Missing perf key on the most important table 2016-10-15 17:10:05 +02:00
Laurent Destailleur
9cad437d5c Fix list in chart of account 2016-10-15 16:20:08 +02:00
Laurent Destailleur
04c0e87d79 Work on accounting module 2016-10-15 15:51:28 +02:00
Laurent Destailleur
c689248211 The setup that must be done by the bookkeeper is removed from admin 
setup and move into setup of accountancy
 2016-10-15 14:38:43 +02:00
Laurent Destailleur
a7c6ecc177 Fix better compatibility with multicompany 2016-10-14 16:05:25 +02:00
Laurent Destailleur
e74718827f Debug accountancy module 2016-10-14 15:44:33 +02:00
Laurent Destailleur
ca46ff8eb5 Fix pagination/navigation on general ledger page 2016-10-14 13:46:04 +02:00
Laurent Destailleur
79d376ee12 Debug accountancy module 2016-10-14 13:05:01 +02:00
Laurent Destailleur
7c1b74133a Debug accountancy module 2016-10-13 22:29:49 +02:00
Laurent Destailleur
e7a09c07f9 Sync and clean language files 2016-10-11 10:38:38 +02:00
Laurent Destailleur
6489cd6164 Debug accounting module 2016-10-07 12:10:16 +02:00
Laurent Destailleur
f7f56132b2 Fix sql errors 2016-10-06 20:15:36 +02:00
Laurent Destailleur
28e4c17730 Debug module accountancy expert 2016-10-06 19:59:33 +02:00
Laurent Destailleur
0cfb0ff7b7 Complete help 2016-10-06 19:03:40 +02:00
Laurent Destailleur
539ee1ace2 Uniformize code 2016-10-06 18:06:40 +02:00
Laurent Destailleur
49e7e4901d Add page index for accountancy module 2016-10-06 17:43:31 +02:00
Laurent Destailleur
93c848fcc5 Add page index for accountancy module 2016-10-06 17:43:10 +02:00
Laurent Destailleur
35e568f715 Fix php error 2016-10-05 21:50:39 +02:00
Laurent Destailleur
9ad96c2be3 Debug module accountancy expert 2016-10-05 20:50:47 +02:00
Laurent Destailleur
dff7f73dc9 Better terminology 2016-10-05 18:31:55 +02:00
Laurent Destailleur
5a8a0fb79a Debug 2016-10-04 21:33:47 +02:00
Laurent Destailleur
efaf1210c2 Uniformize look and feel 2016-10-04 20:28:58 +02:00
Laurent Destailleur
989cfe749d Fix permission on fiscal year 2016-10-04 19:52:16 +02:00
Laurent Destailleur
6efbae0731 Fix title 2016-10-04 19:52:00 +02:00
Laurent Destailleur
bd5116cb52 Debug of accountancy expert module 2016-10-04 19:43:12 +02:00
Laurent Destailleur
31ce725d73 Maxi debug of accountancy expert module 2016-10-04 19:31:05 +02:00
Laurent Destailleur
1e3038d634 Debug reports 2016-10-04 13:57:25 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
ea0687f613 FIX Vat not visible in dictionnary 2016-10-01 18:22:39 +02:00
Laurent Destailleur
aae4524fe2 Debug module accountancy 2016-09-30 18:38:48 +02:00
Laurent Destailleur
2f557fc09b Several fix on module accountancy expert 2016-09-30 17:03:09 +02:00
Laurent Destailleur
e6503c0d36 Better explanation 2016-09-29 12:52:28 +02:00
Laurent Destailleur
fee47f7583 Fix for multicompany management 2016-09-29 12:36:59 +02:00
Laurent Destailleur
bac1f95e30 Fix consistency on permission. Missing the getLibStatut function. 2016-09-29 12:11:57 +02:00
Laurent Destailleur
b412baa880 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-29 10:49:47 +02:00
Laurent Destailleur
ccd7100b7f Minor code fix 2016-09-29 10:43:53 +02:00
Laurent Destailleur
78c0945fe7 Fix menu switch on accountancy and picto of product not using correct 
type.
 2016-09-28 23:59:47 +02:00
Laurent Destailleur
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
Laurent Destailleur
448acbf7a1 Merge pull request #5766 from atm-florian/4.0 
fix customer accountancy lines ventilaled bad href link
 2016-09-22 09:15:52 +02:00
aspangaro
9a3305abf9 Fix: Accountancy - Problem on Cegid Export Format & presentation 2016-09-20 21:12:28 +02:00
florian HENRY
278bef8767 fix customer accountancy lines ventilaled bad href link 2016-09-20 16:48:32 +02:00
aspangaro
37c7d49537 Presentation of fiscal year 2016-09-06 22:42:15 +02:00
Laurent Destailleur
64ab02234b Fix not return in a constructor 2016-08-31 20:03:54 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Juanjo Menent
5c92cc7fa3 Merge pull request #5613 from atm-florian/40_accountancy 
fix export
 2016-08-11 20:47:02 +02:00
Juanjo Menent
0907465fcf Merge pull request #5615 from aspangaro/4.0-p41 
Fix: Accountancy - Problem to define account_parent for an accounting account + presentation
 2016-08-11 20:46:08 +02:00
aspangaro
300da71b9c Replace with 0 2016-08-11 06:12:04 +02:00
aspangaro
55a83f9d8d Fix: Accountancy - Problem to define account_parent for an accounting account & presentation 2016-08-11 06:08:33 +02:00
florian HENRY
07412b2f79 force export txt for ciel and quadratus 2016-08-10 17:37:22 +02:00
florian HENRY
e9962bb887 fix export 2016-08-10 17:22:58 +02:00
aspangaro
43ffb061ef FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option 2016-08-10 08:07:27 +02:00
florian HENRY
beadb19fea fix list 2016-08-08 15:31:06 +02:00
florian HENRY
95a66e7e63 Work on accoutancy PgSQL comptatiblity and other stuff 2016-08-08 14:52:19 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
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
Laurent Destailleur
36641533cb Merge pull request #5437 from Oeris/oeris-bookkeeping 
NEW|Display bookkeeping by accounting account
 2016-07-14 23:10:03 +02:00
Neil Orley
8a8771534f Indentation dolibarr style 2016-07-11 10:24:06 +02:00
Neil Orley
348a95604e Trailling white space removed on all lines 2016-07-08 15:15:55 +02:00
BENKE Charlie
8a5a5a9899 Add : new param accounting export 
We keep the old export format with no date
 2016-07-07 11:48:22 +02:00
Neil Orley
59d96fdc07 ut8_encode() removed from balance.php and listbyaccount.php 2016-07-07 09:52:59 +02:00
Laurent Destailleur
f39558ebb0 Fix ĉonf not defined 2016-07-06 11:24:51 +02:00
Laurent Destailleur
0af555126c Fix PHPCS 2016-07-06 11:23:32 +02:00
Scrutinizer Auto-Fixer
a8b1699abb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-07-02 18:26:31 +00:00
Neil Orley
14deae77b7 NEW|Display bookkeeping by accounting account 
- Bookkeeping ordered by accounting account
- Link with customers and suppliers invoices
- Sub Total by accounting account
- Ability to display more than 25 lines and filter by customer/supplier, invoice and accounting account
 2016-07-01 11:36:33 +02:00
Neil Orley
0cab1a16d9 NEW|Display bookkeeping by accounting account 
- Bookkeeping ordered by accounting account
- Link with customers and suppliers invoices
- Sub Total by accounting account
- Ability to display more than 25 lines and filter by customer/supplier, invoice and accounting account
 2016-07-01 11:21:55 +02:00
florian HENRY
34fddbf3bc addd export cogilog 2016-06-29 17:30:47 +02:00
florian HENRY
9b044ec5ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_compta 2016-06-29 16:55:59 +02:00
florian HENRY
ea3e851ec0 Fix stuff in accoutancy 2016-06-29 16:54:37 +02:00
Laurent Destailleur
8bcd2e581f Fix of bugs reported by scrutinizer 2016-06-29 11:20:48 +02:00
florian HENRY
dfc4f3e7fe on going accountacy working 2016-06-29 11:06:02 +02:00
Laurent Destailleur
d0f03d9ff6 Merge pull request #5376 from atm-florian/develop 
FIX php warning method declaration
 2016-06-23 10:02:13 +02:00
Laurent Destailleur
00749b2a65 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/imports/import.php
	htdocs/includes/odtphp/odf.php
	htdocs/product/stock/product.php
	htdocs/projet/list.php
 2016-06-22 20:22:22 +02:00
florian HENRY
dfba0638ab continue accoutancy and PG SQL compatibility 2016-06-22 11:28:21 +02:00
florian HENRY
93417a08b3 FIX : Add comment because accoutancy cannot work with PgSQL 2016-06-17 13:49:44 +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
Frédéric FRANCE
5234e8fc8f Update index.php 2016-06-14 15:32:55 +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
florian HENRY
cb1192aba5 check spelling 2016-05-17 09:03:27 +02:00
florian HENRY
67da7ab945 d 2016-05-17 08:50:54 +02:00
florian HENRY
5d4db68b87 fix travis 2016-05-16 17:07:36 +02:00
florian HENRY
f8ac6c96e0 fix accountancy export 2016-05-16 17:05:34 +02:00
florian HENRY
b8d452596c Fix : Advanced Accountancy module 2016-05-16 16:37:07 +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
aspangaro
d0b2068ab1 FIX: Accountancy - Upgrade Cegid Bank export 2016-04-24 14:41:14 +02:00
aspangaro
f5c1406beb FIX: Accountancy - Fix on bank journal to support subcription 2016-04-24 06:10:15 +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
c939273fd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-22 13:38:56 +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
Laurent Destailleur
30f7d4cd52 Merge pull request #5027 from marcosgdf/refactor-option 
Refactored Form classes to use Form::selectarray instead of HTML code
 2016-04-21 01:15:59 +02:00
aspangaro
19b594ee9d Correct travis 2016-04-17 15:58:32 +02:00
aspangaro
b59c94e056 NEW: Accountancy - Add Result page 
& review
 2016-04-17 15:44:04 +02:00
Marcos García de La Fuente
3722fc1014 Refactored FormVentilation class 2016-04-16 20:16:38 +02:00
Laurent Destailleur
83644dcb93 Fix errors reported by scrutinizer 2016-04-09 15:38:15 +02:00
Scrutinizer Auto-Fixer
c2243909e9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-04-09 13:07:33 +00:00
Juanjo Menent
2388887e99 Merge pull request #4938 from aspangaro/4.0-p15 
FIX: Accountancy - Update balance to add description of the accounting account + bugfix
 2016-04-03 17:38:02 +02:00
aspangaro
e79c6c1439 Correct travis error 2016-04-03 17:09:22 +02:00
Juanjo Menent
ba1c029723 Merge pull request #4904 from aspangaro/4.0-p10 
FIX: Accountancy Add informations to show in journal & correct problems to export in bookkee…
 2016-04-03 16:16:30 +02:00
aspangaro
f8bc456807 FIX: Accountancy - Update balance to add description of the accounting account + bugfix 2016-04-03 15:32:46 +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
f6f7dc8e86 Try to correct travis II 2016-03-30 05:41:44 +02:00
aspangaro
29c4971d5a Try to correct travis 2016-03-29 21:14:19 +02:00
aspangaro
e43043edcb Merge remote-tracking branch 'Upstream/develop' into 4.0-p10 2016-03-29 21:02:46 +02:00
aspangaro
1f31163e5e Correct travis 2016-03-28 21:36:57 +02:00
aspangaro
a1d95e11ed Correct table 2016-03-28 21:33:49 +02:00
aspangaro
a67b9afb6c FIX: Add informations to show & correct problems to export in bookkeeping 2016-03-28 21:31:23 +02:00
aspangaro
2be979569d Debug II 2016-03-28 21:03:47 +02:00
aspangaro
cbecb37c59 debug 2016-03-28 15:32:57 +02:00
aspangaro
436fb91901 Uniformize name of table 2016-03-28 14:50:51 +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
aspangaro
3dc991974c FIX: Accountancy Bank journal Fix some problem with other module 2016-03-25 15:57:46 +01: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
aspangaro
8aed039ad3 FIX: Accountancy Bank journal Fix some problem with other module 2016-03-22 22:32:02 +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
72b9b9876f travis 2016-03-15 10:15:45 +01:00
Florian HENRY
6fd218c9aa accoutancy 2016-03-15 09:01:02 +01:00
Florian HENRY
c380faacce Accountancy 2016-03-15 08:58:53 +01:00
Laurent Destailleur
543f5cef63 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/initdemo.sh
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
 2016-03-13 01:31:12 +01:00
Laurent Destailleur
f345ff7300 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-13 01:11:42 +01:00
Laurent Destailleur
1b30c1adb4 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-12 20:49:38 +01:00
Florian HENRY
d7065751a1 fix error messages 2016-03-11 17:18:25 +01:00
Florian HENRY
33c5658209 fix error return 2016-03-11 17:17:06 +01:00
Florian HENRY
bb06356afb qs 2016-03-10 11:43:07 +01:00
Florian HENRY
e40de3ce28 fix accoutancy 2016-03-10 11:39:26 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
 2016-03-08 17:40:21 +01:00
aspangaro
ae472b932c Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account 2016-03-04 20:45:47 +01:00
Laurent Destailleur
4ea00fe1c5 Merge pull request #4725 from aspangaro/3.9-p15 
Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account
 2016-03-04 15:31:25 +01:00
aspangaro
8536841ada Fix: 3.9rc2 Show accountancy account ventilated instead of the orwid of the account. 2016-03-04 10:27:34 +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
0136a1742e Spaces !!! 2016-02-27 16:21:59 +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
aspangaro
c907cd139c Lot of corrections 2016-02-27 08:15:58 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Florian HENRY
4401995540 Accountancy feature 2016-02-09 19:22:52 +01:00
Florian HENRY
44e39519b0 add accountancy balance 2016-02-09 19:20:03 +01:00
Florian HENRY
05d7b14786 Accoutancy 2016-02-09 19:11:19 +01:00
Florian HENRY
61dc17f280 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-09 19:07:04 +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
Florian HENRY
2991084061 fx accountancy 2016-02-08 10:50:40 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
3a5846ea7f Fix bad link to bank account 2016-02-07 14:45:49 +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
c1f084b448 Fix accountancy 2016-02-02 11:11:08 +01:00
Florian HENRY
eb7b71e3ab Fix accountancy 2016-02-02 11:10:38 +01:00
Florian HENRY
2887eb8c70 fix accountancy 2016-02-02 11:02:58 +01:00
Florian HENRY
22ce2872ac Fix journal 2016-02-02 11:01:15 +01:00
Florian HENRY
564594c3d7 Fix accountancy 2016-02-02 10:58:12 +01:00
Florian HENRY
48b191b1ff Fix tuff into accountancy 2016-02-01 15:08:01 +01:00
Florian HENRY
fb5aba6de2 Accountancy 2016-02-01 15:07:12 +01:00
Florian HENRY
65162ae8e9 Accountancy modules 2016-02-01 14:59:13 +01:00
Florian HENRY
165b553a79 Format code 2016-02-01 14:50:25 +01:00
Florian HENRY
7d374c2b02 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/core/class/link.class.php
 2016-01-30 17:32:01 +01:00
Laurent Destailleur
e3a4124a58 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/fr_FR/bills.lang
 2016-01-30 16:13:06 +01:00
Laurent Destailleur
c4d8c20abb Fix missing include 2016-01-30 14:32:20 +01:00
Laurent Destailleur
c6a6889d79 Merge pull request #4389 from aspangaro/3.9-p6 
Fix: Some problems presentation on accountancy module
 2016-01-30 13:04:22 +01:00
bobby
87284ef9be accoutancy module enhancement 2016-01-28 13:37:09 +01:00
bobby
6aa6c067fb fix travis 2016-01-28 13:24:38 +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
bobby
c286c4c6ec Accoutancy update 2016-01-25 12:39:21 +01:00
bobby
50d2665b0e Fix travis 2016-01-23 19:42:40 +01:00
bobby
71a46567ac DEV : Accounting module 2016-01-15 10:44:16 +01:00
bobby
19bec6b0b3 Manual merge from 3.8 backported 2016-01-14 18:24:02 +01:00
aspangaro
cf6be40922 New: #3292 Make sure each and every page displays a title 2016-01-11 22:03:26 +01:00
aspangaro
a88773cb81 Fix: Some problems presentation on accountancy module 2016-01-10 15:44:14 +01:00
Juanjo Menent
c7ae943e57 Merge pull request #4311 from FHenry/develop 
NEW : if nb total of lines provided in print barre_liste, display beside title
 2016-01-09 17:52:05 +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
Juanjo Menent
095ee47724 Merge pull request #4268 from aspangaro/develop-a7 
Accountancy Review page to init accountancy on product/service
 2016-01-09 17:45:42 +01:00
Juanjo Menent
2bb2f22955 Merge pull request #4252 from aspangaro/develop-a4 
Accountancy Add a list to select accounting account on product card
 2016-01-09 17:41:43 +01:00
aspangaro
2c1ff3ca47 Merge remote-tracking branch 'Upstream/develop' into develop-a7 
Conflicts:
	htdocs/langs/en_US/accountancy.lang
 2015-12-31 06:07:08 +01:00
bobby
46532ccb55 FIX/NEW : Accountancy 2015-12-28 11:08:14 +01:00
aspangaro
6114606c11 Accountancy Add a list to select accounting account on accoutancy admin 2015-12-26 06:26:18 +01:00
Florian HENRY
9441d98890 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-23 14:01:16 +01:00
aspangaro
61208537d8 Merge remote-tracking branch 'Upstream/develop' into develop-a4 2015-12-22 07:13:56 +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
Florian HENRY
8006baf592 ry 2015-12-21 13:09:22 +01:00
aspangaro
c7b25ec497 Review page init accountancy 2015-12-21 06:51:46 +01:00
aspangaro
51640c19bb Merge remote-tracking branch 'Upstream/develop' into develop-a4 
Conflicts:
	htdocs/product/card.php
 2015-12-19 05:43:22 +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
85f87d45df Add select account in product card 2015-12-17 12:57:08 +01:00
aspangaro
c34e698d59 Merge remote-tracking branch 'Upstream/develop' into develop-a4 2015-12-17 06:17:32 +01:00
aspangaro
b064d1106b Accountancy Add a list to select accounting account on product card 2015-12-17 06:16:29 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit * 
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
 2015-12-16 19:38:40 +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
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
1a58624775 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-11 17:05:38 +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
Florian HENRY
b80518efb4 fix travis 2015-12-09 14:26:04 +01:00
Florian HENRY
96a95d6ae1 Debug accountancy on 3.9 2015-12-09 12:55:08 +01:00
Florian HENRY
ea1a81f5f4 FIX : Comptability when multiple account charts 2015-12-09 11:53:38 +01:00
Laurent Destailleur
12702ee128 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/report.lib.php
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:59:13 +01:00
aspangaro
b1122b55d4 Fix : accountancy code on finance journal is not a constant 2015-11-30 21:07:27 +01:00
aspangaro
37da315af6 Remove old code 2015-11-26 06:30:09 +01:00
aspangaro
9a2259c681 Correct button 'Export' and 'Write bookkeeping' on finance journal 2015-11-26 06:19:24 +01:00
aspangaro
0899e7392b Fix: typo on finance journal 2015-11-22 22:11:22 +01:00
aspangaro
06f752b250 Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy 2015-11-16 06:50:04 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php
 2015-11-13 12:18:46 +01:00
Laurent Destailleur
b3be7f65cd Fix syntax error . = instead of .= 2015-11-13 11:12:49 +01:00
aspangaro
f0a3bca4c2 Fix: Accountancy compatibility with subtotal & jalon module 2015-11-08 04:22:49 +01:00
aspangaro
337643e53e Accountancy : Correct errors of display in bank journal 2015-11-04 22:31:24 +01:00
Laurent Destailleur
7d8fab73e1 Merge pull request #3792 from grandoc/develop 
[Qual] Uniformize code
 2015-10-26 23:03:30 +01:00
Philippe Grand
8fffdae1fb Update index.php 2015-10-23 19:01:50 +02:00
philippe grand
3767ab437e [Qual] Uniformize code 2015-10-23 12:58:30 +02:00
Laurent Destailleur
a5912d1909 Merge pull request #3778 from grandoc/develop 
[Qual] Uniformize code
 2015-10-22 10:39:55 +02:00
Jean-Pierre Morfin
6f37fef05e fix test against empty amount on book update 
- amount < 1 was considered as 0
- 0.00 was not considered as empty so $book->sens was always C
 2015-10-20 14:44:20 +02: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
aspangaro
f8ade01f0e New : Add payment donation in accountancy expert 2015-10-07 21:48:46 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Laurent Destailleur
94723a9b83 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/langs/en_US/accountancy.lang
 2015-09-12 15:23:02 +02:00
Laurent Destailleur
1ad2aeaf2a Removed baf cut and paste 2015-09-10 01:28:39 +02:00
Laurent Destailleur
a4d0e50175 Merge pull request #3489 from AlainRnet/patch-1 
Update lines.php
 2015-09-10 01:23:13 +02:00
Laurent Destailleur
7fd01d4aa3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/paiement/cheque/class/remisecheque.class.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/list.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php
 2015-09-09 12:45:22 +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
a4a72d64c0 New: Accountancy Add message when general ledger is witten 2015-09-06 06:43:40 +02:00
aspangaro
b268ccf064 Fix #3455 In advanced accounting module, button transfer to general ledger don't work 2015-09-06 04:52:03 +02:00
aspangaro
ef7df3f261 New: Accountancy rename llx_accountingaccount in llx_accounting_account 
Fix: language key
 2015-09-05 08:03:06 +02:00
AlainRnet
587a193a4d Update lines.php 
- pagination
- prise en compte des filtres lors d'un changement de page
 2015-09-03 16:03:04 +02:00
Laurent Destailleur
ce2e5e7862 Little debug of accounting module 2015-09-03 11:54:03 +02:00
Florian HENRY
a916b75ad8 FIX : Better const usage in accountancy module 2015-08-13 11:32:31 +02:00
Florian HENRY
2775250ce4 Fix TYPE_SITUATION on sell journals 2015-08-13 11:23:27 +02:00
Florian HENRY
6806e2b36b FIX : Accountancy expert module filter on column must not launch ventil 
ventil
 2015-08-13 10:27:35 +02:00
Laurent Destailleur
418a609b73 Fix PHPCS 2015-08-13 03:06:25 +02:00
Florian HENRY
17146fdef7 fix stuff 2015-08-12 16:11:00 +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
Darkjeff
977b12fac0 clean code customer and supplier accountancy 
celan code add VAT research
 2015-07-28 19:26:46 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
eec1f4dcdf Merge pull request #3267 from Dolibarr/3.8 
fix user role and uk_user_api_key if api module not enabled
 2015-07-18 23:51:51 +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
Darkjeff
fbf9e6b4b8 Clean Customer list 
Clean code
Add VAT research
If red line no case check
Remove comments
 2015-07-14 10:06:44 +02:00
Juanjo Menent
f9757bf072 Merge pull request #3176 from aspangaro/develop-patch55 
Fix #3166 : An accounting account can be alphanumeric (Need for EBP)
 2015-07-09 09:45:59 +02:00
aspangaro
600354e057 Update formventilation with elarifr modification 2015-07-09 07:48:09 +02:00
aspangaro
9fdc2991c7 Correct 2015-07-09 07:47:31 +02:00
aspangaro
0b19f2e068 Update list.php with elarifr modification 2015-07-09 07:46:58 +02:00
aspangaro
d286c18148 Update lines.php with elarifr modification 2015-07-09 07:11:08 +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
4c72567c6b Update bookkeeping 2015-07-08 07:19:23 +02:00
aspangaro
787d2310c1 Correct language key 2015-07-07 05:57:35 +02:00
aspangaro
fc3995c0be Accountancy: Bank journal - Show user on salary payment & user new account to pay vat 2015-07-04 16:39:52 +02:00
Laurent Destailleur
97524687c7 Merge pull request #3113 from aspangaro/develop-patch44 
Add getNomUrl on accounting for an account
 2015-07-04 03:40:30 +02:00
aspangaro
a762910f11 Add getNomUrl on accounting for account 2015-06-29 21:16:30 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
Juanjo Menent
0f6aaf1461 Merge pull request #3094 from aspangaro/develop-patch41 
Accounting - Add field to edit in admin
 2015-06-25 20:42:37 +02:00
aspangaro
e20da5511d Accounting - Add field to edit in admin 2015-06-25 06:54:19 +02:00
aspangaro
452733263d Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT 2015-06-25 06:37:26 +02:00
aspangaro
2ab454e757 Presentation 2015-06-21 14:32:00 +02:00
aspangaro
0f450edfcd Debug 2015-06-21 08:32:37 +02:00
aspangaro
0934860ce5 Accountancy list: Use print_liste_field_titre 2015-06-21 08:26:42 +02:00
Laurent Destailleur
694481ae5e Merge pull request #3071 from aspangaro/develop-patch35 
Review accountancy
 2015-06-19 11:29:01 +02:00
aspangaro
ceaa71649c Review customer list ventilation page 2015-06-19 06:56:21 +02:00
aspangaro
14ad53848d Remove $linkback, lang & html 2015-06-19 06:32:51 +02:00
aspangaro
d959c552f2 Fix: Accountancy - SQL error 2015-06-19 06:01:42 +02:00
Laurent Destailleur
4e5ed08ff8 Clean code 2015-06-12 13:21:21 +02:00
aspangaro
27c0b84a13 Typo on search 2015-05-29 06:54:16 +02:00
aspangaro
fd988ab1f3 Review card of supplier/customer ventilation 2015-05-29 06:43:40 +02:00
aspangaro
47045e0746 Accountancy: Review presentation 2015-05-28 21:34:35 +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
Laurent Destailleur
b71e5a1025 Merge pull request #2673 from aternatik/fix_getentity 
Fix : missing getEntity calls
 2015-05-07 00:48:19 +02:00
aspangaro
10a895f1bd Accountancy: add a button to purge search criteria on list 2015-05-05 22:36:48 +02:00
aspangaro
1174c67b07 Accountancy - Add key language & prepare journal for expense report 2015-05-02 06:42:06 +02:00
jfefe
f5db4d5bb7 Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
BENKE Charles
e7ed8ce95b Update purchasesjournal.php 2015-03-11 10:23:33 +01:00
BENKE Charles
9fc83ca011 Update sellsjournal.php 2015-03-11 10:23:13 +01:00
BENKE Charles
f91127c92a Update purchasesjournal.php 2015-03-10 21:48:47 +01:00
BENKE Charles
bf86693dcb Update sellsjournal.php 2015-03-10 21:47:39 +01:00
Laurent Destailleur
daabc113a5 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
 2015-02-26 13:36:07 +01:00
aspangaro
4ba095cb5c FIXED: Bankjournal is generated from id_account now 2015-02-22 15:04:18 +01:00
aspangaro
cda6e7adf9 Delete cash journal 2015-02-22 14:20:42 +01: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
Laurent Destailleur
271bcb5313 Merge pull request #2354 from aspangaro/3.7-patch2 
FIXED All constants COMPTA_* was renamed in ACCOUNTING_*
 2015-02-18 23:27:47 +01:00
aspangaro
ebdb96b18c FIXED All constants COMPTA_* was renamed in ACCOUNTING_* 2015-02-13 06:20:08 +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
68764ccea3 Debug 2015-01-25 15:35:34 +01:00
aspangaro
94a9d0159d Align module with 3.7 & contrary 2015-01-25 15:24:16 +01:00
aspangaro
ae11ab12f6 FIXED Accounting module - Align core & module 3.6 2015-01-25 06:54:17 +01:00
Laurent Destailleur
6bda61436b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/projet/element.php
 2015-01-22 21:52:55 +01:00
Marcos García de La Fuente
be3527abd1 Fixed some errors of Bookkeeping class 2015-01-18 03:23:00 +01:00
Laurent Destailleur
1664b89cef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 19:26:19 +01:00
Laurent Destailleur
007f18bcf7 Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 
GPCsolutions-review

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/comm/action/peruser.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/report.lib.php
 2015-01-17 15:11:12 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +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
Laurent Destailleur
c3734b1a88 Merge pull request #2103 from grandoc/develop 
add default payment mode select
 2014-12-08 00:03:05 +01:00
Laurent Destailleur
6729544782 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/projet/tasks/task.php
 2014-12-04 14:52:34 +01:00
Laurent Destailleur
3de0702f2b Fixed: All sql requests are now logged 2014-12-04 01:29:01 +01:00
Philippe GRAND
e18196eac6 to avoid undefined method 2014-12-01 16:50:27 +01:00
Philippe GRAND
d7dcd153f0 missing close form 2014-12-01 12:21:54 +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
199239ac8b Update /accountancy/bookeeping/list.php 2014-11-23 17:44:53 +01:00
Frédéric FRANCE
b6824877e5 Update /accountancy/admin/account.php 2014-11-23 17:44:49 +01:00
Frédéric FRANCE
e1addea6db Update /accountancy/bookeeping/list.php 2014-11-23 09:59:05 +01:00
Frédéric FRANCE
5f11354547 Update /accountancy/admin/account.php 2014-11-23 09:58:19 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer 
Fixed: Solve conflict between ->iban and ->iban_prefix.
 2014-11-22 16:57:08 +01:00
Laurent Destailleur
31f987706c Fix: bugs reported by scrutinizer 2014-11-17 15:13:23 +01:00
Laurent Destailleur
8d4fc263c5 Fix: Var not defined 2014-11-16 18:37:09 +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
b8a40a1b32 Presentation 2014-10-08 06:24:46 +02:00
aspangaro
95dc569fe2 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-10-07 20:51:59 +02:00
aspangaro
e8ac6567b7 Fix :: Button on/off for account in chart of accounts 2014-10-07 20:50:57 +02:00
Juanjo Menent
75eb61702e Fix: Showing accounting account fails 2014-10-07 12:46:05 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
cb302c16e7 Bad place of code 2014-09-29 16:22:00 +02:00
Laurent Destailleur
d0da5ef047 Merge pull request #1910 from FHenry/develop 
Better accountancy auto find accountancy code feature (work with several
 2014-09-22 23:48:32 +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
Florian HENRY
7aecce526a Better accountancy auto find accountacty code feature (work with several 
accountacy plan)
 2014-09-20 09:11:50 +02:00
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
Laurent Destailleur
ad8b92541d Fix: sql request with pgsql 
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
 2014-09-20 00:57:29 +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
Raphaël Doursenaud
e87b1d68b6 FIX: Replaced deprecated property 2014-09-19 03:07:53 +02:00
Raphaël Doursenaud
a7964c4a9a FIX: Replaced deprecated call 2014-09-19 03:07:52 +02:00
Raphaël Doursenaud
eea9a76589 FIX: Variable might not be traversable 2014-09-19 03:07:52 +02:00
Raphaël Doursenaud
cc68966d72 FIX: Missing declaration 2014-09-19 03:05:20 +02:00
Raphaël Doursenaud
9a141215bb FIX: Moved code to where the variable is defined 2014-09-19 03:05:20 +02:00
Raphaël Doursenaud
64da1b1dc0 FIX: Removed HTML file preventing PHP service 2014-09-19 03:05:19 +02:00
Raphaël Doursenaud
b1ad7af527 FIX: Missing extends 2014-09-19 03:05:19 +02:00
Raphaël Doursenaud
7b300b0a9d FIX: Missing variable declaration 2014-09-19 03:05:19 +02:00
Raphaël Doursenaud
bab1dd13e2 FIX: missing extends 2014-09-19 03:05:19 +02:00
Raphaël Doursenaud
d0f83141fb FIX: Bad variable usage 2014-09-19 03:05:19 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
9da597d56e Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-18 20:18:56 +02:00
aspangaro
7a9ce455d9 Uniformize code $_SERVER["PHP_SELF"] 2014-09-18 20:13:38 +02:00
aspangaro
5216bbca72 Traduce button 2014-09-16 21:31:58 +02:00
aspangaro
d4bcea0799 Correct bank journal 2014-09-15 20:30:03 +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
56071cb142 Uniformize presentation of supplier index with customer index 2014-09-08 20:35:41 +02:00
aspangaro
fad9fe71bc Sort out type & subtype by Chart of accounts 2014-09-06 14:45:35 +02:00
aspangaro
f9dc25cf3f Patch Accounting Expert Module 2014-09-06 09:50:42 +02:00
aspangaro
102e85e1e7 Merge branch 'Upstream/develop' 2014-09-04 04:34:04 +02:00
aspangaro
de63388d33 Directory of file 2014-09-03 22:09:01 +02:00
Laurent Destailleur
1375e20fe2 Fix: doxygen 2014-09-03 09:45:29 +02:00
aspangaro
4f41ee9f4c typo 2014-09-03 07:24:30 +02:00
aspangaro
9d08f4c5f5 Patch Accounting Expert module 2014-09-03 07:22:59 +02:00
aspangaro
e4f51d8f7a Merge branch 'Upstream/develop' 2014-09-02 20:47:27 +02:00
Laurent Destailleur
df70450073 Fix: Doxygen 2014-09-02 20:00:10 +02:00
aspangaro
cb189ed83e Add salary payment 2014-09-02 05:10:25 +02:00
aspangaro
def53d92bd Correct error menu 2014-08-31 14:10:48 +02:00
aspangaro
c5a36f67ec Key language 2014-08-31 13:57:54 +02:00
aspangaro
f9076162b6 Add dynamic link into accountancy menu to bank journal 2014-08-31 08:56:22 +02:00
aspangaro
bf5d2ec336 Add trigger on delete accounting document 2014-08-31 08:55:10 +02:00
aspangaro
0721974c05 Correct travis & licence 2014-08-31 07:41:55 +02:00
aspangaro
3b8a3ccb14 Correct travis 2014-08-30 07:37:01 +02:00
aspangaro
d3a14c514a Correct travis 2014-08-30 07:11:28 +02:00
aspangaro
6bad77d8fb Move script 2014-08-30 06:46:42 +02:00
aspangaro
d6b2cb0b31 Correct travis 2014-08-30 06:05:02 +02:00
aspangaro
84dff915c1 Typo 2014-08-28 07:21:40 +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
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
db91526643 Fix: Solve conflict into migration/backup/restore (child tables 
must be after parent tables).
Fix: Migration of old version
 2012-12-08 14:16:39 +01:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01:25 +02:00
Regis Houssin
ffc6812241 Fix: avoid php strict mode warning 2012-03-23 18:19:50 +01:00
Laurent Destailleur
ebb29d2097 Doxygen 2011-09-20 22:28:31 +00:00
Laurent Destailleur
3cdc7abf40 Fix: Solve phpcodesniffer errors and warning 2011-09-14 21:50:18 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
f4606c2253 Fix: Avoid errors into rpm packages 2011-08-03 00:45:22 +00:00
Laurent Destailleur
cc840ad66e Fix: Avoid errors into rpm packages 2011-07-31 21:24:20 +00:00
Laurent Destailleur
13fadd0e3c Fix: UFT8 2010-07-21 17:24:43 +00:00
Philippe Grand
e8498e5cc4 according to new tree directory 2010-04-25 09:07:20 +00:00
Laurent Destailleur
ae67640f6c Renamed a development module in english 2009-06-16 20:21:51 +00:00
Regis Houssin
06d2d2fc2f Fix: nous ne sommes jamais trop prudent ! 2009-05-18 13:10:40 +00:00
Laurent Destailleur
8a12e715dd Trad 2009-03-09 23:46:39 +00:00
Laurent Destailleur
0823322ba1 Qual: All call to dolibarr_ functions are made on dol_ functions. 2009-02-20 22:53:15 +00:00
Laurent Destailleur
4d0a68d48c Removed all now() and sysdate() database sql inline function by a date defined by PHP ($db->idate(mktime())). 
This is to be more portable, to solve problem when database server time differs from PHP server and to prepare for TZ support.
 2008-08-27 18:53:27 +00:00
Laurent Destailleur
0e6daffb44 New: Quelques classes pour la compta expert 2006-07-13 13:40:19 +00:00