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

810 Commits

Author SHA1 Message Date
Laurent Destailleur
c4ca4a5a16 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/install/mysql/data/llx_accounting_category.sql
 2018-03-15 15:11:18 +01:00
Laurent Destailleur
542eb2e5f4 Comment 2018-03-15 13:19:29 +01:00
Laurent Destailleur
85e307d6b8 Fix report when group is not dedicated to a country 2018-03-15 12:31:24 +01:00
Laurent Destailleur
b2e4c6cf14 Clean code 2018-03-15 11:53:47 +01:00
Laurent Destailleur
db18db9488 Clean code 2018-03-15 11:27:39 +01:00
Laurent Destailleur
852bf8dab7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/societe/class/societe.class.php
 2018-03-15 01:57:35 +01:00
Laurent Destailleur
f0f6f71161 Fix Sqli 2018-03-15 01:55:47 +01:00
Laurent Destailleur
4957ea9178 Fix SQLi reported by op7ica 2018-03-15 01:55:16 +01:00
Sean Wang
9a1588df13 Add missing $mode in BookKeeping::createStd() 
In accountancy ledger, creating new transaction, there is
'ERROR: 55000: currval of sequence "llx_accounting_bookkeeping_rowid_seq"
is not yet defined in this session' occurred.

According to dolibarr.log, this error will show up after
createStd() {...Insert request to llx_accounting_bookkeeping_tmp...}.

It query the "llx_accounting_bookkeeping_rowid_seq" instead of
"llx_accounting_bookkeeping_tmp_rowid_seq",
due to missing $mode at bookkeeping.class.php
line504:last_insert_id().
 2018-03-14 16:38:22 +08:00
Laurent Destailleur
7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/comment.php
 2018-03-07 13:06:29 +01:00
Regis Houssin
1807bb36e2 Fix: missing global $conf 2018-03-06 13:31:13 +01:00
Regis Houssin
35703cff99 Fix: wrong entity id, already value 1 ! 2018-03-06 13:23:00 +01:00
Laurent Destailleur
aac59f3e21 Fix escaping 2018-02-21 11:09:17 +01:00
Laurent Destailleur
15ba0c3b49 Close #7989 Merge manually in existing class 2018-02-20 15:35:42 +01:00
Laurent Destailleur
522caa4cf0 Merge #7989 2018-02-20 15:26:40 +01:00
Laurent Destailleur
f251113f69 Fix accounting module with multicompany 2018-02-06 01:00:35 +01:00
Laurent Destailleur
a41847d084 Fix: date of modificaiton in ledger not visible. 
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
 2018-02-02 14:27:07 +01:00
Laurent Destailleur
fd48ce11f9
Merge pull request #8085 from Darkjeff/Fixing-Lettering 
Fixing lettering
 2018-01-24 11:14:19 +01:00
Laurent Destailleur
39c4df723a Fix error management when setting product accounts 2018-01-22 21:07:10 +01:00
Darkjeff
f47f0357d3 Fixing Subledger account in lettering 2018-01-22 15:57:17 +01:00
Laurent Destailleur
e4c02152b3 Fix navigation in bookeeping view grouped by account 2018-01-15 12:14:18 +01:00
Laurent Destailleur
15ed7584b8 Fix navigation in accounting account card 2018-01-11 17:06:06 +01:00
Laurent Destailleur
01cde59608 Fix filter on bookkeeping group view 2018-01-04 19:16:53 +01:00
Alexandre SPANGARO
7b935a96bf FIX : Various payment 2017-12-11 07:03:37 +01:00
Alexandre SPANGARO
1269d98df2 Merge remote-tracking branch 'uptream/develop' into 7.0-7 
# Conflicts:
#	htdocs/accountancy/admin/export.php
#	htdocs/accountancy/class/accountancyexport.class.php
#	htdocs/accountancy/journal/expensereportsjournal.php
 2017-12-09 06:14:34 +01:00
Alexandre SPANGARO
065ef4e5c2 Fix : Accountancy some cleaning 2017-12-09 06:00:13 +01:00
Laurent Destailleur
682afe8918 Fix scrutinizer 2017-11-29 16:25:12 +01:00
Laurent Destailleur
a9d3e90b70 Big debug of accountancy module 2017-11-27 21:53:22 +01:00
Laurent Destailleur
533a82187a NEW Add a protection so we can't journalize non balanced transactions 2017-11-27 17:12:48 +01:00
Laurent Destailleur
0b9a3087ea Fix bug reported by scrutinizer 2017-11-25 12:11:02 +01:00
elarifr
c7129cdd71 quadra format date is wrong 
need amount in cent without decimal symbol
need to remove accent as it give two ascii and break import
 2017-11-19 19:42:16 +01:00
Laurent Destailleur
6608dd72bd
Merge pull request #7776 from frederic34/exportadmin 
correct merge
 2017-11-11 17:23:42 +01:00
Laurent Destailleur
d938a56282 Clean code 2017-11-11 01:10:17 +01:00
Frédéric FRANCE
45afbae49c
some change 2017-11-07 10:47:58 +01:00
Frédéric FRANCE
ea910adeb2
Merge branch 'develop' into accountingexport 2017-11-05 21:11:41 +01:00
Frédéric FRANCE
bb252846e3
accounting export admin config 2017-11-05 11:48:41 +01:00
Laurent Destailleur
417642ba39 Standardize interface (search on date modification) 2017-11-02 10:33:04 +01:00
Alexandre SPANGARO
f9e801b4a7 Update works 2017-11-01 08:42:17 +01:00
Alexandre SPANGARO
7c0ff3a32f Merge remote-tracking branch 'uptream/develop' into 7.0-general_ledger 2017-11-01 07:58:20 +01:00
Alexandre SPANGARO
7a719c6be6 NEW General ledger : Add field and selected field 2017-10-29 05:37:50 +01:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
florian HENRY
b5fc559889 travis 2017-10-18 14:48:58 +02:00
florian HENRY
4273e507c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 
dev_accountancy

Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
	htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
	htdocs/accountancy/class/lettering.class.php
 2017-10-18 09:52:56 +02:00
Laurent Destailleur
ebe0664aff Merge branch 'develop' into scrutinizer-patch-3 2017-10-16 20:54:15 +02:00
Laurent Destailleur
87814af7b6 Move function colorIsLight into functions.lib.php 
Fix scrutinizer bugs.
 2017-10-16 09:29:10 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-16 06:47:05 +00:00
Laurent Destailleur
d12019d1b5 Fix from scrutinizer 2017-10-13 13:10:36 +02:00
Laurent Destailleur
8e0da9bfeb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/document.php
 2017-10-04 13:32:53 +02:00
florian HENRY
18bd2c4445 fix travis 2017-10-02 09:04:22 +02:00
Alexandre SPANGARO
6a05645295 Fix : Accountancy export model for Agiris Isacompta 2017-09-30 06:58:31 +02:00
florian HENRY
6fcfe89565 NEW : lettrage in accountancy 2017-09-26 13:02:29 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
2cdea7e37c Fix bug reported by scrutinizer 2017-09-12 19:21:26 +02:00
Laurent Destailleur
59721bf8ed Fix code comment 2017-09-08 13:33:52 +02:00
Laurent Destailleur
48c526f87d Debug report for accounting module 2017-09-05 12:53:25 +02:00
Laurent Destailleur
c1d31c34cd Work on reports per date 2017-09-05 02:26:23 +02:00
Laurent Destailleur
e1fa37f7ff Work on reports per date 2017-09-05 02:13:02 +02:00
Laurent Destailleur
c15454e62b Fix method to delete a bookkeeping record 2017-09-04 13:09:26 +02:00
Laurent Destailleur
31a74d448c Work on accounting reports. 2017-08-31 22:38:30 +02:00
Laurent Destailleur
ec27eb5b1e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/societe/list.php
 2017-07-27 02:09:40 +02:00
Laurent Destailleur
bdfb0b7561 FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes 2017-07-26 21:22:53 +02:00
Laurent Destailleur
c5267154b9 Merge branch 'develop' into Bookkeeping-V6 2017-07-25 20:54:37 +02:00
florian HENRY
d6d454edc8 fix : Various misspelling class (eclipse Oxygen standard PHP control) 2017-07-25 13:32:27 +02:00
Laurent Destailleur
149e1f9c67 Merge pull request #7195 from atm-florian/6.0 
fix : Various misspelling class (eclipse Oxygen standard PHP control)
 2017-07-25 13:31:40 +02:00
florian HENRY
b9d5f4ba10 fix : Various misspelling class (eclipse Oxygen standard PHP control) 2017-07-24 09:02:32 +02:00
Laurent Destailleur
75ec7a309c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-15 21:25:14 +02:00
Laurent Destailleur
bab963ec07 FIX Pagination on the ledger page. 2017-07-15 19:19:12 +02:00
Laurent Destailleur
cb87b314be FIX Maxi debug of journalization of bank journal. 2017-07-15 03:41:07 +02:00
Laurent Destailleur
201db3b720 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/tasks/task.php
 2017-07-14 00:24:49 +02:00
Laurent Destailleur
a562e5a919 Maxi debug of accountancy ledger page. 2017-07-08 20:52:53 +02:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
 2017-07-08 18:32:34 +02:00
Laurent Destailleur
4f75b6d656 Fix phpcs 2017-07-08 14:58:19 +02:00
Laurent Destailleur
4bae65bedc Fix travis 2017-07-07 22:04:29 +02:00
Laurent Destailleur
be493b78ba Merge pull request #7093 from Darkjeff/Fix-Accoutancy 
Fix accoutancy
 2017-07-07 19:14:35 +02:00
florian HENRY
7f869b4840 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
 2017-07-03 14:36:50 +02:00
Darkjeff
30153f8c2e add in bookkeeping date lim reglement 
Date lim reglement for export Sage and Iris
correct avoir when write in bookkeeping
 2017-07-03 07:21:15 +02:00
Laurent Destailleur
c5aed0c333 Fix phpcs 2017-07-01 14:25:46 +02:00
Laurent Destailleur
31fe8ebcee Debug v6 2017-07-01 02:22:08 +02:00
Darkjeff
180467ba56 add lettering 2017-06-30 11:53:15 +02:00
florian HENRY
7556a604e3 fix travis 2017-06-29 16:30:57 +02:00
florian HENRY
6e8c83b2a9 fix class error (given by eclipse Oxygen version) 2017-06-29 15:47:33 +02:00
Darkjeff
ef5e38b0d3 correct bug result 2017-06-28 16:45:44 +02:00
Laurent Destailleur
d186aed96c Fix: date must be stored into a date field (error with pgsql). 
import_key is reserved for "import" process.
 2017-06-27 18:26:17 +02:00
Alexandre SPANGARO
95573e8608 Fix : Accountancy - Debug 2017-06-19 21:39:43 +02:00
Laurent Destailleur
8f6e756249 Fix PHPCS 2017-06-19 15:37:22 +02:00
Alexandre SPANGARO
e9b6afd2aa Add last session coding - Add temporaly ledger 2017-06-18 22:17:32 +02:00
Alexandre SPANGARO
b240f536b5 Fix : Accountancy - Debug and add information in database 2017-06-17 07:54:35 +02:00
Laurent Destailleur
343e8d8498 Debug accounting module with new structure v6 
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
 2017-06-16 00:49:52 +02:00
Laurent Destailleur
ac708a8ee9 Debug accounting module with new structure v6 
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
 2017-06-15 23:58:56 +02:00
Laurent Destailleur
097be322a6 Modify code to match new v6 structure. 2017-06-15 19:29:00 +02:00
Laurent Destailleur
20fb12bc7d Merge pull request #6959 from aspangaro/6.0-fec2 
NEW : Accountancy - Activate multi-journal everywhere & Add journal_label information to database (FEC)
 2017-06-08 10:56:53 +02:00
Alexandre SPANGARO
5e3a2e06d4 NEW : Accountancy - Activate multi-journal & Add journal_label to database (FEC) 2017-06-08 06:35:09 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
cce05a4070 Merge branch 'develop' into 6.0-d2 2017-05-29 11:45:13 +02:00
Laurent Destailleur
425192ef84 Merge branch 'develop' into 6.0-multijournal 2017-05-29 10:23:46 +02:00
Alexandre SPANGARO
095545e8d9 Fix : Correct bank transfert when we write operation on general ledger 2017-05-28 21:56:18 +02:00
Alexandre SPANGARO
db6d7d9e21 Spaces 2017-05-25 07:15:36 +02:00
Alexandre SPANGARO
1f079fac9d Move html.formventilation.class.php to html.formaccounting.class.php 2017-05-25 06:57:28 +02:00
Alexandre SPANGARO
a086b82f84 Removed old code (Function select_pcgtype/subtype) 2017-05-25 05:40:41 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Alexandre SPANGARO
a3602ff6b4 Add journal list in new movement card 2017-05-08 06:20:17 +02:00
Alexandre SPANGARO
8113e6c2f2 Update Accounting journal getNomUrl 2017-05-06 08:11:07 +02:00
Alexandre SPANGARO
68aaef2f66 Add list to select journal in bank 2017-05-06 08:06:01 +02:00
Laurent Destailleur
b7f7683e5a Merge pull request #6774 from aspangaro/6.0-multijournal 
Finish to move accountancy journals list to page like dictionnary
 2017-05-05 14:21:55 +02:00
Laurent Destailleur
dfa81bc806 Merge pull request #6792 from aspangaro/6.0-agiris 
New : Accountancy - Add export model towards Agiris
 2017-05-05 14:15:51 +02:00
Alexandre SPANGARO
76f2cc3f1e False operation 2017-05-04 06:52:07 +02:00
Alexandre SPANGARO
29bede28f0 New : Accountancy - Add export model towards Agiris 2017-05-04 06:49:29 +02:00
Alexandre SPANGARO
94b69844f2 Add option no url 2017-05-01 20:39:46 +02:00
Alexandre SPANGARO
6afd0d642a Finish to move accountancy journals list to page like dictionnary 2017-05-01 08:16:09 +02:00
Alexandre SPANGARO
e11254a9bf Add option on accounting account getNomUrl 2017-04-30 15:04:51 +02:00
Laurent Destailleur
04b1535b12 FIX Found duplicate line when it is not. 2017-04-29 14:59:40 +02:00
Laurent Destailleur
faddcb28ac FIX serious bugs in accounting (error management, transactions, bad 
values set)
 2017-04-29 14:53:29 +02:00
Alexandre SPANGARO
06c2f04927 Finish work on multijournal admin part 
Need harmonization on rights
 2017-03-29 06:32:26 +02:00
Alexandre SPANGARO
fc2b9a858b New : [FP17] Add multijournals in accountancy admin 2017-03-28 06:35:03 +02:00
Alexandre SPANGARO
b09398a68e Update works 2017-03-19 15:23:35 +01:00
Laurent Destailleur
5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2017-03-05 22:11:35 +01:00
Laurent Destailleur
4cd82fc2c2 Fix a list was filled if a record was created but we need the field 
filled to create the record.
 2017-03-03 18:27:14 +01:00
Laurent Destailleur
6c91cb4f90 Fix it was not possible to create/edit a new chart of account 2017-03-03 17:59:49 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
Laurent Destailleur
a8129ce46e Fix transaction/sql error 2017-02-20 11:49:27 +01:00
aspangaro
2ce4ba99fe Fix : [FP17] Correct some fix on category accounting account page 2017-02-01 06:54:01 +01:00
Laurent Destailleur
4907f9581f Fix warning 2017-01-03 11:35:07 +01:00
Laurent Destailleur
bbd3734a21 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
 2016-12-26 12:42:23 +01:00
aspangaro
d53a238b49 Fix: Accountancy - Problem on quadratus export 2016-12-22 06:12:42 +01:00
florian HENRY
b17480928e fix default account selection (when cache is use) 2016-12-10 10:40:38 +01:00
Laurent Destailleur
5353aa6efe Better error management when creating bookkeepin entries 2016-12-10 02:38:07 +01:00
Laurent Destailleur
37d0e7a2e8 Doxygen 2016-11-30 16:17:54 +01:00
Laurent Destailleur
663f7938f8 Fxi responsive design 2016-11-27 20:02:57 +01:00
Laurent Destailleur
839f30bea9 Fix scrutinizer warnings 2016-11-22 19:45:28 +01:00
Laurent Destailleur
2043c279b0 Merge remote-tracking branch 'origin/4.0' into develop 2016-11-20 15:47:40 +01:00
Laurent Destailleur
0af0aa89bb Debug 2016-11-17 19:49:33 +01:00
Laurent Destailleur
4768017662 Debug of module accountancy 2016-11-16 19:23:32 +01:00
Laurent Destailleur
206970b82c Fix management of multientity 2016-11-15 11:42:01 +01:00
aspangaro
fd09bdfb15 Fix #5973: EBP export uses simple cote instead of double cote 2016-11-11 14:06:33 +01:00
Laurent Destailleur
e59c2bb61c Debug accounting menu. Can now edit product account if already set. 2016-11-04 16:15:31 +01:00
Laurent Destailleur
cef43bf4b6 Better support of multicompany 2016-10-21 11:10:11 +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
79d376ee12 Debug accountancy module 2016-10-14 13:05:01 +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
9ad96c2be3 Debug module accountancy expert 2016-10-05 20:50:47 +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
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
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
aspangaro
9a3305abf9 Fix: Accountancy - Problem on Cegid Export Format & presentation 2016-09-20 21:12:28 +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
florian HENRY
e9962bb887 fix export 2016-08-10 17:22:58 +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
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
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
ea3e851ec0 Fix stuff in accoutancy 2016-06-29 16:54:37 +02:00
florian HENRY
dfc4f3e7fe on going accountacy working 2016-06-29 11:06:02 +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
aspangaro
e0f600f226 FIX: Accountancy - Little fix et add page to assign massively the category 2016-05-02 20:21:37 +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
aspangaro
e79c6c1439 Correct travis error 2016-04-03 17:09:22 +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
1f31163e5e Correct travis 2016-03-28 21:36:57 +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
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
Florian HENRY
e40de3ce28 fix accoutancy 2016-03-10 11:39:26 +01:00
Florian HENRY
4401995540 Accountancy feature 2016-02-09 19:22:52 +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
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
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
bobby
6aa6c067fb fix travis 2016-01-28 13:24:38 +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
19bec6b0b3 Manual merge from 3.8 backported 2016-01-14 18:24:02 +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
Florian HENRY
8006baf592 ry 2015-12-21 13:09:22 +01:00
aspangaro
85f87d45df Add select account in product card 2015-12-17 12:57:08 +01:00
aspangaro
b064d1106b Accountancy Add a list to select accounting account on product card 2015-12-17 06:16:29 +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
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +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
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
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
Laurent Destailleur
418a609b73 Fix PHPCS 2015-08-13 03:06:25 +02:00
Florian HENRY
adccd5d04f fix some feature on accountancy modules 2015-08-12 15:53:17 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +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
a762910f11 Add getNomUrl on accounting for account 2015-06-29 21:16:30 +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
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
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
94a9d0159d Align module with 3.7 & contrary 2015-01-25 15:24:16 +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
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
Philippe GRAND
e18196eac6 to avoid undefined method 2014-12-01 16:50:27 +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
Juanjo Menent
75eb61702e Fix: Showing accounting account fails 2014-10-07 12:46:05 +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
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
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
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
Laurent Destailleur
df70450073 Fix: Doxygen 2014-09-02 20:00:10 +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
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
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